From 0d2bf9d5c2eda1a74505f639d446bce17938b2ee Mon Sep 17 00:00:00 2001
From: Jon C <me@jonc.dev>
Date: Wed, 30 Oct 2024 10:44:48 +0100
Subject: [PATCH 1/7] Run update script, update curve25519-dalek dep, rust

---
 Anchor.toml                                   |    2 +-
 Cargo.lock                                    | 1879 ++++++++++++-----
 associated-token-account/client/Cargo.toml    |    2 +-
 .../program-test/Cargo.toml                   |    6 +-
 associated-token-account/program/Cargo.toml   |    2 +-
 binary-option/program/Cargo.toml              |    2 +-
 binary-oracle-pair/program/Cargo.toml         |    6 +-
 ci/rust-version.sh                            |    2 +-
 ci/solana-version.sh                          |    5 +-
 .../rust/cross-program-invocation/Cargo.toml  |    6 +-
 examples/rust/custom-heap/Cargo.toml          |    6 +-
 examples/rust/logging/Cargo.toml              |    6 +-
 examples/rust/sysvar/Cargo.toml               |    6 +-
 examples/rust/transfer-lamports/Cargo.toml    |    6 +-
 examples/rust/transfer-tokens/Cargo.toml      |    6 +-
 feature-proposal/cli/Cargo.toml               |   10 +-
 feature-proposal/program/Cargo.toml           |    6 +-
 governance/addin-api/Cargo.toml               |    2 +-
 governance/addin-mock/program/Cargo.toml      |    6 +-
 governance/chat/program/Cargo.toml            |    6 +-
 governance/program/Cargo.toml                 |    6 +-
 governance/test-sdk/Cargo.toml                |    6 +-
 governance/tools/Cargo.toml                   |    2 +-
 instruction-padding/program/Cargo.toml        |    6 +-
 libraries/discriminator/Cargo.toml            |    2 +-
 libraries/math/Cargo.toml                     |    6 +-
 libraries/pod/Cargo.toml                      |    4 +-
 libraries/program-error/Cargo.toml            |    4 +-
 libraries/tlv-account-resolution/Cargo.toml   |    8 +-
 .../type-length-value-derive-test/Cargo.toml  |    2 +-
 libraries/type-length-value/Cargo.toml        |    2 +-
 managed-token/program/Cargo.toml              |    6 +-
 memo/program/Cargo.toml                       |    6 +-
 name-service/program/Cargo.toml               |    6 +-
 record/program/Cargo.toml                     |    6 +-
 rust-toolchain.toml                           |    2 +-
 shared-memory/program/Cargo.toml              |    6 +-
 single-pool/cli/Cargo.toml                    |   22 +-
 single-pool/program/Cargo.toml                |    8 +-
 stake-pool/cli/Cargo.toml                     |   18 +-
 stake-pool/program/Cargo.toml                 |    8 +-
 stateless-asks/program/Cargo.toml             |    6 +-
 token-collection/program/Cargo.toml           |    6 +-
 token-group/example/Cargo.toml                |    6 +-
 token-group/interface/Cargo.toml              |    2 +-
 token-lending/cli/Cargo.toml                  |   12 +-
 token-lending/flash_loan_receiver/Cargo.toml  |    2 +-
 token-lending/program/Cargo.toml              |    6 +-
 token-metadata/example/Cargo.toml             |    6 +-
 token-metadata/interface/Cargo.toml           |    2 +-
 token-swap/program/Cargo.toml                 |    4 +-
 token-swap/program/fuzz/Cargo.toml            |    2 +-
 token-upgrade/cli/Cargo.toml                  |   14 +-
 token-upgrade/program/Cargo.toml              |    6 +-
 token-wrap/program/Cargo.toml                 |    2 +-
 token/cli/Cargo.toml                          |   20 +-
 token/client/Cargo.toml                       |   12 +-
 .../ciphertext-arithmetic/Cargo.toml          |    6 +-
 .../elgamal-registry/Cargo.toml               |    4 +-
 .../proof-extraction/Cargo.toml               |    6 +-
 .../proof-generation/Cargo.toml               |    4 +-
 .../proof-tests/Cargo.toml                    |    4 +-
 token/program-2022-test/Cargo.toml            |    6 +-
 token/program-2022/Cargo.toml                 |    8 +-
 token/program/Cargo.toml                      |    6 +-
 token/transfer-hook/cli/Cargo.toml            |   14 +-
 token/transfer-hook/example/Cargo.toml        |    6 +-
 token/transfer-hook/interface/Cargo.toml      |    2 +-
 utils/test-client/Cargo.toml                  |    2 +-
 69 files changed, 1596 insertions(+), 688 deletions(-)

diff --git a/Anchor.toml b/Anchor.toml
index dcc5499c718..a7999972431 100644
--- a/Anchor.toml
+++ b/Anchor.toml
@@ -1,6 +1,6 @@
 [toolchain]
 anchor_version = "0.29.0"
-solana_version = "2.0.3"
+solana_version = "2.1.0"
 
 [workspace]
 members = [
diff --git a/Cargo.lock b/Cargo.lock
index 26701f60895..9dc064bbd7c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -27,6 +27,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
 [[package]]
 name = "aead"
 version = "0.5.2"
@@ -65,9 +71,9 @@ dependencies = [
 
 [[package]]
 name = "agave-geyser-plugin-interface"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d86a1bd9b77d9cd269627b8512a95c5866a84bbec231bab5547d4a7674cd047"
+checksum = "9291468d48d46cfe92d7807990e19c6ee9a07b05a75cda5e118f48597e079391"
 dependencies = [
  "log",
  "solana-sdk",
@@ -75,6 +81,16 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "agave-transaction-view"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a249374d6349eeb31348a849666f3d47cacb18e0e05454fbd11a1fc69fae8e7e"
+dependencies = [
+ "solana-sdk",
+ "solana-svm-transaction",
+]
+
 [[package]]
 name = "ahash"
 version = "0.7.8"
@@ -213,9 +229,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
 
 [[package]]
 name = "approx"
@@ -296,7 +312,7 @@ dependencies = [
  "derivative",
  "digest 0.10.7",
  "itertools 0.10.5",
- "num-bigint 0.4.5",
+ "num-bigint 0.4.6",
  "num-traits",
  "paste",
  "rustc_version",
@@ -319,7 +335,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565"
 dependencies = [
- "num-bigint 0.4.5",
+ "num-bigint 0.4.6",
  "num-traits",
  "proc-macro2",
  "quote",
@@ -348,7 +364,7 @@ dependencies = [
  "ark-serialize-derive",
  "ark-std",
  "digest 0.10.7",
- "num-bigint 0.4.5",
+ "num-bigint 0.4.6",
 ]
 
 [[package]]
@@ -380,9 +396,9 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "ascii"
@@ -458,7 +474,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
 dependencies = [
  "concurrent-queue",
- "event-listener",
+ "event-listener 2.5.2",
  "futures-core",
 ]
 
@@ -477,12 +493,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "async-mutex"
-version = "1.4.0"
+name = "async-lock"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
 dependencies = [
- "event-listener",
+ "event-listener 5.3.1",
+ "event-listener-strategy",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -612,7 +630,7 @@ dependencies = [
  "cc",
  "cfg-if 1.0.0",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.7.1",
  "object",
  "rustc-demangle",
 ]
@@ -668,7 +686,7 @@ version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
  "itertools 0.12.1",
@@ -677,7 +695,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "shlex",
  "syn 2.0.82",
 ]
@@ -705,9 +723,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 dependencies = [
  "serde",
 ]
@@ -723,9 +741,9 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "1.5.1"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
+checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -741,7 +759,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
 dependencies = [
- "block-padding 0.1.5",
+ "block-padding",
  "byte-tools",
  "byteorder",
  "generic-array 0.12.4",
@@ -753,7 +771,6 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "block-padding 0.2.1",
  "generic-array 0.14.7",
 ]
 
@@ -775,12 +792,6 @@ dependencies = [
  "byte-tools",
 ]
 
-[[package]]
-name = "block-padding"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
-
 [[package]]
 name = "borsh"
 version = "0.10.3"
@@ -798,7 +809,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed"
 dependencies = [
  "borsh-derive 1.5.1",
- "cfg_aliases 0.2.1",
+ "cfg_aliases",
 ]
 
 [[package]]
@@ -950,9 +961,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
 
 [[package]]
 name = "bzip2"
@@ -1006,14 +1017,21 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
 dependencies = [
  "jobserver",
  "libc",
+ "shlex",
 ]
 
+[[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"
@@ -1037,15 +1055,20 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "cfg_aliases"
-version = "0.1.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
-name = "cfg_aliases"
-version = "0.2.1"
+name = "cfg_eval"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+checksum = "45565fc9416b9896014f5732ac776f810ee53a66730c17e4020c3ec064a8f88f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.82",
+]
 
 [[package]]
 name = "cgen"
@@ -1222,11 +1245,21 @@ dependencies = [
  "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.2.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1399,18 +1432,46 @@ dependencies = [
 
 [[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",
  "digest 0.9.0",
  "rand_core 0.5.1",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "curve25519-dalek"
+version = "4.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "digest 0.10.7",
+ "fiat-crypto",
+ "rand_core 0.6.4",
+ "rustc_version",
  "serde",
  "subtle",
  "zeroize",
 ]
 
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.82",
+]
+
 [[package]]
 name = "cxx"
 version = "1.0.80"
@@ -1519,7 +1580,7 @@ dependencies = [
  "asn1-rs",
  "displaydoc",
  "nom",
- "num-bigint 0.4.5",
+ "num-bigint 0.4.6",
  "num-traits",
  "rusticata-macros",
 ]
@@ -1719,7 +1780,7 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
 dependencies = [
- "curve25519-dalek",
+ "curve25519-dalek 3.2.0",
  "ed25519",
  "rand 0.7.3",
  "serde",
@@ -1798,7 +1859,7 @@ version = "3.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b166c9e378360dd5a6666a9604bb4f54ae0cac39023ffbac425e917a2a04fef"
 dependencies = [
- "num-bigint 0.4.5",
+ "num-bigint 0.4.6",
  "num-traits",
  "proc-macro2",
  "quote",
@@ -1877,6 +1938,27 @@ version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71"
 
+[[package]]
+name = "event-listener"
+version = "5.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+dependencies = [
+ "event-listener 5.3.1",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "fake-simd"
 version = "0.1.2"
@@ -1904,6 +1986,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da"
 
+[[package]]
+name = "fiat-crypto"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
+
 [[package]]
 name = "filetime"
 version = "0.2.15"
@@ -1916,6 +2004,21 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "five8_const"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b4f62f0f8ca357f93ae90c8c2dd1041a1f665fde2f889ea9b1787903829015"
+dependencies = [
+ "five8_core",
+]
+
+[[package]]
+name = "five8_core"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94474d15a76982be62ca8a39570dccce148d98c238ebb7408b0a21b2c4bdddc4"
+
 [[package]]
 name = "fixedbitset"
 version = "0.4.1"
@@ -1933,12 +2036,12 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.30"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
 dependencies = [
  "crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.8.0",
 ]
 
 [[package]]
@@ -2070,6 +2173,12 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
+[[package]]
+name = "futures-timer"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
+
 [[package]]
 name = "futures-util"
 version = "0.3.31"
@@ -2190,14 +2299,23 @@ dependencies = [
 ]
 
 [[package]]
-name = "goblin"
-version = "0.5.4"
+name = "governor"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143"
+checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b"
 dependencies = [
- "log",
- "plain",
- "scroll",
+ "cfg-if 1.0.0",
+ "dashmap",
+ "futures 0.3.31",
+ "futures-timer",
+ "no-std-compat",
+ "nonzero_ext",
+ "parking_lot 0.12.0",
+ "portable-atomic",
+ "quanta",
+ "rand 0.8.5",
+ "smallvec",
+ "spinning_top",
 ]
 
 [[package]]
@@ -2212,7 +2330,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "slab",
  "tokio",
  "tokio-util 0.7.1",
@@ -2256,6 +2374,12 @@ dependencies = [
  "allocator-api2",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
 [[package]]
 name = "headers"
 version = "0.3.7"
@@ -2325,9 +2449,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hidapi"
-version = "2.6.1"
+version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e58251020fe88fe0dae5ebcc1be92b4995214af84725b375d08354d0311c23c"
+checksum = "03b876ecf37e86b359573c16c8366bc3eba52b689884a0fc42ba3f67203d2a8b"
 dependencies = [
  "cc",
  "cfg-if 1.0.0",
@@ -2426,9 +2550,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.29"
+version = "0.14.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
+checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2475,7 +2599,7 @@ dependencies = [
  "futures-util",
  "http",
  "hyper",
- "rustls",
+ "rustls 0.21.12",
  "tokio",
  "tokio-rustls",
 ]
@@ -2599,9 +2723,9 @@ dependencies = [
 
 [[package]]
 name = "index_list"
-version = "0.2.11"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70891286cb8e844fdfcf1178b47569699f9e20b5ecc4b45a6240a64771444638"
+checksum = "4e6ba961c14e98151cd6416dd3685efe786a94c38bc1a535c06ceff0a1600813"
 
 [[package]]
 name = "indexmap"
@@ -2616,12 +2740,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
  "rayon",
  "serde",
 ]
@@ -2693,20 +2817,40 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
+[[package]]
+name = "jni"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
+dependencies = [
+ "cesu8",
+ "combine 4.6.7",
+ "jni-sys",
+ "log",
+ "thiserror",
+ "walkdir",
+]
+
+[[package]]
+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.24"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2845,9 +2989,9 @@ dependencies = [
 
 [[package]]
 name = "lazy-lru"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81b33bc1276f3df38e938ed17bbb3d5c5eef758aa1a9997ec8388799ba3eef1"
+checksum = "8b031495510a5a17bfb14e9f1fc00f6efdebfaa9ab04a876a4e153b042a3fe06"
 dependencies = [
  "hashbrown 0.14.5",
 ]
@@ -2866,9 +3010,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.159"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 
 [[package]]
 name = "libloading"
@@ -2980,7 +3124,7 @@ checksum = "3c9a85a9752c549ceb7578064b4ed891179d20acd85f27318573b64d2d7ee7ee"
 dependencies = [
  "ark-bn254",
  "ark-ff",
- "num-bigint 0.4.5",
+ "num-bigint 0.4.6",
  "thiserror",
 ]
 
@@ -3011,9 +3155,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "lru"
@@ -3026,19 +3170,18 @@ dependencies = [
 
 [[package]]
 name = "lz4"
-version = "1.25.0"
+version = "1.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6eab492fe7f8651add23237ea56dbf11b3c4ff762ab83d40a47f11433421f91"
+checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725"
 dependencies = [
- "libc",
  "lz4-sys",
 ]
 
 [[package]]
 name = "lz4-sys"
-version = "1.9.5"
+version = "1.11.1+lz4-1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9764018d143cc854c9f17f0b907de70f14393b1f502da6375dce70f00514eb3"
+checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6"
 dependencies = [
  "cc",
  "libc",
@@ -3153,6 +3296,15 @@ dependencies = [
  "adler",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
 [[package]]
 name = "mio"
 version = "1.0.1"
@@ -3250,17 +3402,23 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cfg-if 1.0.0",
- "cfg_aliases 0.1.1",
+ "cfg_aliases",
  "libc",
  "memoffset 0.9.0",
 ]
 
+[[package]]
+name = "no-std-compat"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
+
 [[package]]
 name = "nom"
 version = "7.1.1"
@@ -3271,6 +3429,12 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nonzero_ext"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
+
 [[package]]
 name = "normalize-line-endings"
 version = "0.3.0"
@@ -3304,9 +3468,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
@@ -3460,7 +3624,7 @@ version = "0.10.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cfg-if 1.0.0",
  "foreign-types",
  "libc",
@@ -3533,6 +3697,12 @@ version = "6.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
 
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
 [[package]]
 name = "parking_lot"
 version = "0.11.2"
@@ -3726,12 +3896,6 @@ version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"
 
-[[package]]
-name = "plain"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
-
 [[package]]
 name = "polyval"
 version = "0.6.2"
@@ -3746,9 +3910,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.3.3"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
 
 [[package]]
 name = "powerfmt"
@@ -3822,9 +3986,12 @@ dependencies = [
 
 [[package]]
 name = "prio-graph"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6492a75ca57066a4479af45efa302bed448680182b0563f96300645d5f896097"
+checksum = "2f28921629370a46cf564f6ba1828bd8d1c97f7fad4ee9d1c6438f92feed6b8d"
+dependencies = [
+ "ahash 0.8.11",
+]
 
 [[package]]
 name = "proc-macro-crate"
@@ -3870,9 +4037,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
@@ -3885,7 +4052,7 @@ checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "lazy_static",
  "num-traits",
  "rand 0.8.5",
@@ -3980,6 +4147,21 @@ dependencies = [
  "syn 2.0.82",
 ]
 
+[[package]]
+name = "quanta"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5"
+dependencies = [
+ "crossbeam-utils",
+ "libc",
+ "once_cell",
+ "raw-cpuid",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "web-sys",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -3988,16 +4170,17 @@ 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.16",
+ "socket2",
  "thiserror",
  "tokio",
  "tracing",
@@ -4005,16 +4188,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.16",
+ "rustls-platform-verifier",
  "slab",
  "thiserror",
  "tinyvec",
@@ -4023,15 +4206,16 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.4.1"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7"
+checksum = "e346e016eacfff12233c243718197ca12f148c84e1e84268a896699b41c71780"
 dependencies = [
- "bytes",
+ "cfg_aliases",
  "libc",
+ "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4142,6 +4326,15 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "raw-cpuid"
+version = "11.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
 [[package]]
 name = "rayon"
 version = "1.10.0"
@@ -4207,13 +4400,13 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.5"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick 1.0.2",
  "memchr",
- "regex-automata 0.4.5",
+ "regex-automata 0.4.8",
  "regex-syntax",
 ]
 
@@ -4225,9 +4418,9 @@ checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56"
 
 [[package]]
 name = "regex-automata"
-version = "0.4.5"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick 1.0.2",
  "memchr",
@@ -4236,9 +4429,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
@@ -4267,7 +4460,7 @@ dependencies = [
  "once_cell",
  "percent-encoding 2.3.1",
  "pin-project-lite",
- "rustls",
+ "rustls 0.21.12",
  "rustls-pemfile 1.0.1",
  "serde",
  "serde_json",
@@ -4389,6 +4582,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"
@@ -4413,7 +4612,7 @@ version = "0.38.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -4428,40 +4627,88 @@ checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "log",
  "ring 0.17.3",
- "rustls-webpki",
+ "rustls-webpki 0.101.7",
  "sct",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.23.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e"
+dependencies = [
+ "once_cell",
+ "ring 0.17.3",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.8",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-native-certs"
-version = "0.6.1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943"
+checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile 0.2.1",
+ "rustls-pemfile 2.2.0",
+ "rustls-pki-types",
  "schannel",
  "security-framework",
 ]
 
 [[package]]
 name = "rustls-pemfile"
-version = "0.2.1"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9"
+checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
 dependencies = [
  "base64 0.13.0",
 ]
 
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.13.0",
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
+
+[[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.16",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki 0.102.8",
+ "security-framework",
+ "security-framework-sys",
+ "webpki-roots 0.26.6",
+ "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"
@@ -4473,7 +4720,18 @@ dependencies = [
 ]
 
 [[package]]
-name = "rustversion"
+name = "rustls-webpki"
+version = "0.102.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+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"
@@ -4541,20 +4799,6 @@ name = "scroll"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da"
-dependencies = [
- "scroll_derive",
-]
-
-[[package]]
-name = "scroll_derive"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.107",
-]
 
 [[package]]
 name = "sct"
@@ -4574,22 +4818,23 @@ checksum = "b84345e4c9bd703274a082fb80caaa99b7612be48dfaa1dd9266577ec412309d"
 
 [[package]]
 name = "security-framework"
-version = "2.6.1"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc"
+checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
  "core-foundation-sys",
  "libc",
+ "num-bigint 0.4.6",
  "security-framework-sys",
 ]
 
 [[package]]
 name = "security-framework-sys"
-version = "2.6.1"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -4621,9 +4866,9 @@ dependencies = [
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.14"
+version = "0.11.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
+checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
 dependencies = [
  "serde",
 ]
@@ -4663,16 +4908,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_with"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe"
-dependencies = [
- "serde",
- "serde_with_macros 2.3.3",
-]
-
 [[package]]
 name = "serde_with"
 version = "3.11.0"
@@ -4683,26 +4918,14 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "serde",
  "serde_derive",
  "serde_json",
- "serde_with_macros 3.11.0",
+ "serde_with_macros",
  "time",
 ]
 
-[[package]]
-name = "serde_with_macros"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn 2.0.82",
-]
-
 [[package]]
 name = "serde_with_macros"
 version = "3.11.0"
@@ -4721,7 +4944,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "itoa",
  "ryu",
  "serde",
@@ -4824,18 +5047,6 @@ dependencies = [
  "digest 0.10.7",
 ]
 
-[[package]]
-name = "sha3"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
-dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "keccak",
- "opaque-debug 0.3.0",
-]
-
 [[package]]
 name = "sha3"
 version = "0.10.8"
@@ -5006,11 +5217,25 @@ dependencies = [
  "sha-1 0.9.8",
 ]
 
+[[package]]
+name = "solana-account"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "730219420b206253977b8cc8fd7846ffe021ab2e2c718e70db420efbd2775547"
+dependencies = [
+ "bincode",
+ "serde",
+ "serde_bytes",
+ "serde_derive",
+ "solana-instruction",
+ "solana-program",
+]
+
 [[package]]
 name = "solana-account-decoder"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05902873408f35cda8ff1632597821273b5d7423ddd7bb488d1801dc5cdcc119"
+checksum = "14e5b1c167335942b659d077552607f79b2eca3472e40eeed97a2c55838b84ef"
 dependencies = [
  "Inflector",
  "base64 0.22.1",
@@ -5021,6 +5246,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
+ "solana-account-decoder-client-types",
  "solana-config-program",
  "solana-sdk",
  "spl-token 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5031,12 +5257,42 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "solana-account-decoder-client-types"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dee0750d2f106ecbee6d4508b6e2029e6946cb5f67288bf002b5a62f9f451c43"
+dependencies = [
+ "base64 0.22.1",
+ "bs58",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "solana-account",
+ "solana-pubkey",
+ "zstd",
+]
+
+[[package]]
+name = "solana-account-info"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6abe81cfc4a75f71a510c6856b03a7d8525e416af3c69d55daef62e6078b8d40"
+dependencies = [
+ "bincode",
+ "serde",
+ "solana-program-error",
+ "solana-program-memory",
+ "solana-pubkey",
+]
+
 [[package]]
 name = "solana-accounts-db"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3044de63e7fa70e4a7391b94735d34636fc0ef8cfcc11ac8e843837306e847b9"
+checksum = "b9fecc332ad4edd98ed63e5a46d990ecaf6fe4abd2bf9795c15474a64534ced6"
 dependencies = [
+ "ahash 0.8.11",
  "bincode",
  "blake3",
  "bv",
@@ -5046,7 +5302,7 @@ dependencies = [
  "crossbeam-channel",
  "dashmap",
  "index_list",
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "itertools 0.12.1",
  "lazy_static",
  "log",
@@ -5057,19 +5313,19 @@ dependencies = [
  "num_enum",
  "rand 0.8.5",
  "rayon",
- "rustc_version",
  "seqlock",
  "serde",
  "serde_derive",
  "smallvec",
  "solana-bucket-map",
  "solana-inline-spl",
+ "solana-lattice-hash",
  "solana-measure",
  "solana-metrics",
  "solana-nohash-hasher",
  "solana-rayon-threadlimit",
  "solana-sdk",
- "solana-svm",
+ "solana-svm-transaction",
  "static_assertions",
  "tar",
  "tempfile",
@@ -5078,27 +5334,37 @@ dependencies = [
 
 [[package]]
 name = "solana-address-lookup-table-program"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab11a1eb4a5fa462a966442c99c04482dce7a57e0c52ecb91f32a99dbdcc4ba"
+checksum = "2cf79a76f2878982b9781dfd0831d58ee15eb905be65406ccf7370c3ecd69c52"
 dependencies = [
  "bincode",
  "bytemuck",
  "log",
  "num-derive",
  "num-traits",
- "rustc_version",
+ "solana-feature-set",
+ "solana-log-collector",
  "solana-program",
  "solana-program-runtime",
  "solana-sdk",
  "thiserror",
 ]
 
+[[package]]
+name = "solana-atomic-u64"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "391b795afcdcad39ddc6c938d64b789d036cdfe00d9dc5ff83024cf2da9f066f"
+dependencies = [
+ "parking_lot 0.12.0",
+]
+
 [[package]]
 name = "solana-banks-client"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef39e4e89a7ff154960b4eb42483c09f9284b05193487c72678c84bd2ccda9c0"
+checksum = "2f857fb6590467d433f40eee507666ca496ec67907e50b7d530b6c04f6541875"
 dependencies = [
  "borsh 1.5.1",
  "futures 0.3.31",
@@ -5113,9 +5379,9 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-interface"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ac7cdd75766c57d17b3e77cbb37fbc1ae3d4e9bd470f6e648bcbeea9679938"
+checksum = "20052d231bb9ac3268dc61a713e3915d6c95fc942f9a5c15ca3a81a3fcd9cc12"
 dependencies = [
  "serde",
  "serde_derive",
@@ -5125,15 +5391,16 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-server"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1987ad9ca4c1ec488a20be89d01d339a2a69882f6eb5061d8382318b69f85f35"
+checksum = "10db60e4bf077b870a7e75f8596bf3790d079b3762e9b4edc032475077007d0b"
 dependencies = [
  "bincode",
  "crossbeam-channel",
  "futures 0.3.31",
  "solana-banks-interface",
  "solana-client",
+ "solana-feature-set",
  "solana-runtime",
  "solana-sdk",
  "solana-send-transaction-service",
@@ -5143,40 +5410,80 @@ dependencies = [
  "tokio-serde",
 ]
 
+[[package]]
+name = "solana-bincode"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e85cb5961c356345a61378163fd9057011b35540f8bcdd8d8a09cb10117264f"
+dependencies = [
+ "bincode",
+ "serde",
+ "solana-instruction",
+]
+
 [[package]]
 name = "solana-bloom"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3cd1975694845aa1092770953eb282012b2b835bcba70d73aff33ead2acb24"
+checksum = "a6cdcc35537b23cd3376eb2ea7753d958f6ce64f69318b00dc137817c0b49411"
 dependencies = [
  "bv",
  "fnv",
  "log",
  "rand 0.8.5",
- "rayon",
- "rustc_version",
  "serde",
  "serde_derive",
+ "solana-sanitize",
  "solana-sdk",
 ]
 
+[[package]]
+name = "solana-bn254"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c39c4030db26ad618f7e18fb5284df19fd52a68e092a1ca58db857108c4cc777"
+dependencies = [
+ "ark-bn254",
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "bytemuck",
+ "solana-program",
+ "thiserror",
+]
+
+[[package]]
+name = "solana-borsh"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5d526f3525ab22a3ada3f9a1d642664dafac00dc9208326b701a2045514eb04"
+dependencies = [
+ "borsh 0.10.3",
+ "borsh 1.5.1",
+]
+
 [[package]]
 name = "solana-bpf-loader-program"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9df996b99fb83993b20955af36cb7def334b13f0b298247114c85eb587b814c2"
+checksum = "142e0407f8428a1d2a33154d1d3d1c134ad257651ddff0811c17a6ee840def36"
 dependencies = [
  "bincode",
  "byteorder",
  "libsecp256k1",
  "log",
  "scopeguard",
+ "solana-bn254",
  "solana-compute-budget",
  "solana-curve25519",
+ "solana-feature-set",
+ "solana-log-collector",
  "solana-measure",
  "solana-poseidon",
+ "solana-program-memory",
  "solana-program-runtime",
  "solana-sdk",
+ "solana-timings",
  "solana-type-overrides",
  "solana_rbpf",
  "thiserror",
@@ -5184,9 +5491,9 @@ dependencies = [
 
 [[package]]
 name = "solana-bucket-map"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec8fe2e4f050b209202fb23a7bef68d215401a067aec35f2b6f78b0c298364ee"
+checksum = "66eb348939fcfea6e40eed61bca06a1c631f8cb70f1801a5b14021bddefe93eb"
 dependencies = [
  "bv",
  "bytemuck",
@@ -5201,15 +5508,36 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "solana-builtins-default-costs"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "854270e266040355f5fd5b67c91855bc36cebf1d3f325eb54d8b1b0ca385f74b"
+dependencies = [
+ "ahash 0.8.11",
+ "lazy_static",
+ "log",
+ "solana-address-lookup-table-program",
+ "solana-bpf-loader-program",
+ "solana-compute-budget-program",
+ "solana-config-program",
+ "solana-loader-v4-program",
+ "solana-sdk",
+ "solana-stake-program",
+ "solana-system-program",
+ "solana-vote-program",
+]
+
 [[package]]
 name = "solana-clap-utils"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f10f809259aab9d54e16dcb3e05ea55448c1ab42bc36583591a78c9215494c4"
+checksum = "1709e1b0aefc8062fca29a4fde8d35f39ee95586e77cc6360e9bfc50a094c44f"
 dependencies = [
  "chrono",
  "clap 2.34.0",
  "rpassword",
+ "solana-derivation-path",
  "solana-remote-wallet",
  "solana-sdk",
  "thiserror",
@@ -5220,13 +5548,14 @@ dependencies = [
 
 [[package]]
 name = "solana-clap-v3-utils"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cc19507a170a17bec4fdd79672387efc156ca9829c6151fc43fa266cbba8935"
+checksum = "d9682fa05e9e8bcd49340567c000b20e4f094db530ef7912d74ea12706448814"
 dependencies = [
  "chrono",
  "clap 3.2.25",
  "rpassword",
+ "solana-derivation-path",
  "solana-remote-wallet",
  "solana-sdk",
  "solana-zk-token-sdk",
@@ -5238,9 +5567,9 @@ dependencies = [
 
 [[package]]
 name = "solana-cli-config"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14fae0e2ad42677046dc0e58d4b752ab55ecd59b120f091cd9b4b81ec3e55316"
+checksum = "384fda0ddf3099eab0f702b326663f499e84731e8584fd7d0c6d8bab03bead79"
 dependencies = [
  "dirs-next",
  "lazy_static",
@@ -5254,9 +5583,9 @@ dependencies = [
 
 [[package]]
 name = "solana-cli-output"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "408a27d6560becfc89f2643a0fb302c5de77de40acb3d0edb77447be68389881"
+checksum = "b82ae7fc5a012ad5bc4077a235ea5b26145fab50ca05b550e792a50bdd6d77a9"
 dependencies = [
  "Inflector",
  "base64 0.22.1",
@@ -5281,23 +5610,22 @@ dependencies = [
 
 [[package]]
 name = "solana-client"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdf0916e9c119d472ec5a59a84fd8eb6c72a7f0568036409673e2c9c7a9fc460"
+checksum = "1d9a40b8e9e11604e8c05e8b5fcdb89359235db47d1aae84dcba0fc98e95dd0c"
 dependencies = [
  "async-trait",
  "bincode",
  "dashmap",
  "futures 0.3.31",
  "futures-util",
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "indicatif",
  "log",
  "quinn",
  "rayon",
  "solana-connection-cache",
  "solana-measure",
- "solana-metrics",
  "solana-pubsub-client",
  "solana-quic-client",
  "solana-rpc-client",
@@ -5312,21 +5640,31 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "solana-clock"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7848171e53fa528efd41dd4b3ab919f47b851f8bb4a827d63ff95678f08737fc"
+dependencies = [
+ "serde",
+ "serde_derive",
+ "solana-sdk-macro",
+]
+
 [[package]]
 name = "solana-compute-budget"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98d1bd1e1073998eda4e59a5c344e998c2e429053a1b340fc798987d2ba37051"
+checksum = "ebf2f023f471bd1195b7f420e13ffc2422592dd48e71104b4901300b49ac493e"
 dependencies = [
- "rustc_version",
  "solana-sdk",
 ]
 
 [[package]]
 name = "solana-compute-budget-program"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4fb10a978c057eb531b85f4e72dde9d61d2b348a3615f602b40cb4531abb0a"
+checksum = "73eddf023f02a56daa838818e30894b874368a741782457468eeefdfce2f7f53"
 dependencies = [
  "solana-program-runtime",
  "solana-sdk",
@@ -5334,29 +5672,31 @@ dependencies = [
 
 [[package]]
 name = "solana-config-program"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "315b49d8b0a01aae38a5056f13dc0b9001e996d48807a5012c6f7629ced6b7d7"
+checksum = "a035a01970ebbf40a244b3b79af533329ac8d48d80b0b98e166e23e35aa88171"
 dependencies = [
  "bincode",
  "chrono",
  "serde",
  "serde_derive",
+ "solana-log-collector",
  "solana-program-runtime",
  "solana-sdk",
+ "solana-short-vec",
 ]
 
 [[package]]
 name = "solana-connection-cache"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f270c95e3cb85414459d05b8ec1d0ff29d44d9781fc948ddbe46011ab55fbe"
+checksum = "5f45dd2a6d5d55ed951781486231d0d2ee9ff7047fdafaed01ee021e236319d0"
 dependencies = [
  "async-trait",
  "bincode",
  "crossbeam-channel",
  "futures-util",
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "log",
  "rand 0.8.5",
  "rayon",
@@ -5369,11 +5709,13 @@ dependencies = [
 
 [[package]]
 name = "solana-core"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1d92b2f08798e3930fe50b09d6358a2bd5c073c68500fffc57d476883dfb96e"
+checksum = "9d499325db220d9442530d625addc20defe35c41a2e349a9ffb8f3bf20e7a9b7"
 dependencies = [
  "ahash 0.8.11",
+ "anyhow",
+ "arrayvec",
  "base64 0.22.1",
  "bincode",
  "bs58",
@@ -5397,18 +5739,20 @@ dependencies = [
  "rand_chacha 0.3.1",
  "rayon",
  "rolling-file",
- "rustc_version",
- "rustls",
+ "rustls 0.23.16",
  "serde",
  "serde_bytes",
  "serde_derive",
  "solana-accounts-db",
  "solana-bloom",
+ "solana-builtins-default-costs",
  "solana-client",
  "solana-compute-budget",
  "solana-connection-cache",
  "solana-cost-model",
  "solana-entry",
+ "solana-feature-set",
+ "solana-fee",
  "solana-geyser-plugin-manager",
  "solana-gossip",
  "solana-ledger",
@@ -5417,16 +5761,20 @@ dependencies = [
  "solana-net-utils",
  "solana-perf",
  "solana-poh",
- "solana-program-runtime",
  "solana-quic-client",
  "solana-rayon-threadlimit",
  "solana-rpc",
  "solana-rpc-client-api",
  "solana-runtime",
+ "solana-runtime-transaction",
+ "solana-sanitize",
  "solana-sdk",
  "solana-send-transaction-service",
+ "solana-short-vec",
  "solana-streamer",
  "solana-svm",
+ "solana-svm-transaction",
+ "solana-timings",
  "solana-tpu-client",
  "solana-transaction-status",
  "solana-turbine",
@@ -5447,45 +5795,81 @@ dependencies = [
 
 [[package]]
 name = "solana-cost-model"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f03ea474a167b642bba65389f8ab97064b8455c25abc9b9721c470bfcc215ea4"
+checksum = "448128561bb950bce19cdbbdc1780955a52ef25f1984c9c13b35b4b9cdc548c4"
 dependencies = [
  "ahash 0.8.11",
  "lazy_static",
  "log",
- "rustc_version",
- "solana-address-lookup-table-program",
- "solana-bpf-loader-program",
+ "solana-builtins-default-costs",
  "solana-compute-budget",
- "solana-compute-budget-program",
- "solana-config-program",
- "solana-loader-v4-program",
+ "solana-feature-set",
  "solana-metrics",
+ "solana-runtime-transaction",
  "solana-sdk",
- "solana-stake-program",
- "solana-system-program",
+ "solana-svm-transaction",
  "solana-vote-program",
 ]
 
+[[package]]
+name = "solana-cpi"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25c536ad0ce25d84a64f48dedcb773e764827e0ef781eda41fa1fa35f5d64b38"
+dependencies = [
+ "solana-account-info",
+ "solana-define-syscall",
+ "solana-instruction",
+ "solana-program-error",
+ "solana-pubkey",
+ "solana-stable-layout",
+]
+
 [[package]]
 name = "solana-curve25519"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109fa7ddac40dc7807c60c789f1db26f0aae920ecae5ab1e6132c74300a99fdf"
+checksum = "f934d38b6f2a940fb1e1d8eaa17a14ffd3773b37be9fb29fa4bcec1bac5e4591"
 dependencies = [
  "bytemuck",
  "bytemuck_derive",
- "curve25519-dalek",
+ "curve25519-dalek 4.1.3",
  "solana-program",
  "thiserror",
 ]
 
+[[package]]
+name = "solana-decode-error"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5a431f532d030098e81d120877f2dddbd3dd90bea5b259198a6aae4ff6456c3"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "solana-define-syscall"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7062ae1de58e294d3bee5fd2c89efc155b7f7383ddce4cb88345dfafaaabc5bd"
+
+[[package]]
+name = "solana-derivation-path"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12080d9bf8eecd559c6f40b5aaf9e47f7f28f515218087f83f02e493b46d8388"
+dependencies = [
+ "derivation-path",
+ "qstring",
+ "uriparse",
+]
+
 [[package]]
 name = "solana-entry"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c416ec0fdea768cb2d282852e93611591691a4821665347f8da76cfee7e245"
+checksum = "151cbfd824285d3b6ab6391f85448f73364baca34a897184e26ad7c66165e3f0"
 dependencies = [
  "bincode",
  "crossbeam-channel",
@@ -5503,11 +5887,22 @@ dependencies = [
  "solana-sdk",
 ]
 
+[[package]]
+name = "solana-epoch-schedule"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65c4cf7d7c266d353169cf4feeada5e4bba3a55f33715535fa1ef49080eac3e0"
+dependencies = [
+ "serde",
+ "serde_derive",
+ "solana-sdk-macro",
+]
+
 [[package]]
 name = "solana-faucet"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c3d6647891d23578a815cfca4b7d9355afe706e16c342778dd93c5d313b402"
+checksum = "281c481c0efa41a7ddada5dbffabee9099a6b01e9d748b7135366df589f7415e"
 dependencies = [
  "bincode",
  "byteorder",
@@ -5527,11 +5922,46 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "solana-feature-set"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cebf45992982065a0b01b4e109bf039b2ebf6394b21672382fd951516d4c9b0"
+dependencies = [
+ "lazy_static",
+ "solana-clock",
+ "solana-epoch-schedule",
+ "solana-hash",
+ "solana-pubkey",
+ "solana-sha256-hasher",
+]
+
+[[package]]
+name = "solana-fee"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "833e9a34c8cb1271e360b240dce43065cc4419ad74fc7e807c4e30cf06ebca80"
+dependencies = [
+ "solana-sdk",
+ "solana-svm-transaction",
+]
+
+[[package]]
+name = "solana-fee-calculator"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2befe056ece2eb5807298c2b569a35ee52f79df859bdd16a1f97869f8224a28"
+dependencies = [
+ "log",
+ "serde",
+ "serde_derive",
+]
+
 [[package]]
 name = "solana-geyser-plugin-manager"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ef9c649ca5e09047bc250b6df1e1e87f9ca42489e3d9b0c9fbbec80a05382fa"
+checksum = "4ac089db04deff5826ad8469e0c934e77451315396ee30fde4d512d6b60f2cca"
 dependencies = [
  "agave-geyser-plugin-interface",
  "bs58",
@@ -5556,9 +5986,9 @@ dependencies = [
 
 [[package]]
 name = "solana-gossip"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1383108156bb2ba2a9dbb18b16d3c7f6e1627c0d588127e501aec3a62ec2aef6"
+checksum = "c5849898b9a0a9b4dc9a200fa7b28d1c929bb89f8db4e8b5899d2d32277459ce"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -5566,7 +5996,7 @@ dependencies = [
  "clap 2.34.0",
  "crossbeam-channel",
  "flate2",
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "itertools 0.12.1",
  "log",
  "lru",
@@ -5574,8 +6004,6 @@ dependencies = [
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rayon",
- "rustc_version",
- "rustversion",
  "serde",
  "serde_bytes",
  "serde_derive",
@@ -5584,6 +6012,7 @@ dependencies = [
  "solana-client",
  "solana-connection-cache",
  "solana-entry",
+ "solana-feature-set",
  "solana-ledger",
  "solana-logger",
  "solana-measure",
@@ -5591,8 +6020,12 @@ dependencies = [
  "solana-net-utils",
  "solana-perf",
  "solana-rayon-threadlimit",
+ "solana-rpc-client",
  "solana-runtime",
+ "solana-sanitize",
  "solana-sdk",
+ "solana-serde-varint",
+ "solana-short-vec",
  "solana-streamer",
  "solana-tpu-client",
  "solana-version",
@@ -5602,27 +6035,96 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "solana-hash"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1807bc4e9e1d25271514167d5a1e698ce5a330bce547a368242dd63b355b5faa"
+dependencies = [
+ "borsh 1.5.1",
+ "bs58",
+ "bytemuck",
+ "bytemuck_derive",
+ "js-sys",
+ "serde",
+ "serde_derive",
+ "solana-atomic-u64",
+ "solana-sanitize",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "solana-inflation"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a60b572cdf0ec8fcf5a53e5ba4e3e19814dd96c2b9c156d5828be68d0d2e7103"
+dependencies = [
+ "serde",
+ "serde_derive",
+]
+
 [[package]]
 name = "solana-inline-spl"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41db2986bf08224629a6ddafcf6e4cc822c9000f315ee43327302e0130ee8c25"
+checksum = "d24c9c6590e4eaf91efa887b2689b2941fe4b324bccd9a95f77853168f3d9a88"
 dependencies = [
  "bytemuck",
- "rustc_version",
- "solana-sdk",
+ "solana-pubkey",
+]
+
+[[package]]
+name = "solana-instruction"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfef689e06e5c7cb6206d4dc61ac77733de4f72d754e0d531393206abc27dbe4"
+dependencies = [
+ "bincode",
+ "borsh 1.5.1",
+ "getrandom 0.2.10",
+ "js-sys",
+ "num-traits",
+ "serde",
+ "serde_derive",
+ "solana-define-syscall",
+ "solana-pubkey",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "solana-last-restart-slot"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3186feae497bdfd2e77bfa56caed38b1cb1b0f389506666e3331f0b9ae799cb"
+dependencies = [
+ "serde",
+ "serde_derive",
+ "solana-sdk-macro",
+]
+
+[[package]]
+name = "solana-lattice-hash"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ec86f48a8694d55757922823823069a3652d2896f61f3ffc4b741646c166a62"
+dependencies = [
+ "base64 0.22.1",
+ "blake3",
+ "bs58",
+ "bytemuck",
 ]
 
 [[package]]
 name = "solana-ledger"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51f7b0b73e0eb678f0125d90bcccb28905cfd7ba0b98447f81e0a8cf5ab146b"
+checksum = "d181954a7e0ef3847ed2336adda1214cda401ac2c5557ebb63d700e409864881"
 dependencies = [
  "assert_matches",
  "bincode",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "byteorder",
+ "bzip2",
  "chrono",
  "chrono-humanize",
  "crossbeam-channel",
@@ -5646,7 +6148,6 @@ dependencies = [
  "rayon",
  "reed-solomon-erasure",
  "rocksdb",
- "rustc_version",
  "scopeguard",
  "serde",
  "serde_bytes",
@@ -5656,6 +6157,7 @@ dependencies = [
  "solana-bpf-loader-program",
  "solana-cost-model",
  "solana-entry",
+ "solana-feature-set",
  "solana-measure",
  "solana-metrics",
  "solana-perf",
@@ -5667,6 +6169,8 @@ dependencies = [
  "solana-storage-bigtable",
  "solana-storage-proto",
  "solana-svm",
+ "solana-svm-transaction",
+ "solana-timings",
  "solana-transaction-status",
  "solana-vote",
  "solana-vote-program",
@@ -5675,6 +6179,7 @@ dependencies = [
  "static_assertions",
  "strum 0.24.1",
  "strum_macros 0.24.3",
+ "tar",
  "tempfile",
  "thiserror",
  "tokio",
@@ -5684,12 +6189,14 @@ dependencies = [
 
 [[package]]
 name = "solana-loader-v4-program"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb89d7fee9ac27ee6ead4bf81bbad181c506ac628bb3a10200e15536956c816d"
+checksum = "94c6915a49e537925e934551dbce2db2357d555d257a311bbf5ba0810cb1017a"
 dependencies = [
  "log",
+ "solana-bpf-loader-program",
  "solana-compute-budget",
+ "solana-log-collector",
  "solana-measure",
  "solana-program-runtime",
  "solana-sdk",
@@ -5697,11 +6204,20 @@ dependencies = [
  "solana_rbpf",
 ]
 
+[[package]]
+name = "solana-log-collector"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b529f5736a6c0794a885dac2e091138d3db6d924335906f117a62b58b0d3b5dc"
+dependencies = [
+ "log",
+]
+
 [[package]]
 name = "solana-logger"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20dcd2df996a278075cfa41bbc07efc442b2b88b9538018ee8831a7ba1eb9df4"
+checksum = "367c5431bad14b10fbb62614b48720b746672558dba3244167ff7d251890c355"
 dependencies = [
  "env_logger",
  "lazy_static",
@@ -5710,29 +6226,26 @@ dependencies = [
 
 [[package]]
 name = "solana-measure"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f05d55c422b89ab28b4c277096a28b8449b2cc6c676a8b9f206f5b6fe0e9250"
-dependencies = [
- "log",
- "solana-sdk",
-]
+checksum = "33b2047a2f588082b71080b060918f107c3330ae1505f759c3b2d74bae9d9c88"
 
 [[package]]
 name = "solana-merkle-tree"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed80bcbc059b0c7e3b1494881224fca5b32d0df3cdbc2d60c5a63855b9f3653"
+checksum = "e75fa782e9cf2a846f09f96594db01e3005aeefb36ce53aebc41b050381e9989"
 dependencies = [
  "fast-math",
- "solana-program",
+ "solana-hash",
+ "solana-sha256-hasher",
 ]
 
 [[package]]
 name = "solana-metrics"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af252344d7c3db5fc4584b1188801efa19c4b5186ec79fecf03172c327f68bdc"
+checksum = "6319c74238e8ed4f7159fd37c693a574ab8316d03b053103f9cc83dce13f1d5c"
 dependencies = [
  "crossbeam-channel",
  "gethostname",
@@ -5743,14 +6256,28 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "solana-msg"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f7551f85064bc7299d56dbd7126258b084a2d78d0325b1579324f818b405123"
+dependencies = [
+ "solana-define-syscall",
+]
+
+[[package]]
+name = "solana-native-token"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0c4074f5fc67574dabd8f30fe6e51e290a812d88326b19b49c462058e23340"
+
 [[package]]
 name = "solana-net-utils"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a0ec8ca1735e594027f162c786b2d0a5876175179fef64a0c4a3d5a57868cb"
+checksum = "bbac19474a4c4f91cb264c2fccead8a1a4f65384ce650b24360d9df5650e65bc"
 dependencies = [
  "bincode",
- "clap 3.2.25",
  "crossbeam-channel",
  "log",
  "nix",
@@ -5758,10 +6285,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "socket2",
- "solana-logger",
  "solana-sdk",
- "solana-version",
- "static_assertions",
  "tokio",
  "url 2.5.2",
 ]
@@ -5772,17 +6296,31 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e"
 
+[[package]]
+name = "solana-packet"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dafc2d84e57dbfe32583fe915962bd2ca3af6be496628a871db3c3d697b38d7"
+dependencies = [
+ "bincode",
+ "bitflags 2.6.0",
+ "cfg_eval",
+ "serde",
+ "serde_derive",
+ "serde_with",
+]
+
 [[package]]
 name = "solana-perf"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "607e921709ecc9415142bb0fbd6ff0a9ecdc3f06d1b2dd49e50fd28397065dc1"
+checksum = "e8299f1ba518f9888da8cafa861addc6ffdd639c689e3ce219ae08212c0dcd0e"
 dependencies = [
  "ahash 0.8.11",
  "bincode",
  "bv",
  "caps",
- "curve25519-dalek",
+ "curve25519-dalek 4.1.3",
  "dlopen2",
  "fnv",
  "lazy_static",
@@ -5791,19 +6329,19 @@ dependencies = [
  "nix",
  "rand 0.8.5",
  "rayon",
- "rustc_version",
  "serde",
  "solana-metrics",
  "solana-rayon-threadlimit",
  "solana-sdk",
+ "solana-short-vec",
  "solana-vote-program",
 ]
 
 [[package]]
 name = "solana-poh"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6ef60354bd1097a1141f2081b102806b6414de1e644a11ef60f8fe6cff21c8b"
+checksum = "c11f9be81af30870cfc5b782e46565f65685d75a6969052d5f8f063a3271c66c"
 dependencies = [
  "core_affinity",
  "crossbeam-channel",
@@ -5819,28 +6357,35 @@ dependencies = [
 
 [[package]]
 name = "solana-poseidon"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a317bd81fea0544982496b77f00548fd05d7fd6e0225336ece1b5baa166cc849"
+checksum = "f193a65f0db7fe5615c76c2814d6450a2e4cda61f786d5bf7a6b1ad0c179b947"
 dependencies = [
  "ark-bn254",
  "light-poseidon",
+ "solana-define-syscall",
  "thiserror",
 ]
 
+[[package]]
+name = "solana-precompile-error"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a30ab58b9e37cde4e5577282670f30df71b97b6b06dbdb420e9b84e57b831227"
+dependencies = [
+ "num-traits",
+ "solana-decode-error",
+]
+
 [[package]]
 name = "solana-program"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70306519f79aa7699264d76d7f4fe252ab22fef3a85404a748a42f8dd750653e"
+checksum = "9040decf2f295d35da22557eeab3768ab8dfca8aed9afe668663c8fa0e97d60e"
 dependencies = [
- "ark-bn254",
- "ark-ec",
- "ark-ff",
- "ark-serialize",
  "base64 0.22.1",
  "bincode",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "blake3",
  "borsh 0.10.3",
  "borsh 1.5.1",
@@ -5850,39 +6395,121 @@ dependencies = [
  "bytemuck_derive",
  "console_error_panic_hook",
  "console_log",
- "curve25519-dalek",
+ "curve25519-dalek 4.1.3",
+ "five8_const",
  "getrandom 0.2.10",
  "js-sys",
  "lazy_static",
- "libsecp256k1",
  "log",
  "memoffset 0.9.0",
- "num-bigint 0.4.5",
+ "num-bigint 0.4.6",
  "num-derive",
  "num-traits",
  "parking_lot 0.12.0",
  "rand 0.8.5",
- "rustc_version",
- "rustversion",
  "serde",
  "serde_bytes",
  "serde_derive",
  "sha2 0.10.8",
- "sha3 0.10.8",
+ "sha3",
+ "solana-account-info",
+ "solana-atomic-u64",
+ "solana-bincode",
+ "solana-borsh",
+ "solana-clock",
+ "solana-cpi",
+ "solana-decode-error",
+ "solana-define-syscall",
+ "solana-epoch-schedule",
+ "solana-fee-calculator",
+ "solana-hash",
+ "solana-instruction",
+ "solana-last-restart-slot",
+ "solana-msg",
+ "solana-native-token",
+ "solana-program-entrypoint",
+ "solana-program-error",
+ "solana-program-memory",
+ "solana-program-option",
+ "solana-program-pack",
+ "solana-pubkey",
+ "solana-rent",
+ "solana-sanitize",
  "solana-sdk-macro",
+ "solana-secp256k1-recover",
+ "solana-serde-varint",
+ "solana-serialize-utils",
+ "solana-sha256-hasher",
+ "solana-short-vec",
+ "solana-slot-hashes",
+ "solana-slot-history",
+ "solana-stable-layout",
+ "solana-transaction-error",
  "thiserror",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "solana-program-entrypoint"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eb90f3fa3e979b912451a404508f1f90bb6e5c1d7767625f622b20016fb9fde"
+dependencies = [
+ "solana-account-info",
+ "solana-msg",
+ "solana-program-error",
+ "solana-pubkey",
+]
+
+[[package]]
+name = "solana-program-error"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd089caeef26dd07bd12b7b67d45e92faddc2fc67a960f316df7ae4776a2f3d5"
+dependencies = [
+ "borsh 1.5.1",
+ "num-traits",
+ "serde",
+ "serde_derive",
+ "solana-decode-error",
+ "solana-instruction",
+ "solana-msg",
+ "solana-pubkey",
+]
+
+[[package]]
+name = "solana-program-memory"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed4bc044dc2b49c323aeff04aec03c908a052e278c2edf2f7616f32fc0f1bcd9"
+dependencies = [
+ "num-traits",
+ "solana-define-syscall",
+]
+
+[[package]]
+name = "solana-program-option"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3babbdffd81994c043fc9a61458ce87496218825d6e9a303de643c0a53089b9a"
+
+[[package]]
+name = "solana-program-pack"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fb28439d23e1f505e59c7a14ed5012365ab7aa0f20dc7bda048e02ff231cf6"
+dependencies = [
+ "solana-program-error",
+]
+
 [[package]]
 name = "solana-program-runtime"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9df6b9034e3f60922fb1c0214af5c0b4819bdca358729c4e5eb8c4a6de13329"
+checksum = "ba1de51df173401d50c0f4cf750f5070d7a4c82125a03c1aec9622dc041b0b54"
 dependencies = [
  "base64 0.22.1",
  "bincode",
- "eager",
  "enum-iterator",
  "itertools 0.12.1",
  "libc",
@@ -5891,12 +6518,14 @@ dependencies = [
  "num-traits",
  "percentage",
  "rand 0.8.5",
- "rustc_version",
  "serde",
  "solana-compute-budget",
+ "solana-feature-set",
+ "solana-log-collector",
  "solana-measure",
  "solana-metrics",
  "solana-sdk",
+ "solana-timings",
  "solana-type-overrides",
  "solana-vote",
  "solana_rbpf",
@@ -5905,9 +6534,9 @@ dependencies = [
 
 [[package]]
 name = "solana-program-test"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5cce5a81c0cd91a9a4368dce2735d04eebeb690a2f9178d8438d9705e50ec04"
+checksum = "974591eca853eafee8196a3445b81fd03ebd9b3e38a6dd7b6f22dc3414c32be6"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -5923,23 +6552,54 @@ dependencies = [
  "solana-banks-server",
  "solana-bpf-loader-program",
  "solana-compute-budget",
+ "solana-feature-set",
  "solana-inline-spl",
+ "solana-instruction",
+ "solana-log-collector",
  "solana-logger",
  "solana-program-runtime",
  "solana-runtime",
  "solana-sdk",
  "solana-svm",
+ "solana-timings",
  "solana-vote-program",
  "solana_rbpf",
  "thiserror",
  "tokio",
 ]
 
+[[package]]
+name = "solana-pubkey"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bea3215775fcedf200d47590c7e2ce9a3a46bc2b7d3f77d0eae9c6edf0a39aec"
+dependencies = [
+ "borsh 0.10.3",
+ "borsh 1.5.1",
+ "bs58",
+ "bytemuck",
+ "bytemuck_derive",
+ "curve25519-dalek 4.1.3",
+ "five8_const",
+ "getrandom 0.2.10",
+ "js-sys",
+ "num-traits",
+ "rand 0.8.5",
+ "serde",
+ "serde_derive",
+ "solana-atomic-u64",
+ "solana-decode-error",
+ "solana-define-syscall",
+ "solana-sanitize",
+ "solana-sha256-hasher",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "solana-pubsub-client"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3209efb2a3824da1812867d3bee72991074b5bf4696e942526d3376a9da1719"
+checksum = "9d28adf5ff89c19ef3cb24d0f484afa05852697881c2e4ef12aec190d61f76d8"
 dependencies = [
  "crossbeam-channel",
  "futures-util",
@@ -5962,11 +6622,11 @@ dependencies = [
 
 [[package]]
 name = "solana-quic-client"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "438a959b0fdd4462f2e3414e344eb238cfcae47954138e7c3b71c91cdddcd0f8"
+checksum = "259c6d420c0b7620557700f13fbbdb00afbb1b82274485c27ba30dd660ea921b"
 dependencies = [
- "async-mutex",
+ "async-lock",
  "async-trait",
  "futures 0.3.31",
  "itertools 0.12.1",
@@ -5974,7 +6634,7 @@ dependencies = [
  "log",
  "quinn",
  "quinn-proto",
- "rustls",
+ "rustls 0.23.16",
  "solana-connection-cache",
  "solana-measure",
  "solana-metrics",
@@ -5988,9 +6648,9 @@ dependencies = [
 
 [[package]]
 name = "solana-rayon-threadlimit"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad3deea78e2595058eb1ed0df39d7edefa27af7dd0c48ccec52f420c5cd7d8f3"
+checksum = "4c69806ad1a7b0986f750134e13e55d83919631d81a2328a588615740e14ed0a"
 dependencies = [
  "lazy_static",
  "num_cpus",
@@ -5998,9 +6658,9 @@ dependencies = [
 
 [[package]]
 name = "solana-remote-wallet"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5c77daeb53dfb4505278edfce9b19a3c3f87fa087dcae7d991992482abe16fc"
+checksum = "6f36cf8ad0090276b5e9c73512df889b84092761ed733a26781b164c9e95f544"
 dependencies = [
  "console",
  "dialoguer",
@@ -6011,16 +6671,28 @@ dependencies = [
  "parking_lot 0.12.0",
  "qstring",
  "semver",
+ "solana-derivation-path",
  "solana-sdk",
  "thiserror",
  "uriparse",
 ]
 
+[[package]]
+name = "solana-rent"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aab3f4a270196c38d62c3bb3c7a2f07732af2c772b50da49c9b1e2c9d2ace286"
+dependencies = [
+ "serde",
+ "serde_derive",
+ "solana-sdk-macro",
+]
+
 [[package]]
 name = "solana-rpc"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c017bb0895569b24f0cade001a61aaa00870e0afb5193f16cd20adfab5bc6f16"
+checksum = "b6e2cf5309990480e4d52e59850bbd8181e1e2c8d4321a44b1c6b89e05df2c44"
 dependencies = [
  "base64 0.22.1",
  "bincode",
@@ -6046,6 +6718,7 @@ dependencies = [
  "solana-client",
  "solana-entry",
  "solana-faucet",
+ "solana-feature-set",
  "solana-gossip",
  "solana-inline-spl",
  "solana-ledger",
@@ -6077,9 +6750,9 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-client"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c707af41ab518c8cae359fe9812c90d35f1f38bddec0cacae5a449d871a780c"
+checksum = "3b05822aceeb484074a72d82a1b289da9fc3383f9ba3f55ce4bfd003bf9d62e6"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -6093,10 +6766,10 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "solana-account-decoder",
+ "solana-account-decoder-client-types",
  "solana-rpc-client-api",
  "solana-sdk",
- "solana-transaction-status",
+ "solana-transaction-status-client-types",
  "solana-version",
  "solana-vote-program",
  "tokio",
@@ -6104,9 +6777,9 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-client-api"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e112f318737465bbc72a37a67bea1af546cb48a0fa036f580b0b9d811c37c44b"
+checksum = "cb9c6e64f01cfafef9b2d43d6adb02979bb22f579ec8ee88b77796259acce92e"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -6118,22 +6791,20 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "solana-account-decoder",
+ "solana-account-decoder-client-types",
  "solana-inline-spl",
  "solana-sdk",
- "solana-transaction-status",
+ "solana-transaction-status-client-types",
  "solana-version",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-rpc-client-nonce-utils"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "987af8ea438abb5ed2154bd28eb9a4fc91b67684aab9feb6567126a564c27d52"
-dependencies = [
- "clap 2.34.0",
- "solana-clap-utils",
+checksum = "7f0ab2d1ca3769c5058c689b438d35eb1cb7d2a32fc4b2b7c16fe72fa187927c"
+dependencies = [
  "solana-rpc-client",
  "solana-sdk",
  "thiserror",
@@ -6141,10 +6812,11 @@ dependencies = [
 
 [[package]]
 name = "solana-runtime"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9441541ee347eab8826bcf1b87ff09f6cdb7a747b15f59e28b63a391683033d1"
+checksum = "60f579df1ed24b2e7be5c99c2b97cb2a331823008129103b5b7753057ddf3cf7"
 dependencies = [
+ "ahash 0.8.11",
  "aquamarine",
  "arrayref",
  "base64 0.22.1",
@@ -6178,10 +6850,10 @@ dependencies = [
  "rand 0.8.5",
  "rayon",
  "regex",
- "rustc_version",
  "serde",
  "serde_derive",
  "serde_json",
+ "serde_with",
  "solana-accounts-db",
  "solana-address-lookup-table-program",
  "solana-bpf-loader-program",
@@ -6190,17 +6862,25 @@ dependencies = [
  "solana-compute-budget-program",
  "solana-config-program",
  "solana-cost-model",
+ "solana-feature-set",
+ "solana-fee",
  "solana-inline-spl",
+ "solana-lattice-hash",
  "solana-loader-v4-program",
  "solana-measure",
  "solana-metrics",
  "solana-perf",
+ "solana-program",
  "solana-program-runtime",
  "solana-rayon-threadlimit",
+ "solana-runtime-transaction",
  "solana-sdk",
  "solana-stake-program",
  "solana-svm",
+ "solana-svm-rent-collector",
+ "solana-svm-transaction",
  "solana-system-program",
+ "solana-timings",
  "solana-transaction-status",
  "solana-version",
  "solana-vote",
@@ -6219,25 +6899,45 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "solana-runtime-transaction"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01e1757d4473c7a2f462d2ce5f3cb5689145cfbde3a6b12161a49e497633ab85"
+dependencies = [
+ "agave-transaction-view",
+ "log",
+ "solana-builtins-default-costs",
+ "solana-compute-budget",
+ "solana-pubkey",
+ "solana-sdk",
+ "solana-svm-transaction",
+ "thiserror",
+]
+
+[[package]]
+name = "solana-sanitize"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "203b90994371db8cade8e885f74ec9f68ee02a32b25d514594158b2551a4e5ed"
+
 [[package]]
 name = "solana-sdk"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f465706f7595391c7b65d19a940ed488fea5dab69eb8c9c211de87a416a0154"
+checksum = "524604d94185c189616296e5b7da1014cc96d1e446bd2b26f247f00708b9225a"
 dependencies = [
  "bincode",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "borsh 1.5.1",
  "bs58",
  "bytemuck",
  "bytemuck_derive",
  "byteorder",
  "chrono",
- "derivation-path",
  "digest 0.10.7",
  "ed25519-dalek",
  "ed25519-dalek-bip32",
- "generic-array 0.14.7",
  "getrandom 0.1.16",
  "hmac 0.12.1",
  "itertools 0.12.1",
@@ -6246,41 +6946,68 @@ dependencies = [
  "libsecp256k1",
  "log",
  "memmap2 0.5.10",
+ "num-derive",
+ "num-traits",
  "num_enum",
  "pbkdf2 0.11.0",
- "qstring",
  "rand 0.7.3",
  "rand 0.8.5",
- "rustc_version",
- "rustversion",
  "serde",
  "serde_bytes",
  "serde_derive",
  "serde_json",
- "serde_with 2.3.3",
+ "serde_with",
  "sha2 0.10.8",
- "sha3 0.10.8",
+ "sha3",
  "siphasher",
+ "solana-account",
+ "solana-bn254",
+ "solana-decode-error",
+ "solana-derivation-path",
+ "solana-feature-set",
+ "solana-inflation",
+ "solana-instruction",
+ "solana-native-token",
+ "solana-packet",
+ "solana-precompile-error",
  "solana-program",
+ "solana-program-memory",
+ "solana-pubkey",
+ "solana-sanitize",
  "solana-sdk-macro",
+ "solana-secp256k1-recover",
+ "solana-serde-varint",
+ "solana-short-vec",
+ "solana-signature",
+ "solana-transaction-error",
  "thiserror",
- "uriparse",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "solana-sdk-macro"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44bfdd94b479f125a64f028c31ca6b018cf7ab1a5ebc974f175c54dd56ad58b1"
+checksum = "1bd2265b93dce9d3dcf9f395abf1a85b5e06e4da4aa60ca147620003ac3abc67"
 dependencies = [
  "bs58",
  "proc-macro2",
  "quote",
- "rustversion",
  "syn 2.0.82",
 ]
 
+[[package]]
+name = "solana-secp256k1-recover"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2eef5a00a75648273c3fb6e3d85b0c8c02fcc1e36c4271664dcc39b6b128d41"
+dependencies = [
+ "borsh 1.5.1",
+ "libsecp256k1",
+ "solana-define-syscall",
+ "thiserror",
+]
+
 [[package]]
 name = "solana-security-txt"
 version = "1.1.1"
@@ -6289,9 +7016,9 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183"
 
 [[package]]
 name = "solana-send-transaction-service"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de968aa5bfb90210001d104c9a59a7c7cde520f6c15be866a5bd072c5d659677"
+checksum = "8dc6adaa31bdaab1e5f8932575e75160f4806553ab5e15e552c258dfe1d5594b"
 dependencies = [
  "crossbeam-channel",
  "log",
@@ -6304,16 +7031,104 @@ dependencies = [
  "solana-tpu-client",
 ]
 
+[[package]]
+name = "solana-serde-varint"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aeb51d3c20e2a61db0ef72617f3b8c9207a342a867af454a95f17add9f6c262"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "solana-serialize-utils"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cfb0b57c6a431fb15ff33053caadb6c36aed4e1ce74bea9adfc459a710b3626"
+dependencies = [
+ "solana-instruction",
+ "solana-pubkey",
+ "solana-sanitize",
+]
+
+[[package]]
+name = "solana-sha256-hasher"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd115f3a1136314b0183235080d29023530c3a0a5df60505fdb7ea620eff9fd6"
+dependencies = [
+ "sha2 0.10.8",
+ "solana-define-syscall",
+ "solana-hash",
+]
+
+[[package]]
+name = "solana-short-vec"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08e55330b694db1139dcdf2a1ea7781abe8bd994dec2ab29e36abfd06e4e9274"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "solana-signature"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ad9784d110f195a3a4fe423479d18f05b01a1c380a1430644a3b3038fdbe2f0"
+dependencies = [
+ "bs58",
+ "ed25519-dalek",
+ "generic-array 0.14.7",
+ "rand 0.8.5",
+ "serde",
+ "serde_derive",
+ "solana-sanitize",
+]
+
+[[package]]
+name = "solana-slot-hashes"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17d216c0ebf00e95acaf2b1e227e6cc900a5ce50fb81fa0743272851e88a788d"
+dependencies = [
+ "serde",
+ "serde_derive",
+ "solana-hash",
+]
+
+[[package]]
+name = "solana-slot-history"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88cbcdf767891c6a40116a5ef8f7241000f074ece4ba80c8f00b4f62705fc8a4"
+dependencies = [
+ "bv",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "solana-stable-layout"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a5305ca88fb5deb219cd88f04e24f3a131769417d7fcb11a8da1126a8f98d23"
+dependencies = [
+ "solana-instruction",
+ "solana-pubkey",
+]
+
 [[package]]
 name = "solana-stake-program"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b8169153b45aace9dc8a9810c08500fb9636d8bfce3798d3ae0c409a79d78d2"
+checksum = "c8bb1a59fdd929becddfaed9ec33a1ca4db853f45ae85e14e4f4054a875fc41d"
 dependencies = [
  "bincode",
  "log",
- "rustc_version",
  "solana-config-program",
+ "solana-feature-set",
+ "solana-log-collector",
  "solana-program-runtime",
  "solana-sdk",
  "solana-type-overrides",
@@ -6322,9 +7137,9 @@ dependencies = [
 
 [[package]]
 name = "solana-storage-bigtable"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c41b91bcac603a0ab7ae6a06e3ea5cf8c96414d68affe6b5bda0243d2a6a61b5"
+checksum = "bd27a62abd1e8abab640ed77565fcbf10745e732fc016013f521f3a46193d07a"
 dependencies = [
  "backoff",
  "bincode",
@@ -6356,9 +7171,9 @@ dependencies = [
 
 [[package]]
 name = "solana-storage-proto"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561fb46c3630989f21a192fe5fc4a5f0c37bb10b5f5de62e5b3b8a00f635b564"
+checksum = "12335d3d506aa9a49ac0674c00a5ea3de2d617e77ced0611080a3c1cdd61ada5"
 dependencies = [
  "bincode",
  "bs58",
@@ -6373,17 +7188,19 @@ dependencies = [
 
 [[package]]
 name = "solana-streamer"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15a9e5052d42163a82e57e7592a510df51c537b9eacdac6a6db9ea971d77e90c"
+checksum = "ff771524872781eca074e0ba221d72b07fa0800cc1a7ffa400a9eb3e125fb922"
 dependencies = [
  "async-channel",
  "bytes",
  "crossbeam-channel",
  "dashmap",
+ "futures 0.3.31",
  "futures-util",
+ "governor",
  "histogram",
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "itertools 0.12.1",
  "libc",
  "log",
@@ -6393,8 +7210,9 @@ dependencies = [
  "quinn",
  "quinn-proto",
  "rand 0.8.5",
- "rustls",
+ "rustls 0.23.16",
  "smallvec",
+ "socket2",
  "solana-measure",
  "solana-metrics",
  "solana-perf",
@@ -6402,45 +7220,69 @@ dependencies = [
  "solana-transaction-metrics-tracker",
  "thiserror",
  "tokio",
+ "tokio-util 0.7.1",
  "x509-parser",
 ]
 
 [[package]]
 name = "solana-svm"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85a997df828d0c09ed21fb15ffe451c9fef7d76d08763dd28f7e1a709e3fe902"
+checksum = "43f3b139a001effc93295b693437013f365785fab04dcf2fa679164af4206ec8"
 dependencies = [
  "itertools 0.12.1",
  "log",
  "percentage",
- "prost-build",
- "qualifier_attr",
- "rustc_version",
  "serde",
  "serde_derive",
  "solana-bpf-loader-program",
  "solana-compute-budget",
+ "solana-feature-set",
+ "solana-fee",
  "solana-loader-v4-program",
+ "solana-log-collector",
  "solana-measure",
- "solana-metrics",
  "solana-program-runtime",
+ "solana-runtime-transaction",
  "solana-sdk",
+ "solana-svm-rent-collector",
+ "solana-svm-transaction",
  "solana-system-program",
+ "solana-timings",
  "solana-type-overrides",
  "solana-vote",
+ "thiserror",
+]
+
+[[package]]
+name = "solana-svm-rent-collector"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32e7068d6cc69c730190c96b87b106afd42cde203cf56164106792778cd0aaeb"
+dependencies = [
+ "solana-sdk",
+]
+
+[[package]]
+name = "solana-svm-transaction"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38a8533576cb7beca4a44b976ac27df9865bbf8c4cbca2ee8f4f3469cdd8175f"
+dependencies = [
+ "solana-sdk",
 ]
 
 [[package]]
 name = "solana-system-program"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee8f1408b763edff6642aafd623dba8b534d511741b9747d735c2b0c27c7404a"
+checksum = "242634cdc1eacaa83738cc100fdd583eb88f99cc2edcc900c8ebe57d77af51b1"
 dependencies = [
  "bincode",
  "log",
  "serde",
  "serde_derive",
+ "solana-log-collector",
  "solana-program-runtime",
  "solana-sdk",
  "solana-type-overrides",
@@ -6448,9 +7290,9 @@ dependencies = [
 
 [[package]]
 name = "solana-test-validator"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "729bf398ab355e9afd81605baff6041e648c08f441c94352a5142c2b0fd9c8da"
+checksum = "f1ff3137ff403e0d6c7f04b0800448341e8b4c889eefb2a1cd52e31e71596e72"
 dependencies = [
  "base64 0.22.1",
  "bincode",
@@ -6460,9 +7302,9 @@ dependencies = [
  "serde_json",
  "solana-accounts-db",
  "solana-cli-output",
- "solana-client",
  "solana-compute-budget",
  "solana-core",
+ "solana-feature-set",
  "solana-geyser-plugin-manager",
  "solana-gossip",
  "solana-ledger",
@@ -6471,6 +7313,7 @@ dependencies = [
  "solana-program-test",
  "solana-rpc",
  "solana-rpc-client",
+ "solana-rpc-client-api",
  "solana-runtime",
  "solana-sdk",
  "solana-streamer",
@@ -6480,9 +7323,9 @@ dependencies = [
 
 [[package]]
 name = "solana-thin-client"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd866005e5fb235290a21a9e21fbf71e62baa28d0314461c385fcbee36cb7b5d"
+checksum = "10314ae3e0889cf38140902862d2c2ea481895c82c19f51dc4457b7dfa3aa6d0"
 dependencies = [
  "bincode",
  "log",
@@ -6493,22 +7336,32 @@ dependencies = [
  "solana-sdk",
 ]
 
+[[package]]
+name = "solana-timings"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8a8e2f926d488c1e2a65cbc05544dcb68cfa88deb4d50f89db5bfbda7ff2419"
+dependencies = [
+ "eager",
+ "enum-iterator",
+ "solana-sdk",
+]
+
 [[package]]
 name = "solana-tpu-client"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49982e4c3c6bec81b68fd5dffc913881f0eabed85b1f0ffb356bdf9a174e5524"
+checksum = "516cbed8800cd36fb3ecc9a65df1e76bf8251929aa32e9b10497e8d6612de605"
 dependencies = [
  "async-trait",
  "bincode",
  "futures-util",
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "indicatif",
  "log",
  "rayon",
  "solana-connection-cache",
  "solana-measure",
- "solana-metrics",
  "solana-pubsub-client",
  "solana-rpc-client",
  "solana-rpc-client-api",
@@ -6517,13 +7370,24 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "solana-transaction-error"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37a4bea6d80b34fe6e785d19bf928fe103928d1f6c9935ec23bb6a9d4d7a33d2"
+dependencies = [
+ "serde",
+ "serde_derive",
+ "solana-instruction",
+ "solana-sanitize",
+]
+
 [[package]]
 name = "solana-transaction-metrics-tracker"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfeae9082978a685c4ddb59c522c8a373abc1b8e2aff784832c89bfec6f2994"
+checksum = "b0b668c986a83e6b2eb8f130039045b54abc37ee821853250755386d26c1c668"
 dependencies = [
- "Inflector",
  "base64 0.22.1",
  "bincode",
  "lazy_static",
@@ -6531,13 +7395,14 @@ dependencies = [
  "rand 0.8.5",
  "solana-perf",
  "solana-sdk",
+ "solana-short-vec",
 ]
 
 [[package]]
 name = "solana-transaction-status"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "056d5820fb157d9a4520459157a4bd3ab6371d8217cd3ecbc308552734735cab"
+checksum = "e3e8ed5bf2511c45b923de25482407c9a2eb56af73dba52c19db76df4dd35cba"
 dependencies = [
  "Inflector",
  "base64 0.22.1",
@@ -6551,6 +7416,7 @@ dependencies = [
  "serde_json",
  "solana-account-decoder",
  "solana-sdk",
+ "solana-transaction-status-client-types",
  "spl-associated-token-account 4.0.0",
  "spl-memo 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "spl-token 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -6560,25 +7426,46 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "solana-transaction-status-client-types"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fb35fb678fec581e9bdf6350d2c7f5829951a6280038fc06949b1589a9605e1"
+dependencies = [
+ "base64 0.22.1",
+ "bincode",
+ "bs58",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "solana-account-decoder-client-types",
+ "solana-sdk",
+ "solana-signature",
+ "thiserror",
+]
+
 [[package]]
 name = "solana-turbine"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aec9e742ac44084fe408a7aa3637616ae67e196aed9d9310d14278c2b4f52ec1"
+checksum = "bf66a4e4cf0deed11e1d351fdce52e2a48058bd4b7ece4f5e1e1b435911460e0"
 dependencies = [
  "bincode",
  "bytes",
  "crossbeam-channel",
  "futures 0.3.31",
  "itertools 0.12.1",
+ "lazy-lru",
  "log",
  "lru",
  "quinn",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rayon",
- "rustls",
+ "rustls 0.23.16",
  "solana-entry",
+ "solana-feature-set",
+ "solana-geyser-plugin-manager",
  "solana-gossip",
  "solana-ledger",
  "solana-measure",
@@ -6592,15 +7479,16 @@ dependencies = [
  "solana-runtime",
  "solana-sdk",
  "solana-streamer",
+ "static_assertions",
  "thiserror",
  "tokio",
 ]
 
 [[package]]
 name = "solana-type-overrides"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56de490a66d221f1689e39177f2f8b1d179d9e0c65d21dbe1ba463129c10f48d"
+checksum = "2066f25d460d63801f91436c2640aaba4f2dc95aa18fe1e76f7f2c063e981d4e"
 dependencies = [
  "lazy_static",
  "rand 0.8.5",
@@ -6608,9 +7496,9 @@ dependencies = [
 
 [[package]]
 name = "solana-udp-client"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a7adba62612cad0b91e4ea1a571348b6a6eea0ab5f881d195d01377bbf942f"
+checksum = "95ec0cbc2d5e3379fafb2c1493f2358f07c09e76e2081c44e3a8c36da12fbd40"
 dependencies = [
  "async-trait",
  "solana-connection-cache",
@@ -6623,9 +7511,9 @@ dependencies = [
 
 [[package]]
 name = "solana-unified-scheduler-logic"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cde58f21c126a2934265f928781ccb481b2ebc54408e6f2b1f8b3e3325f8b13"
+checksum = "dd7b34042dc9a9731d47fc0ae1f5e0b4a393b0ad51b27b633df3d21771e4f12b"
 dependencies = [
  "assert_matches",
  "solana-sdk",
@@ -6634,9 +7522,9 @@ dependencies = [
 
 [[package]]
 name = "solana-unified-scheduler-pool"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b695648e6797ba16ead77c41c0b21d2a6e3ed0b909512b184be93c505285cbe"
+checksum = "672e74caac59ba67407a9895bd34906edd9b4de1884ece54afb49607919ab957"
 dependencies = [
  "assert_matches",
  "crossbeam-channel",
@@ -6646,36 +7534,36 @@ dependencies = [
  "qualifier_attr",
  "scopeguard",
  "solana-ledger",
- "solana-program-runtime",
  "solana-runtime",
  "solana-sdk",
+ "solana-timings",
  "solana-unified-scheduler-logic",
+ "static_assertions",
  "vec_extract_if_polyfill",
 ]
 
 [[package]]
 name = "solana-version"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8981d1fbd9fc755ce51280173647bcf8220037edbae62ddbf8cc6c4d32a0d2c"
+checksum = "7310708b642fb83c04f44934509f4f149ffd69d0cd4cf76d9645c991177d7ea0"
 dependencies = [
- "log",
- "rustc_version",
  "semver",
  "serde",
  "serde_derive",
- "solana-sdk",
+ "solana-feature-set",
+ "solana-sanitize",
+ "solana-serde-varint",
 ]
 
 [[package]]
 name = "solana-vote"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f4bac7df996a6d238febc8be3dc35e3f58dd92a623bb5f9d8087565b8e86d00"
+checksum = "5ab46788981765ee706094ca53ad8421aae0286a6b948e892fa7db88992a5373"
 dependencies = [
  "itertools 0.12.1",
  "log",
- "rustc_version",
  "serde",
  "serde_derive",
  "solana-sdk",
@@ -6684,17 +7572,17 @@ dependencies = [
 
 [[package]]
 name = "solana-vote-program"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "801834cb2fee5294604736fd51c8f6d93d58081e81b20ca995b8ed618189ab98"
+checksum = "637cadc921725d1804a451ea7d2dff83310a12b75e0b6c83a8bb67ebc02d10f1"
 dependencies = [
  "bincode",
  "log",
  "num-derive",
  "num-traits",
- "rustc_version",
  "serde",
  "serde_derive",
+ "solana-feature-set",
  "solana-metrics",
  "solana-program",
  "solana-program-runtime",
@@ -6704,9 +7592,9 @@ dependencies = [
 
 [[package]]
 name = "solana-wen-restart"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4e42f68bcda98739a426171abc88de622e165bcbb947ddeefb72e4ad6411ed9"
+checksum = "fb5c015db11fa341ee48fd17d573f27960d32e027606c7cd0586c07332923062"
 dependencies = [
  "anyhow",
  "log",
@@ -6715,27 +7603,26 @@ dependencies = [
  "prost-types",
  "protobuf-src",
  "rayon",
- "rustc_version",
  "solana-entry",
  "solana-gossip",
  "solana-ledger",
- "solana-logger",
  "solana-program",
- "solana-program-runtime",
  "solana-runtime",
  "solana-sdk",
+ "solana-timings",
  "solana-vote-program",
 ]
 
 [[package]]
 name = "solana-zk-elgamal-proof-program"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc84df116efcc6efd9a7060fdc6344c0cc83fd2304e14182f8a494b4ccbdf60"
+checksum = "47f5ac026a972c9cbc6bd0f72f692f85ff9ceec961fc4bcb1f2550e6387e962c"
 dependencies = [
  "bytemuck",
  "num-derive",
  "num-traits",
+ "solana-log-collector",
  "solana-program-runtime",
  "solana-sdk",
  "solana-zk-sdk",
@@ -6743,42 +7630,47 @@ dependencies = [
 
 [[package]]
 name = "solana-zk-sdk"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16795d365543ead535efc7ee60267104044be9d9bbf2ec288f71f29a293c95f"
+checksum = "18c2d96f65cb033f4dc16d3a1b085f8af0ea38012c514a8f65b9b6d75bc9339f"
 dependencies = [
  "aes-gcm-siv",
  "base64 0.22.1",
  "bincode",
  "bytemuck",
  "bytemuck_derive",
- "curve25519-dalek",
+ "curve25519-dalek 4.1.3",
  "itertools 0.12.1",
+ "js-sys",
  "lazy_static",
  "merlin",
  "num-derive",
  "num-traits",
- "rand 0.7.3",
+ "rand 0.8.5",
  "serde",
  "serde_derive",
  "serde_json",
- "sha3 0.9.1",
+ "sha3",
+ "solana-derivation-path",
  "solana-program",
  "solana-sdk",
  "subtle",
  "thiserror",
+ "wasm-bindgen",
  "zeroize",
 ]
 
 [[package]]
 name = "solana-zk-token-proof-program"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e8ba9b43eb8b06c4cf2acf6485196015e733028bb78da1ad68e08ff6a76e54"
+checksum = "83029f0fac09633fc4463dd5a7d13959d1825dccf77889c6e617e2b1265fb2f1"
 dependencies = [
  "bytemuck",
  "num-derive",
  "num-traits",
+ "solana-feature-set",
+ "solana-log-collector",
  "solana-program-runtime",
  "solana-sdk",
  "solana-zk-token-sdk",
@@ -6786,9 +7678,9 @@ dependencies = [
 
 [[package]]
 name = "solana-zk-token-sdk"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e69d5cf8dd8eb3c7d03cb02d0b2acb60c24cc3306cff0c5cac925b39831ff39"
+checksum = "ed293089d8eebd6b5c1b53ee4ad6817889fea254274ddb34cb01ad35a2f817cb"
 dependencies = [
  "aes-gcm-siv",
  "base64 0.22.1",
@@ -6796,18 +7688,19 @@ dependencies = [
  "bytemuck",
  "bytemuck_derive",
  "byteorder",
- "curve25519-dalek",
+ "curve25519-dalek 4.1.3",
  "itertools 0.12.1",
  "lazy_static",
  "merlin",
  "num-derive",
  "num-traits",
- "rand 0.7.3",
+ "rand 0.8.5",
  "serde",
  "serde_derive",
  "serde_json",
- "sha3 0.9.1",
+ "sha3",
  "solana-curve25519",
+ "solana-derivation-path",
  "solana-program",
  "solana-sdk",
  "subtle",
@@ -6817,13 +7710,12 @@ dependencies = [
 
 [[package]]
 name = "solana_rbpf"
-version = "0.8.1"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06beab07f4104d6ad70d47baa67ad1bcd501a2345a983e20c389bade7c72305e"
+checksum = "1c1941b5ef0c3ce8f2ac5dd984d0fb1a97423c4ff2a02eec81e3913f02e2ac2b"
 dependencies = [
  "byteorder",
- "combine",
- "goblin",
+ "combine 3.8.1",
  "hash32",
  "libc",
  "log",
@@ -6846,6 +7738,15 @@ version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5"
 
+[[package]]
+name = "spinning_top"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300"
+dependencies = [
+ "lock_api",
+]
+
 [[package]]
 name = "spl-associated-token-account"
 version = "4.0.0"
@@ -7414,7 +8315,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "serde_with 3.11.0",
+ "serde_with",
  "serial_test",
  "solana-account-decoder",
  "solana-clap-v3-utils",
@@ -7592,7 +8493,7 @@ dependencies = [
  "proptest",
  "serde",
  "serde_json",
- "serde_with 3.11.0",
+ "serde_with",
  "serial_test",
  "solana-program",
  "solana-program-test",
@@ -7736,7 +8637,7 @@ version = "0.1.0"
 dependencies = [
  "base64 0.22.1",
  "bytemuck",
- "curve25519-dalek",
+ "curve25519-dalek 4.1.3",
  "solana-curve25519",
  "solana-zk-sdk",
  "spl-token-confidential-transfer-proof-generation",
@@ -7758,7 +8659,7 @@ dependencies = [
 name = "spl-token-confidential-transfer-proof-generation"
 version = "0.1.0"
 dependencies = [
- "curve25519-dalek",
+ "curve25519-dalek 4.1.3",
  "solana-zk-sdk",
  "thiserror",
 ]
@@ -7767,7 +8668,7 @@ dependencies = [
 name = "spl-token-confidential-transfer-proof-test"
 version = "0.0.1"
 dependencies = [
- "curve25519-dalek",
+ "curve25519-dalek 4.1.3",
  "solana-zk-sdk",
  "spl-token-confidential-transfer-proof-extraction",
  "spl-token-confidential-transfer-proof-generation",
@@ -8283,9 +9184,9 @@ dependencies = [
 
 [[package]]
 name = "tar"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
+checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
 dependencies = [
  "filetime",
  "libc",
@@ -8495,7 +9396,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",
@@ -8573,7 +9474,7 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
- "rustls",
+ "rustls 0.21.12",
  "tokio",
 ]
 
@@ -8595,9 +9496,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -8612,7 +9513,7 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
 dependencies = [
  "futures-util",
  "log",
- "rustls",
+ "rustls 0.21.12",
  "tokio",
  "tokio-rustls",
  "tungstenite",
@@ -8670,7 +9571,7 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "toml_datetime",
  "winnow",
 ]
@@ -8833,7 +9734,7 @@ dependencies = [
  "httparse",
  "log",
  "rand 0.8.5",
- "rustls",
+ "rustls 0.21.12",
  "sha1",
  "thiserror",
  "url 2.5.2",
@@ -9079,19 +9980,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if 1.0.0",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log",
@@ -9116,9 +10018,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -9126,9 +10028,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9139,9 +10041,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "web-sys"
@@ -9159,7 +10061,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]]
@@ -9168,6 +10070,15 @@ version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
 
+[[package]]
+name = "webpki-roots"
+version = "0.26.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "which"
 version = "4.2.5"
@@ -9440,50 +10351,48 @@ 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",
 ]
 
 [[package]]
 name = "zeroize_derive"
-version = "1.2.2"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65f1a51723ec88c66d5d1fe80c841f17f63587d6691901d66be9bec6c3b51f73"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
- "synstructure",
+ "syn 2.0.82",
 ]
 
 [[package]]
 name = "zstd"
-version = "0.11.2+zstd.1.5.2"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
+checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "5.0.1+zstd.1.5.2"
+version = "7.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c12659121420dd6365c5c3de4901f97145b79651fb1d25814020ed2ed0585ae"
+checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
 dependencies = [
- "libc",
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.1+zstd.1.5.2"
+version = "2.0.13+zstd.1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
+checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
 dependencies = [
  "cc",
- "libc",
+ "pkg-config",
 ]
diff --git a/associated-token-account/client/Cargo.toml b/associated-token-account/client/Cargo.toml
index 6308d571173..8873f66d7ba 100644
--- a/associated-token-account/client/Cargo.toml
+++ b/associated-token-account/client/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dependencies]
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/associated-token-account/program-test/Cargo.toml b/associated-token-account/program-test/Cargo.toml
index 9b5517abdc0..9caacb82985 100644
--- a/associated-token-account/program-test/Cargo.toml
+++ b/associated-token-account/program-test/Cargo.toml
@@ -11,9 +11,9 @@ version = "0.0.1"
 test-sbf = []
 
 [dev-dependencies]
-solana-program = "2.0.3"
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program = "2.1.0"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 spl-associated-token-account = { version = "5.0.1", path = "../program", features = ["no-entrypoint"] }
 spl-associated-token-account-client = { version = "1.0.0", path = "../client" }
 spl-token = { version = "6.0", path = "../../token/program", features = ["no-entrypoint"] }
diff --git a/associated-token-account/program/Cargo.toml b/associated-token-account/program/Cargo.toml
index 9ce2e41fe78..607815cbfaf 100644
--- a/associated-token-account/program/Cargo.toml
+++ b/associated-token-account/program/Cargo.toml
@@ -15,7 +15,7 @@ test-sbf = []
 borsh = "1.5.1"
 num-derive = "0.4"
 num-traits = "0.2"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-associated-token-account-client = { version = "1.0.0", path = "../client" }
 spl-token = { version = "6.0", path = "../../token/program", features = [
   "no-entrypoint",
diff --git a/binary-option/program/Cargo.toml b/binary-option/program/Cargo.toml
index 79a53110db8..20f336f7291 100644
--- a/binary-option/program/Cargo.toml
+++ b/binary-option/program/Cargo.toml
@@ -9,7 +9,7 @@ no-entrypoint = []
 test-sbf = []
 
 [dependencies]
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 thiserror = "1.0"
 spl-token = { version = "6.0", path = "../../token/program", features = [
   "no-entrypoint",
diff --git a/binary-oracle-pair/program/Cargo.toml b/binary-oracle-pair/program/Cargo.toml
index 92579f83566..31cfe7b8b33 100644
--- a/binary-oracle-pair/program/Cargo.toml
+++ b/binary-oracle-pair/program/Cargo.toml
@@ -13,7 +13,7 @@ test-sbf = []
 [dependencies]
 num-derive = "0.4"
 num-traits = "0.2"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-token = { version = "6.0", path = "../../token/program", features = [
   "no-entrypoint",
 ] }
@@ -22,8 +22,8 @@ uint = "0.10"
 borsh = "1.5.1"
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/ci/rust-version.sh b/ci/rust-version.sh
index 7921ee46cac..2d9d7060a83 100644
--- a/ci/rust-version.sh
+++ b/ci/rust-version.sh
@@ -26,7 +26,7 @@ fi
 if [[ -n $RUST_NIGHTLY_VERSION ]]; then
   nightly_version="$RUST_NIGHTLY_VERSION"
 else
-  nightly_version=2024-05-02
+  nightly_version=2024-08-08
 fi
 
 export rust_stable="$stable_version"
diff --git a/ci/solana-version.sh b/ci/solana-version.sh
index 6699537929e..33af40e8a8a 100755
--- a/ci/solana-version.sh
+++ b/ci/solana-version.sh
@@ -15,9 +15,8 @@ if [[ -n $SOLANA_VERSION ]]; then
   solana_version="$SOLANA_VERSION"
 else
   # This file is now out of sync with the versions in Cargo.toml.
-  # https://github.com/solana-labs/solana-program-library/pull/6182
-  # This will require some manual cleanup the next time the version is updated.
-  solana_version=v2.0.3
+  # Update to v2.1 once the tarball is ready
+  solana_version=v2.0.14
 fi
 
 export solana_version="$solana_version"
diff --git a/examples/rust/cross-program-invocation/Cargo.toml b/examples/rust/cross-program-invocation/Cargo.toml
index bf75f71cab2..ca6cf3a81d4 100644
--- a/examples/rust/cross-program-invocation/Cargo.toml
+++ b/examples/rust/cross-program-invocation/Cargo.toml
@@ -13,11 +13,11 @@ no-entrypoint = []
 test-sbf = []
 
 [dependencies]
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/examples/rust/custom-heap/Cargo.toml b/examples/rust/custom-heap/Cargo.toml
index 1441a103067..276ac0d9348 100644
--- a/examples/rust/custom-heap/Cargo.toml
+++ b/examples/rust/custom-heap/Cargo.toml
@@ -15,11 +15,11 @@ no-entrypoint = []
 test-sbf = []
 
 [dependencies]
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/examples/rust/logging/Cargo.toml b/examples/rust/logging/Cargo.toml
index d61e234a849..70312922678 100644
--- a/examples/rust/logging/Cargo.toml
+++ b/examples/rust/logging/Cargo.toml
@@ -13,11 +13,11 @@ no-entrypoint = []
 test-sbf = []
 
 [dependencies]
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/examples/rust/sysvar/Cargo.toml b/examples/rust/sysvar/Cargo.toml
index c5569ec7cbf..ec5b7c62a39 100644
--- a/examples/rust/sysvar/Cargo.toml
+++ b/examples/rust/sysvar/Cargo.toml
@@ -13,11 +13,11 @@ no-entrypoint = []
 test-sbf = []
 
 [dependencies]
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/examples/rust/transfer-lamports/Cargo.toml b/examples/rust/transfer-lamports/Cargo.toml
index 68d09d10d31..d571eab3641 100644
--- a/examples/rust/transfer-lamports/Cargo.toml
+++ b/examples/rust/transfer-lamports/Cargo.toml
@@ -12,11 +12,11 @@ no-entrypoint = []
 test-sbf = []
 
 [dependencies]
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/examples/rust/transfer-tokens/Cargo.toml b/examples/rust/transfer-tokens/Cargo.toml
index 2874be4fc27..a2f78bde6fb 100644
--- a/examples/rust/transfer-tokens/Cargo.toml
+++ b/examples/rust/transfer-tokens/Cargo.toml
@@ -12,12 +12,12 @@ no-entrypoint = []
 test-sbf = []
 
 [dependencies]
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-token = { version = "6.0", path = "../../../token/program", features = [ "no-entrypoint" ] }
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/feature-proposal/cli/Cargo.toml b/feature-proposal/cli/Cargo.toml
index a02f92ee7fa..c460572814d 100644
--- a/feature-proposal/cli/Cargo.toml
+++ b/feature-proposal/cli/Cargo.toml
@@ -10,11 +10,11 @@ edition = "2021"
 [dependencies]
 chrono = "0.4.38"
 clap = "2.33.3"
-solana-clap-utils = "2.0.3"
-solana-cli-config = "2.0.3"
-solana-client = "2.0.3"
-solana-logger = "2.0.3"
-solana-sdk = "2.0.3"
+solana-clap-utils = "2.1.0"
+solana-cli-config = "2.1.0"
+solana-client = "2.1.0"
+solana-logger = "2.1.0"
+solana-sdk = "2.1.0"
 spl-feature-proposal = { version = "1.0", path = "../program", features = ["no-entrypoint"] }
 
 [[bin]]
diff --git a/feature-proposal/program/Cargo.toml b/feature-proposal/program/Cargo.toml
index a0f60cbe45c..e7bccc3eaae 100644
--- a/feature-proposal/program/Cargo.toml
+++ b/feature-proposal/program/Cargo.toml
@@ -13,14 +13,14 @@ test-sbf = []
 
 [dependencies]
 borsh = "1.5.1"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-token = { version = "6.0", path = "../../token/program", features = [
   "no-entrypoint",
 ] }
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/governance/addin-api/Cargo.toml b/governance/addin-api/Cargo.toml
index bb8424d4e3f..87ce00354c7 100644
--- a/governance/addin-api/Cargo.toml
+++ b/governance/addin-api/Cargo.toml
@@ -10,4 +10,4 @@ edition = "2021"
 [dependencies]
 borsh = "1.5.1"
 spl-governance-tools = { version = "0.1.4", path = "../tools" }
-solana-program = "2.0.3"
+solana-program = "2.1.0"
diff --git a/governance/addin-mock/program/Cargo.toml b/governance/addin-mock/program/Cargo.toml
index ef5dcd8bd12..4fd5e41780b 100644
--- a/governance/addin-mock/program/Cargo.toml
+++ b/governance/addin-mock/program/Cargo.toml
@@ -19,7 +19,7 @@ num-derive = "0.4"
 num-traits = "0.2"
 serde = "1.0.214"
 serde_derive = "1.0.103"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-token = { version = "6.0", path = "../../../token/program", features = [
   "no-entrypoint",
 ] }
@@ -31,8 +31,8 @@ thiserror = "1.0"
 [dev-dependencies]
 assert_matches = "1.5.0"
 proptest = "1.5"
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 spl-governance-test-sdk = { version = "0.1.4", path = "../../test-sdk" }
 
 
diff --git a/governance/chat/program/Cargo.toml b/governance/chat/program/Cargo.toml
index 57e305fa277..f0e962bca8e 100644
--- a/governance/chat/program/Cargo.toml
+++ b/governance/chat/program/Cargo.toml
@@ -19,7 +19,7 @@ num-derive = "0.4"
 num-traits = "0.2"
 serde = "1.0.214"
 serde_derive = "1.0.103"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-token = { version = "6.0", path = "../../../token/program", features = [
   "no-entrypoint",
 ] }
@@ -34,8 +34,8 @@ thiserror = "1.0"
 [dev-dependencies]
 assert_matches = "1.5.0"
 proptest = "1.5"
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 spl-governance-test-sdk = { version = "0.1.4", path = "../../test-sdk" }
 spl-governance-addin-mock = { version = "0.1.4", path = "../../addin-mock/program" }
 
diff --git a/governance/program/Cargo.toml b/governance/program/Cargo.toml
index f1b38edcf24..88aff814725 100644
--- a/governance/program/Cargo.toml
+++ b/governance/program/Cargo.toml
@@ -19,7 +19,7 @@ num-derive = "0.4"
 num-traits = "0.2"
 serde = "1.0.214"
 serde_derive = "1.0.103"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-token = { version = "6.0", path = "../../token/program", features = [
   "no-entrypoint",
 ] }
@@ -31,8 +31,8 @@ thiserror = "1.0"
 assert_matches = "1.5.0"
 base64 = "0.22"
 proptest = "1.5"
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 spl-governance-test-sdk = { version = "0.1.4", path = "../test-sdk" }
 spl-governance-addin-mock = { version = "0.1.4", path = "../addin-mock/program" }
 
diff --git a/governance/test-sdk/Cargo.toml b/governance/test-sdk/Cargo.toml
index ba30b839da5..157588e0a58 100644
--- a/governance/test-sdk/Cargo.toml
+++ b/governance/test-sdk/Cargo.toml
@@ -16,9 +16,9 @@ num-derive = "0.4"
 num-traits = "0.2"
 serde = "1.0.214"
 serde_derive = "1.0.103"
-solana-program = "2.0.3"
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program = "2.1.0"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 spl-token = { version = "6.0", path = "../../token/program", features = [
   "no-entrypoint",
 ] }
diff --git a/governance/tools/Cargo.toml b/governance/tools/Cargo.toml
index 45814d421d1..91d5b00c300 100644
--- a/governance/tools/Cargo.toml
+++ b/governance/tools/Cargo.toml
@@ -15,7 +15,7 @@ num-derive = "0.4"
 num-traits = "0.2"
 serde = "1.0.214"
 serde_derive = "1.0.103"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-token = { version = "6.0", path = "../../token/program", features = [
   "no-entrypoint",
 ] }
diff --git a/instruction-padding/program/Cargo.toml b/instruction-padding/program/Cargo.toml
index b863e8be46d..f5db53bd2ed 100644
--- a/instruction-padding/program/Cargo.toml
+++ b/instruction-padding/program/Cargo.toml
@@ -14,11 +14,11 @@ test-sbf = []
 
 [dependencies]
 num_enum = "0.7.3"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/libraries/discriminator/Cargo.toml b/libraries/discriminator/Cargo.toml
index aa03f6c115c..b067c3a81e1 100644
--- a/libraries/discriminator/Cargo.toml
+++ b/libraries/discriminator/Cargo.toml
@@ -13,7 +13,7 @@ borsh = ["dep:borsh"]
 [dependencies]
 borsh = { version = "1", optional = true }
 bytemuck = { version = "1.19.0", features = ["derive"] }
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-discriminator-derive = { version = "0.2.0", path = "./derive" }
 
 [lib]
diff --git a/libraries/math/Cargo.toml b/libraries/math/Cargo.toml
index e24a9ed32e1..eefe4bb8a22 100644
--- a/libraries/math/Cargo.toml
+++ b/libraries/math/Cargo.toml
@@ -15,14 +15,14 @@ test-sbf = []
 borsh = "1.5.1"
 num-derive = "0.4"
 num-traits = "0.2"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 thiserror = "1.0"
 uint = "0.10"
 
 [dev-dependencies]
 proptest = "1.5.0"
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 libm = "0.2.11"
 
 [lib]
diff --git a/libraries/pod/Cargo.toml b/libraries/pod/Cargo.toml
index dd0bf7b645f..44ef1bab273 100644
--- a/libraries/pod/Cargo.toml
+++ b/libraries/pod/Cargo.toml
@@ -16,8 +16,8 @@ borsh = { version = "1.5.1", optional = true }
 bytemuck = { version = "1.19.0" }
 bytemuck_derive = { version = "1.8.0" }
 serde = { version = "1.0.214", optional = true }
-solana-program = "2.0.3"
-solana-zk-sdk = "2.0.3"
+solana-program = "2.1.0"
+solana-zk-sdk = "2.1.0"
 spl-program-error = { version = "0.5.0", path = "../program-error" }
 
 [dev-dependencies]
diff --git a/libraries/program-error/Cargo.toml b/libraries/program-error/Cargo.toml
index bc273043ad7..04ee8498ad4 100644
--- a/libraries/program-error/Cargo.toml
+++ b/libraries/program-error/Cargo.toml
@@ -10,14 +10,14 @@ edition = "2021"
 [dependencies]
 num-derive = "0.4"
 num-traits = "0.2"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-program-error-derive = { version = "0.4.1", path = "./derive" }
 thiserror = "1.0"
 
 [dev-dependencies]
 lazy_static = "1.5"
 serial_test = "3.1"
-solana-sdk = "2.0.3"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/libraries/tlv-account-resolution/Cargo.toml b/libraries/tlv-account-resolution/Cargo.toml
index 0f290a24c50..a3941a5f497 100644
--- a/libraries/tlv-account-resolution/Cargo.toml
+++ b/libraries/tlv-account-resolution/Cargo.toml
@@ -14,7 +14,7 @@ test-sbf = []
 [dependencies]
 bytemuck = { version = "1.19.0", features = ["derive"] }
 serde = { version = "1.0.214", optional = true }
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-discriminator = { version = "0.3.0", path = "../discriminator" }
 spl-program-error = { version = "0.5.0", path = "../program-error" }
 spl-pod = { version = "0.4.0", path = "../pod" }
@@ -23,9 +23,9 @@ spl-type-length-value = { version = "0.6.0", path = "../type-length-value" }
 [dev-dependencies]
 futures = "0.3.31"
 futures-util = "0.3"
-solana-client = "2.0.3"
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-client = "2.1.0"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/libraries/type-length-value-derive-test/Cargo.toml b/libraries/type-length-value-derive-test/Cargo.toml
index 136147021ee..30537940619 100644
--- a/libraries/type-length-value-derive-test/Cargo.toml
+++ b/libraries/type-length-value-derive-test/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 
 [dev-dependencies]
 borsh = "1.5.1"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-discriminator = { version = "0.3.0", path = "../discriminator" }
 spl-type-length-value = { version = "0.6.0", path = "../type-length-value", features = [
   "derive",
diff --git a/libraries/type-length-value/Cargo.toml b/libraries/type-length-value/Cargo.toml
index 9f1c2cba23f..a6757da9abe 100644
--- a/libraries/type-length-value/Cargo.toml
+++ b/libraries/type-length-value/Cargo.toml
@@ -13,7 +13,7 @@ derive = ["dep:spl-type-length-value-derive"]
 
 [dependencies]
 bytemuck = { version = "1.19.0", features = ["derive"] }
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-discriminator = { version = "0.3.0", path = "../discriminator" }
 spl-program-error = { version = "0.5.0", path = "../program-error" }
 spl-type-length-value-derive = { version = "0.1", path = "./derive", optional = true }
diff --git a/managed-token/program/Cargo.toml b/managed-token/program/Cargo.toml
index ba9f2a1d35b..064d96efe52 100644
--- a/managed-token/program/Cargo.toml
+++ b/managed-token/program/Cargo.toml
@@ -24,7 +24,7 @@ test = []
 [dependencies]
 borsh = "1.5.1"
 shank = "^0.4.2"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-associated-token-account = { version = "5.0.1", path = "../../associated-token-account/program", features = [
   "no-entrypoint",
 ] }
@@ -35,5 +35,5 @@ spl-token = { version = "6.0", path = "../../token/program", features = [
 thiserror = "^1.0.65"
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
diff --git a/memo/program/Cargo.toml b/memo/program/Cargo.toml
index cdfd83a4e04..6b56bb5d571 100644
--- a/memo/program/Cargo.toml
+++ b/memo/program/Cargo.toml
@@ -12,11 +12,11 @@ no-entrypoint = []
 test-sbf = []
 
 [dependencies]
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/name-service/program/Cargo.toml b/name-service/program/Cargo.toml
index 8ee845c114d..0b5f136e6fb 100644
--- a/name-service/program/Cargo.toml
+++ b/name-service/program/Cargo.toml
@@ -17,15 +17,15 @@ no-entrypoint = []
 test-sbf = []
 
 [dependencies]
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 num-traits = "0.2"
 borsh = "1.5.1"
 num-derive = "0.4.2"
 thiserror = "1.0.65"
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/record/program/Cargo.toml b/record/program/Cargo.toml
index d065605d4e6..ba5d1e41ed1 100644
--- a/record/program/Cargo.toml
+++ b/record/program/Cargo.toml
@@ -15,13 +15,13 @@ test-sbf = []
 bytemuck = { version = "1.19.0", features = ["derive"] }
 num-derive = "0.4"
 num-traits = "0.2"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 thiserror = "1.0"
 spl-pod = { version = "0.4.0", path = "../../libraries/pod" }
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 51985806fca..1de01fa45c4 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.78.0"
+channel = "1.81.0"
diff --git a/shared-memory/program/Cargo.toml b/shared-memory/program/Cargo.toml
index aaa93845447..b02656a05e9 100644
--- a/shared-memory/program/Cargo.toml
+++ b/shared-memory/program/Cargo.toml
@@ -12,11 +12,11 @@ test-sbf = []
 
 [dependencies]
 arrayref = "0.3.9"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/single-pool/cli/Cargo.toml b/single-pool/cli/Cargo.toml
index b92678d9a44..0de33eeec5e 100644
--- a/single-pool/cli/Cargo.toml
+++ b/single-pool/cli/Cargo.toml
@@ -17,16 +17,16 @@ serde = "1.0.214"
 serde_derive = "1.0.103"
 serde_json = "1.0.132"
 serde_with = "3.11.0"
-solana-account-decoder = "2.0.3"
-solana-clap-v3-utils = "2.0.3"
-solana-cli-config = "2.0.3"
-solana-cli-output = "2.0.3"
-solana-client = "2.0.3"
-solana-logger = "2.0.3"
-solana-remote-wallet = "2.0.3"
-solana-sdk = "2.0.3"
-solana-transaction-status = "2.0.3"
-solana-vote-program = "2.0.3"
+solana-account-decoder = "2.1.0"
+solana-clap-v3-utils = "2.1.0"
+solana-cli-config = "2.1.0"
+solana-cli-output = "2.1.0"
+solana-client = "2.1.0"
+solana-logger = "2.1.0"
+solana-remote-wallet = "2.1.0"
+solana-sdk = "2.1.0"
+solana-transaction-status = "2.1.0"
+solana-vote-program = "2.1.0"
 spl-token = { version = "6.0", path = "../../token/program", features = [
   "no-entrypoint",
 ] }
@@ -36,7 +36,7 @@ spl-single-pool = { version = "1.0.0", path = "../program", features = [
 ] }
 
 [dev-dependencies]
-solana-test-validator = "2.0.3"
+solana-test-validator = "2.1.0"
 serial_test = "3.1.1"
 test-case = "3.3"
 tempfile = "3.13.0"
diff --git a/single-pool/program/Cargo.toml b/single-pool/program/Cargo.toml
index 81bbc00371b..73bb6175c4b 100644
--- a/single-pool/program/Cargo.toml
+++ b/single-pool/program/Cargo.toml
@@ -17,7 +17,7 @@ borsh = "1.5.1"
 num-derive = "0.4"
 num-traits = "0.2"
 num_enum = "0.7.3"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 solana-security-txt = "1.1.1"
 spl-token = { version = "6.0", path = "../../token/program", features = [
   "no-entrypoint",
@@ -25,9 +25,9 @@ spl-token = { version = "6.0", path = "../../token/program", features = [
 thiserror = "1.0"
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
-solana-vote-program = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
+solana-vote-program = "2.1.0"
 spl-associated-token-account = { version = "5.0.1", path = "../../associated-token-account/program", features = [
   "no-entrypoint",
 ] }
diff --git a/stake-pool/cli/Cargo.toml b/stake-pool/cli/Cargo.toml
index 114ced67d8b..af4834c6d8a 100644
--- a/stake-pool/cli/Cargo.toml
+++ b/stake-pool/cli/Cargo.toml
@@ -14,15 +14,15 @@ clap = "2.33.3"
 serde = "1.0.214"
 serde_derive = "1.0.130"
 serde_json = "1.0.132"
-solana-account-decoder = "2.0.3"
-solana-clap-utils = "2.0.3"
-solana-cli-config = "2.0.3"
-solana-cli-output = "2.0.3"
-solana-client = "2.0.3"
-solana-logger = "2.0.3"
-solana-program = "2.0.3"
-solana-remote-wallet = "2.0.3"
-solana-sdk = "2.0.3"
+solana-account-decoder = "2.1.0"
+solana-clap-utils = "2.1.0"
+solana-cli-config = "2.1.0"
+solana-cli-output = "2.1.0"
+solana-client = "2.1.0"
+solana-logger = "2.1.0"
+solana-program = "2.1.0"
+solana-remote-wallet = "2.1.0"
+solana-sdk = "2.1.0"
 spl-associated-token-account = { version = "=5.0.1", path = "../../associated-token-account/program", features = [
   "no-entrypoint",
 ] }
diff --git a/stake-pool/program/Cargo.toml b/stake-pool/program/Cargo.toml
index 1b5a1130c39..3578e7cba4f 100644
--- a/stake-pool/program/Cargo.toml
+++ b/stake-pool/program/Cargo.toml
@@ -20,7 +20,7 @@ num-traits = "0.2"
 num_enum = "0.7.3"
 serde = "1.0.214"
 serde_derive = "1.0.103"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 solana-security-txt = "1.1.1"
 spl-math = { version = "0.3", path = "../../libraries/math", features = [
   "no-entrypoint",
@@ -37,9 +37,9 @@ bincode = "1.3.1"
 [dev-dependencies]
 assert_matches = "1.5.0"
 proptest = "1.5"
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
-solana-vote-program = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
+solana-vote-program = "2.1.0"
 spl-token = { version = "6.0", path = "../../token/program", features = [
   "no-entrypoint",
 ] }
diff --git a/stateless-asks/program/Cargo.toml b/stateless-asks/program/Cargo.toml
index 2529e378e03..68fb97d2164 100644
--- a/stateless-asks/program/Cargo.toml
+++ b/stateless-asks/program/Cargo.toml
@@ -12,7 +12,7 @@ test-sbf = []
 
 [dependencies]
 borsh = "1.5.1"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-token = { version = "6.0", path = "../../token/program", features = [
   "no-entrypoint",
 ] }
@@ -20,8 +20,8 @@ spl-associated-token-account-client = { version = "1.0.0", path = "../../associa
 thiserror = "1.0"
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/token-collection/program/Cargo.toml b/token-collection/program/Cargo.toml
index 2b615b0daac..9a29c42393d 100644
--- a/token-collection/program/Cargo.toml
+++ b/token-collection/program/Cargo.toml
@@ -12,7 +12,7 @@ no-entrypoint = []
 test-sbf = []
 
 [dependencies]
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-pod = { version = "0.4.0", path = "../../libraries/pod" }
 spl-program-error = { version = "0.5.0" , path = "../../libraries/program-error" }
 spl-token-2022 = { version = "5.0.2", path = "../../token/program-2022", features = ["no-entrypoint"] }
@@ -22,8 +22,8 @@ spl-token-metadata-interface = { version = "0.5.1", path = "../../token-metadata
 spl-type-length-value = { version = "0.6.0", path = "../../libraries/type-length-value" }
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 spl-discriminator = { version = "0.3.0", path = "../../libraries/discriminator" }
 spl-token-client = { version = "0.12.1", path = "../../token/client" }
 
diff --git a/token-group/example/Cargo.toml b/token-group/example/Cargo.toml
index ce91692fe36..e5bad04b1f2 100644
--- a/token-group/example/Cargo.toml
+++ b/token-group/example/Cargo.toml
@@ -12,15 +12,15 @@ no-entrypoint = []
 test-sbf = []
 
 [dependencies]
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-pod = { version = "0.4.0", path = "../../libraries/pod" }
 spl-token-2022 = { version = "5.0.2", path = "../../token/program-2022", features = ["no-entrypoint"] }
 spl-token-group-interface = { version = "0.4.2", path = "../interface" }
 spl-type-length-value = { version = "0.6.0", path = "../../libraries/type-length-value" }
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 spl-discriminator = { version = "0.3.0", path = "../../libraries/discriminator" }
 spl-token-client = { version = "0.12.1", path = "../../token/client" }
 spl-token-metadata-interface = { version = "0.5.1", path = "../../token-metadata/interface" }
diff --git a/token-group/interface/Cargo.toml b/token-group/interface/Cargo.toml
index 114f23cedec..6cb143a630d 100644
--- a/token-group/interface/Cargo.toml
+++ b/token-group/interface/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 
 [dependencies]
 bytemuck = "1.19.0"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-discriminator = { version = "0.3.0" , path = "../../libraries/discriminator" }
 spl-pod = { version = "0.4.0", path = "../../libraries/pod", features = ["borsh"] }
 spl-program-error = { version = "0.5.0" , path = "../../libraries/program-error" }
diff --git a/token-lending/cli/Cargo.toml b/token-lending/cli/Cargo.toml
index 45db7bd46f7..24705f83144 100644
--- a/token-lending/cli/Cargo.toml
+++ b/token-lending/cli/Cargo.toml
@@ -10,12 +10,12 @@ version = "0.2.0"
 
 [dependencies]
 clap = "2.33.3"
-solana-clap-utils = "2.0.3"
-solana-cli-config = "2.0.3"
-solana-client = "2.0.3"
-solana-logger = "2.0.3"
-solana-sdk = "2.0.3"
-solana-program = "2.0.3"
+solana-clap-utils = "2.1.0"
+solana-cli-config = "2.1.0"
+solana-client = "2.1.0"
+solana-logger = "2.1.0"
+solana-sdk = "2.1.0"
+solana-program = "2.1.0"
 spl-token-lending = { version = "0.2", path="../program", features = [ "no-entrypoint" ] }
 spl-token = { version = "6.0", path="../../token/program", features = [ "no-entrypoint" ]  }
 
diff --git a/token-lending/flash_loan_receiver/Cargo.toml b/token-lending/flash_loan_receiver/Cargo.toml
index 25440ae824d..9fc5de040b9 100644
--- a/token-lending/flash_loan_receiver/Cargo.toml
+++ b/token-lending/flash_loan_receiver/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 arrayref = "0.3.9"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-token = { version = "6.0", path = "../../token/program", features=["no-entrypoint"] }
 
 [lib]
diff --git a/token-lending/program/Cargo.toml b/token-lending/program/Cargo.toml
index 20211454e20..9a4eb04f8b6 100644
--- a/token-lending/program/Cargo.toml
+++ b/token-lending/program/Cargo.toml
@@ -16,7 +16,7 @@ arrayref = "0.3.9"
 bytemuck = "1.19.0"
 num-derive = "0.4"
 num-traits = "0.2"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-token = { version = "6.0", path = "../../token/program", features = [ "no-entrypoint" ] }
 thiserror = "1.0"
 uint = "0.10"
@@ -24,8 +24,8 @@ uint = "0.10"
 [dev-dependencies]
 assert_matches = "1.5.0"
 proptest = "1.5"
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/token-metadata/example/Cargo.toml b/token-metadata/example/Cargo.toml
index 11b6513ce30..97deaac685b 100644
--- a/token-metadata/example/Cargo.toml
+++ b/token-metadata/example/Cargo.toml
@@ -12,15 +12,15 @@ no-entrypoint = []
 test-sbf = []
 
 [dependencies]
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-token-2022 = { version = "5.0.2", path = "../../token/program-2022", features = ["no-entrypoint"] }
 spl-token-metadata-interface = { version = "0.5.1", path = "../interface" }
 spl-type-length-value = { version = "0.6.0", path = "../../libraries/type-length-value" }
 spl-pod = { version = "0.4.0", path = "../../libraries/pod" }
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 spl-token-client = { version = "0.12.1", path = "../../token/client" }
 test-case = "3.3"
 
diff --git a/token-metadata/interface/Cargo.toml b/token-metadata/interface/Cargo.toml
index 47718491acf..1e797384377 100644
--- a/token-metadata/interface/Cargo.toml
+++ b/token-metadata/interface/Cargo.toml
@@ -13,7 +13,7 @@ serde-traits = ["dep:serde", "spl-pod/serde-traits"]
 [dependencies]
 borsh = "1.5.1"
 serde = { version = "1.0.214", optional = true }
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-discriminator = { version = "0.3.0", path = "../../libraries/discriminator" }
 spl-program-error = { version = "0.5.0", path = "../../libraries/program-error" }
 spl-type-length-value = { version = "0.6.0", path = "../../libraries/type-length-value" }
diff --git a/token-swap/program/Cargo.toml b/token-swap/program/Cargo.toml
index 56867a31f5b..fc880f3a9f5 100644
--- a/token-swap/program/Cargo.toml
+++ b/token-swap/program/Cargo.toml
@@ -17,7 +17,7 @@ arrayref = "0.3.9"
 enum_dispatch = "0.3.13"
 num-derive = "0.4"
 num-traits = "0.2"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-math = { version = "0.3", path = "../../libraries/math", features = [ "no-entrypoint" ] }
 spl-token = { version = "6.0", path = "../../token/program", features = [ "no-entrypoint" ] }
 spl-token-2022 = { version = "5.0.2", path = "../../token/program-2022", features = [ "no-entrypoint" ] }
@@ -28,7 +28,7 @@ roots = { version = "0.0.8", optional = true }
 [dev-dependencies]
 proptest = "1.5"
 roots = "0.0.8"
-solana-sdk = "2.0.3"
+solana-sdk = "2.1.0"
 test-case = "3.3"
 
 [lib]
diff --git a/token-swap/program/fuzz/Cargo.toml b/token-swap/program/fuzz/Cargo.toml
index fdfbbf1214d..4d010363edf 100644
--- a/token-swap/program/fuzz/Cargo.toml
+++ b/token-swap/program/fuzz/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 [dependencies]
 honggfuzz = { version = "0.5.56" }
 arbitrary = { version = "1.3", features = ["derive"] }
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-math = { version = "0.3", path = "../../../libraries/math", features = [ "no-entrypoint" ] }
 spl-token = { version = "6.0", path = "../../../token/program", features = [ "no-entrypoint" ] }
 spl-token-swap = { path = "..", features = ["fuzz", "no-entrypoint"] }
diff --git a/token-upgrade/cli/Cargo.toml b/token-upgrade/cli/Cargo.toml
index bb7727b22a7..1ab069e2c9f 100644
--- a/token-upgrade/cli/Cargo.toml
+++ b/token-upgrade/cli/Cargo.toml
@@ -13,12 +13,12 @@ walkdir = "2"
 [dependencies]
 clap = { version = "3", features = ["cargo"] }
 futures-util = "0.3.31"
-solana-clap-v3-utils = "2.0.3"
-solana-cli-config = "2.0.3"
-solana-client = "2.0.3"
-solana-logger = "2.0.3"
-solana-remote-wallet = "2.0.3"
-solana-sdk = "2.0.3"
+solana-clap-v3-utils = "2.1.0"
+solana-cli-config = "2.1.0"
+solana-client = "2.1.0"
+solana-logger = "2.1.0"
+solana-remote-wallet = "2.1.0"
+solana-sdk = "2.1.0"
 spl-associated-token-account-client = { version = "1.0.0", path = "../../associated-token-account/client" }
 spl-token = { version = "6.0", path = "../../token/program", features = ["no-entrypoint"] }
 spl-token-2022 = { version = "5.0.2", path = "../../token/program-2022", features = ["no-entrypoint"] }
@@ -27,7 +27,7 @@ spl-token-upgrade = { version = "0.1", path = "../program", features = ["no-entr
 tokio = { version = "1", features = ["full"] }
 
 [dev-dependencies]
-solana-test-validator = "2.0.3"
+solana-test-validator = "2.1.0"
 
 [[bin]]
 name = "spl-token-upgrade"
diff --git a/token-upgrade/program/Cargo.toml b/token-upgrade/program/Cargo.toml
index 287dccdf471..f1e1e3e17d8 100644
--- a/token-upgrade/program/Cargo.toml
+++ b/token-upgrade/program/Cargo.toml
@@ -15,13 +15,13 @@ test-sbf = []
 num-derive = "0.4"
 num-traits = "0.2"
 num_enum = "0.7.3"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-token-2022 = { version = "5.0.2", path = "../../token/program-2022", features = ["no-entrypoint"] }
 thiserror = "1.0"
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 spl-token = { version = "6.0", path = "../../token/program", features = ["no-entrypoint"] }
 spl-token-client = { version = "0.12.1", path = "../../token/client" }
 test-case = "3.3"
diff --git a/token-wrap/program/Cargo.toml b/token-wrap/program/Cargo.toml
index 645a9eca753..e33a9fd7ced 100644
--- a/token-wrap/program/Cargo.toml
+++ b/token-wrap/program/Cargo.toml
@@ -14,7 +14,7 @@ test-sbf = []
 [dependencies]
 bytemuck = { version = "1.19.0", features = ["derive"] }
 num_enum = "0.7"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-associated-token-account = { version = "5.0.1", path = "../../associated-token-account/program", features = ["no-entrypoint"] }
 spl-token = { version = "6.0", path = "../../token/program", features = ["no-entrypoint"] }
 spl-token-2022 = { version = "5.0.2", path = "../../token/program-2022", features = ["no-entrypoint"] }
diff --git a/token/cli/Cargo.toml b/token/cli/Cargo.toml
index aa3bef21f90..6ce96227ff3 100644
--- a/token/cli/Cargo.toml
+++ b/token/cli/Cargo.toml
@@ -19,15 +19,15 @@ futures = "0.3"
 serde = "1.0.214"
 serde_derive = "1.0.103"
 serde_json = "1.0.132"
-solana-account-decoder = "2.0.3"
-solana-clap-v3-utils = "2.0.3"
-solana-cli-config = "2.0.3"
-solana-cli-output = "2.0.3"
-solana-client = "2.0.3"
-solana-logger = "2.0.3"
-solana-remote-wallet = "2.0.3"
-solana-sdk = "2.0.3"
-solana-transaction-status = "2.0.3"
+solana-account-decoder = "2.1.0"
+solana-clap-v3-utils = "2.1.0"
+solana-cli-config = "2.1.0"
+solana-cli-output = "2.1.0"
+solana-client = "2.1.0"
+solana-logger = "2.1.0"
+solana-remote-wallet = "2.1.0"
+solana-sdk = "2.1.0"
+solana-transaction-status = "2.1.0"
 spl-associated-token-account-client = { version = "1.0.0", path = "../../associated-token-account/client" }
 spl-token = { version = "6.0", path = "../program", features = [
   "no-entrypoint",
@@ -47,7 +47,7 @@ strum_macros = "0.26"
 tokio = "1.41"
 
 [dev-dependencies]
-solana-test-validator = "2.0.3"
+solana-test-validator = "2.1.0"
 assert_cmd = "2.0.16"
 libtest-mimic = "0.8"
 serial_test = "3.1.1"
diff --git a/token/client/Cargo.toml b/token/client/Cargo.toml
index b5d526e9965..7696c3166d2 100644
--- a/token/client/Cargo.toml
+++ b/token/client/Cargo.toml
@@ -13,12 +13,12 @@ bincode = "1.3.2"
 bytemuck = "1.19.0"
 futures = "0.3.31"
 futures-util = "0.3"
-solana-banks-interface = "2.0.3"
-solana-cli-output = { version = "2.0.3", optional = true }
-solana-program-test = "2.0.3"
-solana-rpc-client = "2.0.3"
-solana-rpc-client-api = "2.0.3"
-solana-sdk = "2.0.3"
+solana-banks-interface = "2.1.0"
+solana-cli-output = { version = "2.1.0", optional = true }
+solana-program-test = "2.1.0"
+solana-rpc-client = "2.1.0"
+solana-rpc-client-api = "2.1.0"
+solana-sdk = "2.1.0"
 spl-associated-token-account-client = { version = "1.0.0", path = "../../associated-token-account/client" }
 spl-elgamal-registry = { version = "0.1.0", path = "../confidential-transfer/elgamal-registry"}
 spl-memo = { version = "5.0", path = "../../memo/program", features = [
diff --git a/token/confidential-transfer/ciphertext-arithmetic/Cargo.toml b/token/confidential-transfer/ciphertext-arithmetic/Cargo.toml
index 4a1a68efd5e..cce32dcf3d2 100644
--- a/token/confidential-transfer/ciphertext-arithmetic/Cargo.toml
+++ b/token/confidential-transfer/ciphertext-arithmetic/Cargo.toml
@@ -10,12 +10,12 @@ edition = "2021"
 [dependencies]
 base64 = "0.22.1"
 bytemuck = "1.19.0"
-solana-curve25519 = "2.0.3"
-solana-zk-sdk = "2.0.3"
+solana-curve25519 = "2.1.0"
+solana-zk-sdk = "2.1.0"
 
 [dev-dependencies]
 spl-token-confidential-transfer-proof-generation = { version = "0.1.0", path = "../proof-generation" }
-curve25519-dalek = "3.2.1"
+curve25519-dalek = "4.1.3"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/token/confidential-transfer/elgamal-registry/Cargo.toml b/token/confidential-transfer/elgamal-registry/Cargo.toml
index 5c1ac47e916..52bd2ac9c7d 100644
--- a/token/confidential-transfer/elgamal-registry/Cargo.toml
+++ b/token/confidential-transfer/elgamal-registry/Cargo.toml
@@ -13,8 +13,8 @@ test-sbf = []
 
 [dependencies]
 bytemuck = { version = "1.18.0", features = ["derive"] }
-solana-program = "2.0.3"
-solana-zk-sdk = "2.0.3"
+solana-program = "2.1.0"
+solana-zk-sdk = "2.1.0"
 spl-pod = { version = "0.4.0", path = "../../../libraries/pod" }
 spl-token-confidential-transfer-proof-extraction = { version = "0.1.0", path = "../proof-extraction" }
 
diff --git a/token/confidential-transfer/proof-extraction/Cargo.toml b/token/confidential-transfer/proof-extraction/Cargo.toml
index c9065f2a72b..d94a7727174 100644
--- a/token/confidential-transfer/proof-extraction/Cargo.toml
+++ b/token/confidential-transfer/proof-extraction/Cargo.toml
@@ -9,9 +9,9 @@ edition = "2021"
 
 [dependencies]
 bytemuck = "1.19.0"
-solana-curve25519 = "2.0.3"
-solana-program = "2.0.3"
-solana-zk-sdk = "2.0.3"
+solana-curve25519 = "2.1.0"
+solana-program = "2.1.0"
+solana-zk-sdk = "2.1.0"
 spl-pod = { version = "0.4.0", path = "../../../libraries/pod" }
 thiserror = "1.0.65"
 
diff --git a/token/confidential-transfer/proof-generation/Cargo.toml b/token/confidential-transfer/proof-generation/Cargo.toml
index 6bb5711f5c2..9028085dfb7 100644
--- a/token/confidential-transfer/proof-generation/Cargo.toml
+++ b/token/confidential-transfer/proof-generation/Cargo.toml
@@ -8,8 +8,8 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dependencies]
-curve25519-dalek = "3.2.1"
-solana-zk-sdk = "2.0.3"
+curve25519-dalek = "4.1.3"
+solana-zk-sdk = "2.1.0"
 thiserror = "1.0.65"
 
 [dev-dependencies]
diff --git a/token/confidential-transfer/proof-tests/Cargo.toml b/token/confidential-transfer/proof-tests/Cargo.toml
index dc79103c3d5..b76518ef975 100644
--- a/token/confidential-transfer/proof-tests/Cargo.toml
+++ b/token/confidential-transfer/proof-tests/Cargo.toml
@@ -8,8 +8,8 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dev-dependencies]
-curve25519-dalek = "3.2.1"
-solana-zk-sdk = "2.0.3"
+curve25519-dalek = "4.1.3"
+solana-zk-sdk = "2.1.0"
 thiserror = "1.0.65"
 spl-token-confidential-transfer-proof-extraction = { version = "0.1.0", path = "../proof-extraction" }
 spl-token-confidential-transfer-proof-generation = { version = "0.1.0", path = "../proof-generation" }
diff --git a/token/program-2022-test/Cargo.toml b/token/program-2022-test/Cargo.toml
index 7f6fd1beef9..d8740295d1c 100644
--- a/token/program-2022-test/Cargo.toml
+++ b/token/program-2022-test/Cargo.toml
@@ -20,9 +20,9 @@ async-trait = "0.1"
 borsh = "1.5.1"
 bytemuck = "1.19.0"
 futures-util = "0.3"
-solana-program = "2.0.3"
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program = "2.1.0"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 spl-associated-token-account = { version = "5.0.1", path = "../../associated-token-account/program" }
 spl-elgamal-registry = { version = "0.1.0", path = "../confidential-transfer/elgamal-registry" }
 spl-memo = { version = "5.0.0", path = "../../memo/program", features = [
diff --git a/token/program-2022/Cargo.toml b/token/program-2022/Cargo.toml
index bfea41e213d..0f1db6fb28f 100644
--- a/token/program-2022/Cargo.toml
+++ b/token/program-2022/Cargo.toml
@@ -22,9 +22,9 @@ bytemuck = { version = "1.19.0", features = ["derive"] }
 num-derive = "0.4"
 num-traits = "0.2"
 num_enum = "0.7.3"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 solana-security-txt = "1.1.1"
-solana-zk-sdk = "2.0.3"
+solana-zk-sdk = "2.1.0"
 spl-elgamal-registry = { version = "0.1.0", path = "../confidential-transfer/elgamal-registry", features = ["no-entrypoint"] }
 spl-memo = { version = "5.0", path = "../../memo/program", features = [ "no-entrypoint" ] }
 spl-token = { version = "6.0",  path = "../program", features = ["no-entrypoint"] }
@@ -47,8 +47,8 @@ spl-token-confidential-transfer-proof-generation = { version = "0.1.0", path = "
 lazy_static = "1.5.0"
 proptest = "1.5"
 serial_test = "3.1.1"
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 spl-tlv-account-resolution = { version = "0.8.1", path = "../../libraries/tlv-account-resolution" }
 serde_json = "1.0.132"
 
diff --git a/token/program/Cargo.toml b/token/program/Cargo.toml
index 67b92f3d93f..120db36bfc7 100644
--- a/token/program/Cargo.toml
+++ b/token/program/Cargo.toml
@@ -18,15 +18,15 @@ bytemuck = "1.19.0"
 num-derive = "0.4"
 num-traits = "0.2"
 num_enum = "0.7.3"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 thiserror = "1.0"
 
 [dev-dependencies]
 lazy_static = "1.5.0"
 proptest = "1.5"
 serial_test = "3.1.1"
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/token/transfer-hook/cli/Cargo.toml b/token/transfer-hook/cli/Cargo.toml
index a61bc3835d4..255b40eeef7 100644
--- a/token/transfer-hook/cli/Cargo.toml
+++ b/token/transfer-hook/cli/Cargo.toml
@@ -11,12 +11,12 @@ version = "0.2.0"
 [dependencies]
 clap = { version = "3", features = ["cargo"] }
 futures-util = "0.3.31"
-solana-clap-v3-utils = "2.0.3"
-solana-cli-config = "2.0.3"
-solana-client = "2.0.3"
-solana-logger = "2.0.3"
-solana-remote-wallet = "2.0.3"
-solana-sdk = "2.0.3"
+solana-clap-v3-utils = "2.1.0"
+solana-cli-config = "2.1.0"
+solana-client = "2.1.0"
+solana-logger = "2.1.0"
+solana-remote-wallet = "2.1.0"
+solana-sdk = "2.1.0"
 spl-tlv-account-resolution = { version = "0.8.1", path = "../../../libraries/tlv-account-resolution", features = ["serde-traits"] }
 spl-transfer-hook-interface = { version = "0.8.2", path = "../interface" }
 strum = "0.26"
@@ -27,7 +27,7 @@ serde_json = "1.0.132"
 serde_yaml = "0.9.34"
 
 [dev-dependencies]
-solana-test-validator = "2.0.3"
+solana-test-validator = "2.1.0"
 spl-token-2022 = { version = "5.0.2", path = "../../program-2022", features = ["no-entrypoint"] }
 spl-token-client = { version = "0.12.1", path = "../../client" }
 spl-transfer-hook-example = { version = "0.6.0", path = "../example" }
diff --git a/token/transfer-hook/example/Cargo.toml b/token/transfer-hook/example/Cargo.toml
index c92600ae96a..5197d15a15c 100644
--- a/token/transfer-hook/example/Cargo.toml
+++ b/token/transfer-hook/example/Cargo.toml
@@ -15,15 +15,15 @@ forbid-additional-mints = []
 
 [dependencies]
 arrayref = "0.3.9"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-tlv-account-resolution = { version = "0.8.1", path = "../../../libraries/tlv-account-resolution" }
 spl-token-2022 = { version = "5.0.2",  path = "../../program-2022", features = ["no-entrypoint"] }
 spl-transfer-hook-interface = { version = "0.8.2", path = "../interface" }
 spl-type-length-value = { version = "0.6.0", path = "../../../libraries/type-length-value" }
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/token/transfer-hook/interface/Cargo.toml b/token/transfer-hook/interface/Cargo.toml
index 2a3739d4bbc..5699da46226 100644
--- a/token/transfer-hook/interface/Cargo.toml
+++ b/token/transfer-hook/interface/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2021"
 [dependencies]
 arrayref = "0.3.9"
 bytemuck = { version = "1.19.0", features = ["derive"] }
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-discriminator = { version = "0.3.0" , path = "../../../libraries/discriminator" }
 spl-program-error = { version = "0.5.0" , path = "../../../libraries/program-error" }
 spl-tlv-account-resolution = { version = "0.8.1", path = "../../../libraries/tlv-account-resolution" }
diff --git a/utils/test-client/Cargo.toml b/utils/test-client/Cargo.toml
index e496f50d08d..ff57a85ffa4 100644
--- a/utils/test-client/Cargo.toml
+++ b/utils/test-client/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 # Used to ensure that SPL programs are buildable by external clients
 
 [dependencies]
-solana-sdk = "2.0.3"
+solana-sdk = "2.1.0"
 spl-memo = { path = "../../memo/program", features = [ "no-entrypoint" ] }
 spl-token = { path = "../../token/program", features = [ "no-entrypoint" ] }
 spl-token-swap = { path = "../../token-swap/program", features = [ "no-entrypoint" ] }

From 79572ba76e5ac4c382e4da001007a8053235daf4 Mon Sep 17 00:00:00 2001
From: Jon C <me@jonc.dev>
Date: Wed, 30 Oct 2024 10:50:41 +0100
Subject: [PATCH 2/7] Run clippy + fmt

---
 .../program-test/tests/create_idempotent.rs   |  4 +--
 ...process_create_associated_token_account.rs | 10 +++---
 .../program-test/tests/spl_token_create.rs    |  4 +--
 .../tests/functional.rs                       |  2 +-
 examples/rust/custom-heap/tests/functional.rs |  2 +-
 examples/rust/logging/tests/functional.rs     |  2 +-
 examples/rust/sysvar/tests/functional.rs      |  2 +-
 .../transfer-lamports/tests/functional.rs     |  2 +-
 .../rust/transfer-tokens/tests/functional.rs  |  2 +-
 feature-proposal/program/tests/functional.rs  |  2 +-
 governance/test-sdk/src/lib.rs                |  2 +-
 instruction-padding/program/tests/noop.rs     |  2 +-
 instruction-padding/program/tests/system.rs   |  2 +-
 libraries/math/tests/instruction_count.rs     | 36 +++++++++----------
 memo/program/tests/functional.rs              |  4 +--
 record/program/tests/functional.rs            |  2 +-
 shared-memory/program/tests/shared-memory.rs  |  4 +--
 stake-pool/program/src/big_vec.rs             |  8 ++---
 stake-pool/program/src/state.rs               |  4 +--
 .../tests/create_pool_token_metadata.rs       |  8 ++---
 stake-pool/program/tests/decrease.rs          | 12 ++-----
 stake-pool/program/tests/deposit.rs           |  4 +--
 .../program/tests/deposit_edge_cases.rs       |  2 +-
 stake-pool/program/tests/deposit_sol.rs       |  6 ++--
 stake-pool/program/tests/increase.rs          |  4 +--
 stake-pool/program/tests/set_deposit_fee.rs   |  8 ++---
 stake-pool/program/tests/set_epoch_fee.rs     |  4 +--
 .../program/tests/set_funding_authority.rs    |  6 ++--
 stake-pool/program/tests/set_manager.rs       |  6 ++--
 stake-pool/program/tests/set_preferred.rs     |  2 +-
 stake-pool/program/tests/set_referral_fee.rs  |  8 ++---
 stake-pool/program/tests/set_staker.rs        |  6 ++--
 .../program/tests/set_withdrawal_fee.rs       | 12 +++----
 .../tests/update_pool_token_metadata.rs       |  4 +--
 stake-pool/program/tests/vsa_add.rs           | 12 +++----
 stake-pool/program/tests/vsa_remove.rs        |  8 ++---
 stake-pool/program/tests/withdraw.rs          |  4 +--
 token-group/example/tests/initialize_group.rs |  2 +-
 .../example/tests/initialize_member.rs        |  2 +-
 .../example/tests/update_group_authority.rs   |  2 +-
 .../example/tests/update_group_max_size.rs    |  2 +-
 .../flash_loan_receiver/src/processor.rs      |  3 +-
 .../tests/borrow_obligation_liquidity.rs      |  6 ++--
 .../program/tests/init_lending_market.rs      |  2 +-
 .../program/tests/init_obligation.rs          |  2 +-
 token-lending/program/tests/init_reserve.rs   |  2 +-
 .../program/tests/modify_reserve_config.rs    |  2 +-
 .../tests/redeem_reserve_collateral.rs        |  2 +-
 .../program/tests/set_lending_market_owner.rs |  4 +--
 .../tests/withdraw_obligation_collateral.rs   |  2 +-
 token-metadata/example/tests/initialize.rs    |  4 +--
 token-swap/program/src/processor.rs           |  3 +-
 token-upgrade/program/tests/functional.rs     |  6 ++--
 .../tests/confidential_transfer.rs            |  2 +-
 .../tests/initialize_account.rs               |  6 ++--
 .../tests/initialize_mint.rs                  | 16 ++++-----
 .../program-2022-test/tests/memo_transfer.rs  |  4 +--
 token/program-2022-test/tests/reallocate.rs   |  4 +--
 token/program-2022-test/tests/sync_native.rs  |  2 +-
 .../tests/token_group_update_authority.rs     |  2 +-
 .../tests/token_metadata_emit.rs              |  2 +-
 .../tests/token_metadata_remove_key.rs        |  2 +-
 .../tests/token_metadata_update_authority.rs  |  2 +-
 .../tests/assert_instruction_count.rs         |  2 +-
 .../program/tests/assert_instruction_count.rs |  2 +-
 .../transfer-hook/example/tests/functional.rs | 14 ++++----
 66 files changed, 152 insertions(+), 166 deletions(-)

diff --git a/associated-token-account/program-test/tests/create_idempotent.rs b/associated-token-account/program-test/tests/create_idempotent.rs
index 8f89e856dd0..673366ce14c 100644
--- a/associated-token-account/program-test/tests/create_idempotent.rs
+++ b/associated-token-account/program-test/tests/create_idempotent.rs
@@ -153,7 +153,7 @@ async fn fail_account_exists_with_wrong_owner() {
     Account::pack(token_account, &mut associated_token_account.data).unwrap();
     let mut pt = program_test_2022(token_mint_address, true);
     pt.add_account(associated_token_address, associated_token_account);
-    let (mut banks_client, payer, recent_blockhash) = pt.start().await;
+    let (banks_client, payer, recent_blockhash) = pt.start().await;
 
     // fail creating token account if non existent
     let instruction = create_associated_token_account_idempotent(
@@ -185,7 +185,7 @@ async fn fail_account_exists_with_wrong_owner() {
 #[tokio::test]
 async fn fail_non_ata() {
     let token_mint_address = Pubkey::new_unique();
-    let (mut banks_client, payer, recent_blockhash) =
+    let (banks_client, payer, recent_blockhash) =
         program_test_2022(token_mint_address, true).start().await;
 
     let rent = banks_client.get_rent().await.unwrap();
diff --git a/associated-token-account/program-test/tests/process_create_associated_token_account.rs b/associated-token-account/program-test/tests/process_create_associated_token_account.rs
index 071604ba2e3..e693310385c 100644
--- a/associated-token-account/program-test/tests/process_create_associated_token_account.rs
+++ b/associated-token-account/program-test/tests/process_create_associated_token_account.rs
@@ -27,7 +27,7 @@ async fn test_associated_token_address() {
         &spl_token_2022::id(),
     );
 
-    let (mut banks_client, payer, recent_blockhash) =
+    let (banks_client, payer, recent_blockhash) =
         program_test_2022(token_mint_address, true).start().await;
     let rent = banks_client.get_rent().await.unwrap();
 
@@ -78,7 +78,7 @@ async fn test_create_with_fewer_lamports() {
         &spl_token_2022::id(),
     );
 
-    let (mut banks_client, payer, recent_blockhash) =
+    let (banks_client, payer, recent_blockhash) =
         program_test_2022(token_mint_address, true).start().await;
     let rent = banks_client.get_rent().await.unwrap();
     let expected_token_account_len =
@@ -139,7 +139,7 @@ async fn test_create_with_excess_lamports() {
         &spl_token_2022::id(),
     );
 
-    let (mut banks_client, payer, recent_blockhash) =
+    let (banks_client, payer, recent_blockhash) =
         program_test_2022(token_mint_address, true).start().await;
     let rent = banks_client.get_rent().await.unwrap();
 
@@ -200,7 +200,7 @@ async fn test_create_account_mismatch() {
         &spl_token_2022::id(),
     );
 
-    let (mut banks_client, payer, recent_blockhash) =
+    let (banks_client, payer, recent_blockhash) =
         program_test_2022(token_mint_address, true).start().await;
 
     let mut instruction = create_associated_token_account(
@@ -271,7 +271,7 @@ async fn test_create_associated_token_account_using_legacy_implicit_instruction(
         &spl_token_2022::id(),
     );
 
-    let (mut banks_client, payer, recent_blockhash) =
+    let (banks_client, payer, recent_blockhash) =
         program_test_2022(token_mint_address, true).start().await;
     let rent = banks_client.get_rent().await.unwrap();
     let expected_token_account_len =
diff --git a/associated-token-account/program-test/tests/spl_token_create.rs b/associated-token-account/program-test/tests/spl_token_create.rs
index b95e0e67036..21970414946 100644
--- a/associated-token-account/program-test/tests/spl_token_create.rs
+++ b/associated-token-account/program-test/tests/spl_token_create.rs
@@ -23,7 +23,7 @@ async fn success_create() {
     let associated_token_address =
         get_associated_token_address(&wallet_address, &token_mint_address);
 
-    let (mut banks_client, payer, recent_blockhash) =
+    let (banks_client, payer, recent_blockhash) =
         program_test(token_mint_address, true).start().await;
     let rent = banks_client.get_rent().await.unwrap();
     let expected_token_account_len = Account::LEN;
@@ -69,7 +69,7 @@ async fn success_using_deprecated_instruction_creator() {
     let associated_token_address =
         get_associated_token_address(&wallet_address, &token_mint_address);
 
-    let (mut banks_client, payer, recent_blockhash) =
+    let (banks_client, payer, recent_blockhash) =
         program_test(token_mint_address, true).start().await;
     let rent = banks_client.get_rent().await.unwrap();
     let expected_token_account_len = Account::LEN;
diff --git a/examples/rust/cross-program-invocation/tests/functional.rs b/examples/rust/cross-program-invocation/tests/functional.rs
index ebf253cd989..e0c924abac3 100644
--- a/examples/rust/cross-program-invocation/tests/functional.rs
+++ b/examples/rust/cross-program-invocation/tests/functional.rs
@@ -33,7 +33,7 @@ async fn test_cross_program_invocation() {
         },
     );
 
-    let (mut banks_client, payer, recent_blockhash) = program_test.start().await;
+    let (banks_client, payer, recent_blockhash) = program_test.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[Instruction::new_with_bincode(
diff --git a/examples/rust/custom-heap/tests/functional.rs b/examples/rust/custom-heap/tests/functional.rs
index 98a3585ca37..a4575e0532b 100644
--- a/examples/rust/custom-heap/tests/functional.rs
+++ b/examples/rust/custom-heap/tests/functional.rs
@@ -9,7 +9,7 @@ use {
 #[tokio::test]
 async fn test_custom_heap() {
     let program_id = Pubkey::from_str("CustomHeap111111111111111111111111111111111").unwrap();
-    let (mut banks_client, payer, recent_blockhash) = ProgramTest::new(
+    let (banks_client, payer, recent_blockhash) = ProgramTest::new(
         "spl_example_custom_heap",
         program_id,
         processor!(process_instruction),
diff --git a/examples/rust/logging/tests/functional.rs b/examples/rust/logging/tests/functional.rs
index a36a02931d3..e822cb1e9d1 100644
--- a/examples/rust/logging/tests/functional.rs
+++ b/examples/rust/logging/tests/functional.rs
@@ -12,7 +12,7 @@ use {
 #[tokio::test]
 async fn test_logging() {
     let program_id = Pubkey::from_str("Logging111111111111111111111111111111111111").unwrap();
-    let (mut banks_client, payer, recent_blockhash) = ProgramTest::new(
+    let (banks_client, payer, recent_blockhash) = ProgramTest::new(
         "spl_example_logging",
         program_id,
         processor!(process_instruction),
diff --git a/examples/rust/sysvar/tests/functional.rs b/examples/rust/sysvar/tests/functional.rs
index e67c980e0f1..171d2c0078d 100644
--- a/examples/rust/sysvar/tests/functional.rs
+++ b/examples/rust/sysvar/tests/functional.rs
@@ -13,7 +13,7 @@ use {
 #[tokio::test]
 async fn test_sysvar() {
     let program_id = Pubkey::from_str("Sysvar1111111111111111111111111111111111111").unwrap();
-    let (mut banks_client, payer, recent_blockhash) = ProgramTest::new(
+    let (banks_client, payer, recent_blockhash) = ProgramTest::new(
         "spl_example_sysvar",
         program_id,
         processor!(process_instruction),
diff --git a/examples/rust/transfer-lamports/tests/functional.rs b/examples/rust/transfer-lamports/tests/functional.rs
index d373859224c..0dcd1c9e7f3 100644
--- a/examples/rust/transfer-lamports/tests/functional.rs
+++ b/examples/rust/transfer-lamports/tests/functional.rs
@@ -34,7 +34,7 @@ async fn test_lamport_transfer() {
             ..Account::default()
         },
     );
-    let (mut banks_client, payer, recent_blockhash) = program_test.start().await;
+    let (banks_client, payer, recent_blockhash) = program_test.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[Instruction::new_with_bincode(
diff --git a/examples/rust/transfer-tokens/tests/functional.rs b/examples/rust/transfer-tokens/tests/functional.rs
index ef5a0ef2332..b03f82b5433 100644
--- a/examples/rust/transfer-tokens/tests/functional.rs
+++ b/examples/rust/transfer-tokens/tests/functional.rs
@@ -33,7 +33,7 @@ async fn success() {
     let rent = Rent::default();
 
     // Start the program test
-    let (mut banks_client, payer, recent_blockhash) = program_test.start().await;
+    let (banks_client, payer, recent_blockhash) = program_test.start().await;
 
     // Setup the mint, used in `spl_token::instruction::transfer_checked`
     let transaction = Transaction::new_signed_with_payer(
diff --git a/feature-proposal/program/tests/functional.rs b/feature-proposal/program/tests/functional.rs
index a8101d9b63f..149b68b9b8e 100644
--- a/feature-proposal/program/tests/functional.rs
+++ b/feature-proposal/program/tests/functional.rs
@@ -166,7 +166,7 @@ async fn test_basic() {
 async fn test_expired() {
     let feature_proposal = Keypair::new();
 
-    let (mut banks_client, payer, recent_blockhash) = program_test().start().await;
+    let (banks_client, payer, recent_blockhash) = program_test().start().await;
 
     // Create a new feature proposal
     let mut transaction = Transaction::new_with_payer(
diff --git a/governance/test-sdk/src/lib.rs b/governance/test-sdk/src/lib.rs
index b225178a341..8086306c24a 100644
--- a/governance/test-sdk/src/lib.rs
+++ b/governance/test-sdk/src/lib.rs
@@ -38,7 +38,7 @@ impl ProgramTestBench {
     /// Create new bench given a ProgramTest instance populated with all of the
     /// desired programs.
     pub async fn start_new(program_test: ProgramTest) -> Self {
-        let mut context = program_test.start_with_context().await;
+        let context = program_test.start_with_context().await;
         let rent = context.banks_client.get_rent().await.unwrap();
 
         let payer = clone_keypair(&context.payer);
diff --git a/instruction-padding/program/tests/noop.rs b/instruction-padding/program/tests/noop.rs
index 1d206b2e521..beaba6074bb 100644
--- a/instruction-padding/program/tests/noop.rs
+++ b/instruction-padding/program/tests/noop.rs
@@ -13,7 +13,7 @@ async fn success_with_noop() {
     let program_id = Pubkey::new_unique();
     let program_test = ProgramTest::new("spl_instruction_padding", program_id, processor!(process));
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
 
     let padding_accounts = vec![
         AccountMeta::new_readonly(Pubkey::new_unique(), false),
diff --git a/instruction-padding/program/tests/system.rs b/instruction-padding/program/tests/system.rs
index e8784252fa2..335af0bc306 100644
--- a/instruction-padding/program/tests/system.rs
+++ b/instruction-padding/program/tests/system.rs
@@ -14,7 +14,7 @@ async fn success_with_padded_transfer_data() {
     let program_id = Pubkey::new_unique();
     let program_test = ProgramTest::new("spl_instruction_padding", program_id, processor!(process));
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let to = Pubkey::new_unique();
 
     let transfer_amount = LAMPORTS_PER_SOL;
diff --git a/libraries/math/tests/instruction_count.rs b/libraries/math/tests/instruction_count.rs
index 3604325d4cf..921c0319f63 100644
--- a/libraries/math/tests/instruction_count.rs
+++ b/libraries/math/tests/instruction_count.rs
@@ -16,7 +16,7 @@ async fn test_precise_sqrt_u64_max() {
     // something reasonable, but the better option is to do everything in u64
     pc.set_compute_max_units(350_000);
 
-    let (mut banks_client, payer, recent_blockhash) = pc.start().await;
+    let (banks_client, payer, recent_blockhash) = pc.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[instruction::precise_sqrt(u64::MAX)],
@@ -32,7 +32,7 @@ async fn test_precise_sqrt_u32_max() {
 
     pc.set_compute_max_units(170_000);
 
-    let (mut banks_client, payer, recent_blockhash) = pc.start().await;
+    let (banks_client, payer, recent_blockhash) = pc.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[instruction::precise_sqrt(u32::MAX as u64)],
@@ -50,7 +50,7 @@ async fn test_sqrt_u64() {
     // the future
     pc.set_compute_max_units(2_500);
 
-    let (mut banks_client, payer, recent_blockhash) = pc.start().await;
+    let (banks_client, payer, recent_blockhash) = pc.start().await;
 
     let mut transaction =
         Transaction::new_with_payer(&[instruction::sqrt_u64(u64::MAX)], Some(&payer.pubkey()));
@@ -66,7 +66,7 @@ async fn test_sqrt_u128() {
     // the future
     pc.set_compute_max_units(4_100);
 
-    let (mut banks_client, payer, recent_blockhash) = pc.start().await;
+    let (banks_client, payer, recent_blockhash) = pc.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[instruction::sqrt_u128(u64::MAX as u128)],
@@ -82,7 +82,7 @@ async fn test_sqrt_u128_max() {
 
     pc.set_compute_max_units(7_000);
 
-    let (mut banks_client, payer, recent_blockhash) = pc.start().await;
+    let (banks_client, payer, recent_blockhash) = pc.start().await;
 
     let mut transaction =
         Transaction::new_with_payer(&[instruction::sqrt_u128(u128::MAX)], Some(&payer.pubkey()));
@@ -96,7 +96,7 @@ async fn test_u64_multiply() {
 
     pc.set_compute_max_units(1350);
 
-    let (mut banks_client, payer, recent_blockhash) = pc.start().await;
+    let (banks_client, payer, recent_blockhash) = pc.start().await;
 
     let mut transaction =
         Transaction::new_with_payer(&[instruction::u64_multiply(42, 84)], Some(&payer.pubkey()));
@@ -110,7 +110,7 @@ async fn test_u64_divide() {
 
     pc.set_compute_max_units(1650);
 
-    let (mut banks_client, payer, recent_blockhash) = pc.start().await;
+    let (banks_client, payer, recent_blockhash) = pc.start().await;
 
     let mut transaction =
         Transaction::new_with_payer(&[instruction::u64_divide(3, 1)], Some(&payer.pubkey()));
@@ -124,7 +124,7 @@ async fn test_f32_multiply() {
 
     pc.set_compute_max_units(1600);
 
-    let (mut banks_client, payer, recent_blockhash) = pc.start().await;
+    let (banks_client, payer, recent_blockhash) = pc.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[instruction::f32_multiply(1.5_f32, 2.0_f32)],
@@ -140,7 +140,7 @@ async fn test_f32_divide() {
 
     pc.set_compute_max_units(1650);
 
-    let (mut banks_client, payer, recent_blockhash) = pc.start().await;
+    let (banks_client, payer, recent_blockhash) = pc.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[instruction::f32_divide(3_f32, 1.5_f32)],
@@ -156,7 +156,7 @@ async fn test_f32_exponentiate() {
 
     pc.set_compute_max_units(1400);
 
-    let (mut banks_client, payer, recent_blockhash) = pc.start().await;
+    let (banks_client, payer, recent_blockhash) = pc.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[instruction::f32_exponentiate(4_f32, 2_f32)],
@@ -172,7 +172,7 @@ async fn test_f32_natural_log() {
 
     pc.set_compute_max_units(3500);
 
-    let (mut banks_client, payer, recent_blockhash) = pc.start().await;
+    let (banks_client, payer, recent_blockhash) = pc.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[instruction::f32_natural_log(1_f32.exp())],
@@ -190,7 +190,7 @@ async fn test_f32_normal_cdf() {
     // the future
     pc.set_compute_max_units(3_100);
 
-    let (mut banks_client, payer, recent_blockhash) = pc.start().await;
+    let (banks_client, payer, recent_blockhash) = pc.start().await;
 
     let mut transaction =
         Transaction::new_with_payer(&[instruction::f32_normal_cdf(0_f32)], Some(&payer.pubkey()));
@@ -204,7 +204,7 @@ async fn test_f64_pow() {
 
     pc.set_compute_max_units(30_000);
 
-    let (mut banks_client, payer, recent_blockhash) = pc.start().await;
+    let (banks_client, payer, recent_blockhash) = pc.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[instruction::f64_pow(50_f64, 10.5_f64)],
@@ -220,7 +220,7 @@ async fn test_u128_multiply() {
 
     pc.set_compute_max_units(10000);
 
-    let (mut banks_client, payer, recent_blockhash) = pc.start().await;
+    let (banks_client, payer, recent_blockhash) = pc.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[instruction::u128_multiply(u64::MAX.into(), u64::MAX.into())],
@@ -236,7 +236,7 @@ async fn test_u128_divide() {
 
     pc.set_compute_max_units(10000);
 
-    let (mut banks_client, payer, recent_blockhash) = pc.start().await;
+    let (banks_client, payer, recent_blockhash) = pc.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[instruction::u128_divide(u128::MAX, u128::MAX / 69)],
@@ -252,7 +252,7 @@ async fn test_f64_multiply() {
 
     pc.set_compute_max_units(10000);
 
-    let (mut banks_client, payer, recent_blockhash) = pc.start().await;
+    let (banks_client, payer, recent_blockhash) = pc.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[instruction::f64_multiply(f64::powf(2., 42.), 1e-4)],
@@ -268,7 +268,7 @@ async fn test_f64_divide() {
 
     pc.set_compute_max_units(10000);
 
-    let (mut banks_client, payer, recent_blockhash) = pc.start().await;
+    let (banks_client, payer, recent_blockhash) = pc.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[instruction::f64_divide(f64::powf(2., 42.), 420420.6969)],
@@ -284,7 +284,7 @@ async fn test_noop() {
 
     pc.set_compute_max_units(1200);
 
-    let (mut banks_client, payer, recent_blockhash) = pc.start().await;
+    let (banks_client, payer, recent_blockhash) = pc.start().await;
 
     let mut transaction =
         Transaction::new_with_payer(&[instruction::noop()], Some(&payer.pubkey()));
diff --git a/memo/program/tests/functional.rs b/memo/program/tests/functional.rs
index 91fef7e12ab..c2ea742df8f 100644
--- a/memo/program/tests/functional.rs
+++ b/memo/program/tests/functional.rs
@@ -20,7 +20,7 @@ fn program_test() -> ProgramTest {
 #[tokio::test]
 async fn test_memo_signing() {
     let memo = "🐆".as_bytes();
-    let (mut banks_client, payer, recent_blockhash) = program_test().start().await;
+    let (banks_client, payer, recent_blockhash) = program_test().start().await;
 
     let keypairs = vec![Keypair::new(), Keypair::new(), Keypair::new()];
     let pubkeys: Vec<Pubkey> = keypairs.iter().map(|keypair| keypair.pubkey()).collect();
@@ -122,7 +122,7 @@ async fn test_memo_signing() {
 #[tokio::test]
 #[ignore]
 async fn test_memo_compute_limits() {
-    let (mut banks_client, payer, recent_blockhash) = program_test().start().await;
+    let (banks_client, payer, recent_blockhash) = program_test().start().await;
 
     // Test memo length
     let mut memo = vec![];
diff --git a/record/program/tests/functional.rs b/record/program/tests/functional.rs
index 4f4d325f286..948894c0788 100644
--- a/record/program/tests/functional.rs
+++ b/record/program/tests/functional.rs
@@ -78,7 +78,7 @@ async fn initialize_success() {
 
 #[tokio::test]
 async fn initialize_with_seed_success() {
-    let mut context = program_test().start_with_context().await;
+    let context = program_test().start_with_context().await;
 
     let authority = Keypair::new();
     let seed = "storage";
diff --git a/shared-memory/program/tests/shared-memory.rs b/shared-memory/program/tests/shared-memory.rs
index c8a327c8c14..cbed1e5d467 100644
--- a/shared-memory/program/tests/shared-memory.rs
+++ b/shared-memory/program/tests/shared-memory.rs
@@ -35,7 +35,7 @@ async fn assert_instruction_count() {
         },
     );
     program_test.set_compute_max_units(480);
-    let (mut banks_client, payer, recent_blockhash) = program_test.start().await;
+    let (banks_client, payer, recent_blockhash) = program_test.start().await;
 
     // success
     let content = vec![42; NUM_TO_SHARE];
@@ -74,7 +74,7 @@ async fn test_helloworld() {
             ..Account::default()
         },
     );
-    let (mut banks_client, payer, recent_blockhash) = program_test.start().await;
+    let (banks_client, payer, recent_blockhash) = program_test.start().await;
 
     // success
     let content = vec![42; NUM_TO_SHARE];
diff --git a/stake-pool/program/src/big_vec.rs b/stake-pool/program/src/big_vec.rs
index 8cf99f8070f..9ad84ff3b8c 100644
--- a/stake-pool/program/src/big_vec.rs
+++ b/stake-pool/program/src/big_vec.rs
@@ -83,8 +83,8 @@ impl<'data> BigVec<'data> {
             }
         }
 
-        let mut vec_len_ref = &mut self.data[0..VEC_SIZE_BYTES];
-        borsh::to_writer(&mut vec_len_ref, &vec_len)?;
+        let vec_len_ref = &mut self.data[0..VEC_SIZE_BYTES];
+        borsh::to_writer(vec_len_ref, &vec_len)?;
 
         Ok(())
     }
@@ -127,14 +127,14 @@ impl<'data> BigVec<'data> {
 
     /// Add new element to the end
     pub fn push<T: Pod>(&mut self, element: T) -> Result<(), ProgramError> {
-        let mut vec_len_ref = &mut self.data[0..VEC_SIZE_BYTES];
+        let vec_len_ref = &mut self.data[0..VEC_SIZE_BYTES];
         let mut vec_len = u32::try_from_slice(vec_len_ref)?;
 
         let start_index = VEC_SIZE_BYTES + vec_len as usize * mem::size_of::<T>();
         let end_index = start_index + mem::size_of::<T>();
 
         vec_len += 1;
-        borsh::to_writer(&mut vec_len_ref, &vec_len)?;
+        borsh::to_writer(vec_len_ref, &vec_len)?;
 
         if self.data.len() < end_index {
             return Err(ProgramError::AccountDataTooSmall);
diff --git a/stake-pool/program/src/state.rs b/stake-pool/program/src/state.rs
index e2b79d535db..a10a2652915 100644
--- a/stake-pool/program/src/state.rs
+++ b/stake-pool/program/src/state.rs
@@ -765,10 +765,10 @@ impl Sealed for ValidatorStakeInfo {}
 impl Pack for ValidatorStakeInfo {
     const LEN: usize = 73;
     fn pack_into_slice(&self, data: &mut [u8]) {
-        let mut data = data;
+        let data = data;
         // Removing this unwrap would require changing from `Pack` to some other
         // trait or `bytemuck`, so it stays in for now
-        borsh::to_writer(&mut data, self).unwrap();
+        borsh::to_writer(data, self).unwrap();
     }
     fn unpack_from_slice(src: &[u8]) -> Result<Self, ProgramError> {
         let unpacked = Self::try_from_slice(src)?;
diff --git a/stake-pool/program/tests/create_pool_token_metadata.rs b/stake-pool/program/tests/create_pool_token_metadata.rs
index 147e3928a07..b56fd655b19 100644
--- a/stake-pool/program/tests/create_pool_token_metadata.rs
+++ b/stake-pool/program/tests/create_pool_token_metadata.rs
@@ -83,7 +83,7 @@ async fn success(token_program_id: Pubkey) {
 
 #[tokio::test]
 async fn fail_manager_did_not_sign() {
-    let (mut context, stake_pool_accounts) = setup(spl_token::id()).await;
+    let (context, stake_pool_accounts) = setup(spl_token::id()).await;
 
     let name = "test_name";
     let symbol = "SYM";
@@ -127,7 +127,7 @@ async fn fail_manager_did_not_sign() {
 
 #[tokio::test]
 async fn fail_wrong_manager_signed() {
-    let (mut context, stake_pool_accounts) = setup(spl_token::id()).await;
+    let (context, stake_pool_accounts) = setup(spl_token::id()).await;
 
     let name = "test_name";
     let symbol = "SYM";
@@ -171,7 +171,7 @@ async fn fail_wrong_manager_signed() {
 
 #[tokio::test]
 async fn fail_wrong_mpl_metadata_program() {
-    let (mut context, stake_pool_accounts) = setup(spl_token::id()).await;
+    let (context, stake_pool_accounts) = setup(spl_token::id()).await;
 
     let name = "test_name";
     let symbol = "SYM";
@@ -217,7 +217,7 @@ async fn fail_wrong_mpl_metadata_program() {
 
 #[tokio::test]
 async fn fail_create_metadata_twice() {
-    let (mut context, stake_pool_accounts) = setup(spl_token::id()).await;
+    let (context, stake_pool_accounts) = setup(spl_token::id()).await;
 
     let name = "test_name";
     let symbol = "SYM";
diff --git a/stake-pool/program/tests/decrease.rs b/stake-pool/program/tests/decrease.rs
index 2e31c644844..495f5d2169b 100644
--- a/stake-pool/program/tests/decrease.rs
+++ b/stake-pool/program/tests/decrease.rs
@@ -174,7 +174,7 @@ async fn success(instruction_type: DecreaseInstruction) {
 
 #[tokio::test]
 async fn fail_with_wrong_withdraw_authority() {
-    let (mut context, stake_pool_accounts, validator_stake, _deposit_info, decrease_lamports, _) =
+    let (context, stake_pool_accounts, validator_stake, _deposit_info, decrease_lamports, _) =
         setup().await;
 
     let wrong_authority = Pubkey::new_unique();
@@ -215,14 +215,8 @@ async fn fail_with_wrong_withdraw_authority() {
 
 #[tokio::test]
 async fn fail_with_wrong_validator_list() {
-    let (
-        mut context,
-        mut stake_pool_accounts,
-        validator_stake,
-        _deposit_info,
-        decrease_lamports,
-        _,
-    ) = setup().await;
+    let (context, mut stake_pool_accounts, validator_stake, _deposit_info, decrease_lamports, _) =
+        setup().await;
 
     stake_pool_accounts.validator_list = Keypair::new();
 
diff --git a/stake-pool/program/tests/deposit.rs b/stake-pool/program/tests/deposit.rs
index 0b333e47cfc..752a6bec8a6 100644
--- a/stake-pool/program/tests/deposit.rs
+++ b/stake-pool/program/tests/deposit.rs
@@ -465,7 +465,7 @@ async fn success_with_extra_stake_lamports() {
 #[tokio::test]
 async fn fail_with_wrong_stake_program_id() {
     let (
-        mut context,
+        context,
         stake_pool_accounts,
         validator_stake_account,
         _user,
@@ -522,7 +522,7 @@ async fn fail_with_wrong_stake_program_id() {
 #[tokio::test]
 async fn fail_with_wrong_token_program_id() {
     let (
-        mut context,
+        context,
         stake_pool_accounts,
         validator_stake_account,
         user,
diff --git a/stake-pool/program/tests/deposit_edge_cases.rs b/stake-pool/program/tests/deposit_edge_cases.rs
index 510e2f94d52..a11ea428c54 100644
--- a/stake-pool/program/tests/deposit_edge_cases.rs
+++ b/stake-pool/program/tests/deposit_edge_cases.rs
@@ -288,7 +288,7 @@ async fn success_with_referral_fee() {
 #[tokio::test]
 async fn fail_with_invalid_referrer() {
     let (
-        mut context,
+        context,
         stake_pool_accounts,
         validator_stake_account,
         user,
diff --git a/stake-pool/program/tests/deposit_sol.rs b/stake-pool/program/tests/deposit_sol.rs
index fa7ef355966..aebeb4f1010 100644
--- a/stake-pool/program/tests/deposit_sol.rs
+++ b/stake-pool/program/tests/deposit_sol.rs
@@ -141,8 +141,7 @@ async fn success(token_program_id: Pubkey) {
 
 #[tokio::test]
 async fn fail_with_wrong_token_program_id() {
-    let (mut context, stake_pool_accounts, _user, pool_token_account) =
-        setup(spl_token::id()).await;
+    let (context, stake_pool_accounts, _user, pool_token_account) = setup(spl_token::id()).await;
 
     let wrong_token_program = Keypair::new();
 
@@ -467,8 +466,7 @@ async fn success_with_referral_fee() {
 
 #[tokio::test]
 async fn fail_with_invalid_referrer() {
-    let (mut context, stake_pool_accounts, _user, pool_token_account) =
-        setup(spl_token::id()).await;
+    let (context, stake_pool_accounts, _user, pool_token_account) = setup(spl_token::id()).await;
 
     let invalid_token_account = Keypair::new();
 
diff --git a/stake-pool/program/tests/increase.rs b/stake-pool/program/tests/increase.rs
index 67fac5f119b..0d6c4bda6a5 100644
--- a/stake-pool/program/tests/increase.rs
+++ b/stake-pool/program/tests/increase.rs
@@ -150,7 +150,7 @@ async fn success(use_additional_instruction: bool) {
 
 #[tokio::test]
 async fn fail_with_wrong_withdraw_authority() {
-    let (mut context, stake_pool_accounts, validator_stake, reserve_lamports) = setup().await;
+    let (context, stake_pool_accounts, validator_stake, reserve_lamports) = setup().await;
 
     let wrong_authority = Pubkey::new_unique();
 
@@ -191,7 +191,7 @@ async fn fail_with_wrong_withdraw_authority() {
 
 #[tokio::test]
 async fn fail_with_wrong_validator_list() {
-    let (mut context, stake_pool_accounts, validator_stake, reserve_lamports) = setup().await;
+    let (context, stake_pool_accounts, validator_stake, reserve_lamports) = setup().await;
 
     let wrong_validator_list = Pubkey::new_unique();
 
diff --git a/stake-pool/program/tests/set_deposit_fee.rs b/stake-pool/program/tests/set_deposit_fee.rs
index ba62838421b..618228aa607 100644
--- a/stake-pool/program/tests/set_deposit_fee.rs
+++ b/stake-pool/program/tests/set_deposit_fee.rs
@@ -112,7 +112,7 @@ async fn success_stake_increase_fee_from_0() {
 
 #[tokio::test]
 async fn fail_stake_wrong_manager() {
-    let (mut context, stake_pool_accounts, new_deposit_fee) = setup(None).await;
+    let (context, stake_pool_accounts, new_deposit_fee) = setup(None).await;
 
     let wrong_manager = Keypair::new();
     let transaction = Transaction::new_signed_with_payer(
@@ -145,7 +145,7 @@ async fn fail_stake_wrong_manager() {
 
 #[tokio::test]
 async fn fail_stake_high_deposit_fee() {
-    let (mut context, stake_pool_accounts, _new_deposit_fee) = setup(None).await;
+    let (context, stake_pool_accounts, _new_deposit_fee) = setup(None).await;
 
     let new_deposit_fee = Fee {
         numerator: 100001,
@@ -211,7 +211,7 @@ async fn success_sol() {
 
 #[tokio::test]
 async fn fail_sol_wrong_manager() {
-    let (mut context, stake_pool_accounts, new_deposit_fee) = setup(None).await;
+    let (context, stake_pool_accounts, new_deposit_fee) = setup(None).await;
 
     let wrong_manager = Keypair::new();
     let transaction = Transaction::new_signed_with_payer(
@@ -244,7 +244,7 @@ async fn fail_sol_wrong_manager() {
 
 #[tokio::test]
 async fn fail_sol_high_deposit_fee() {
-    let (mut context, stake_pool_accounts, _new_deposit_fee) = setup(None).await;
+    let (context, stake_pool_accounts, _new_deposit_fee) = setup(None).await;
 
     let new_deposit_fee = Fee {
         numerator: 100001,
diff --git a/stake-pool/program/tests/set_epoch_fee.rs b/stake-pool/program/tests/set_epoch_fee.rs
index c510a81314c..e7bb6cd57e1 100644
--- a/stake-pool/program/tests/set_epoch_fee.rs
+++ b/stake-pool/program/tests/set_epoch_fee.rs
@@ -127,7 +127,7 @@ async fn success() {
 
 #[tokio::test]
 async fn fail_wrong_manager() {
-    let (mut context, stake_pool_accounts, new_fee) = setup().await;
+    let (context, stake_pool_accounts, new_fee) = setup().await;
 
     let wrong_manager = Keypair::new();
     let transaction = Transaction::new_signed_with_payer(
@@ -160,7 +160,7 @@ async fn fail_wrong_manager() {
 
 #[tokio::test]
 async fn fail_high_fee() {
-    let (mut context, stake_pool_accounts, _new_fee) = setup().await;
+    let (context, stake_pool_accounts, _new_fee) = setup().await;
 
     let new_fee = Fee {
         numerator: 11,
diff --git a/stake-pool/program/tests/set_funding_authority.rs b/stake-pool/program/tests/set_funding_authority.rs
index ee2722d81d6..a3cdb619477 100644
--- a/stake-pool/program/tests/set_funding_authority.rs
+++ b/stake-pool/program/tests/set_funding_authority.rs
@@ -97,8 +97,7 @@ async fn success_set_stake_deposit_authority() {
 
 #[tokio::test]
 async fn fail_wrong_manager() {
-    let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, new_authority) =
-        setup().await;
+    let (banks_client, payer, recent_blockhash, stake_pool_accounts, new_authority) = setup().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[instruction::set_funding_authority(
@@ -132,8 +131,7 @@ async fn fail_wrong_manager() {
 
 #[tokio::test]
 async fn fail_without_signature() {
-    let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, new_authority) =
-        setup().await;
+    let (banks_client, payer, recent_blockhash, stake_pool_accounts, new_authority) = setup().await;
 
     let data = borsh::to_vec(&instruction::StakePoolInstruction::SetFundingAuthority(
         FundingType::StakeDeposit,
diff --git a/stake-pool/program/tests/set_manager.rs b/stake-pool/program/tests/set_manager.rs
index 3172d3bf3ee..e6f7afadb33 100644
--- a/stake-pool/program/tests/set_manager.rs
+++ b/stake-pool/program/tests/set_manager.rs
@@ -95,7 +95,7 @@ async fn test_set_manager() {
 
 #[tokio::test]
 async fn test_set_manager_by_malicious() {
-    let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, new_pool_fee, new_manager) =
+    let (banks_client, payer, recent_blockhash, stake_pool_accounts, new_pool_fee, new_manager) =
         setup().await;
 
     let mut transaction = Transaction::new_with_payer(
@@ -130,7 +130,7 @@ async fn test_set_manager_by_malicious() {
 
 #[tokio::test]
 async fn test_set_manager_without_existing_signature() {
-    let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, new_pool_fee, new_manager) =
+    let (banks_client, payer, recent_blockhash, stake_pool_accounts, new_pool_fee, new_manager) =
         setup().await;
 
     let data = borsh::to_vec(&instruction::StakePoolInstruction::SetManager).unwrap();
@@ -171,7 +171,7 @@ async fn test_set_manager_without_existing_signature() {
 
 #[tokio::test]
 async fn test_set_manager_without_new_signature() {
-    let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, new_pool_fee, new_manager) =
+    let (banks_client, payer, recent_blockhash, stake_pool_accounts, new_pool_fee, new_manager) =
         setup().await;
 
     let data = borsh::to_vec(&instruction::StakePoolInstruction::SetManager).unwrap();
diff --git a/stake-pool/program/tests/set_preferred.rs b/stake-pool/program/tests/set_preferred.rs
index 1a1e3c0f1cb..c18fd3df841 100644
--- a/stake-pool/program/tests/set_preferred.rs
+++ b/stake-pool/program/tests/set_preferred.rs
@@ -158,7 +158,7 @@ async fn success_unset() {
 
 #[tokio::test]
 async fn fail_wrong_staker() {
-    let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, _) = setup().await;
+    let (banks_client, payer, recent_blockhash, stake_pool_accounts, _) = setup().await;
 
     let wrong_staker = Keypair::new();
     let transaction = Transaction::new_signed_with_payer(
diff --git a/stake-pool/program/tests/set_referral_fee.rs b/stake-pool/program/tests/set_referral_fee.rs
index 7221e978d3f..19090820b7a 100644
--- a/stake-pool/program/tests/set_referral_fee.rs
+++ b/stake-pool/program/tests/set_referral_fee.rs
@@ -102,7 +102,7 @@ async fn success_stake_increase_fee_from_0() {
 
 #[tokio::test]
 async fn fail_stake_wrong_manager() {
-    let (mut context, stake_pool_accounts, new_referral_fee) = setup(None).await;
+    let (context, stake_pool_accounts, new_referral_fee) = setup(None).await;
 
     let wrong_manager = Keypair::new();
     let transaction = Transaction::new_signed_with_payer(
@@ -135,7 +135,7 @@ async fn fail_stake_wrong_manager() {
 
 #[tokio::test]
 async fn fail_stake_high_referral_fee() {
-    let (mut context, stake_pool_accounts, _new_referral_fee) = setup(None).await;
+    let (context, stake_pool_accounts, _new_referral_fee) = setup(None).await;
 
     let new_referral_fee = 110u8;
     let transaction = Transaction::new_signed_with_payer(
@@ -198,7 +198,7 @@ async fn success_sol() {
 
 #[tokio::test]
 async fn fail_sol_wrong_manager() {
-    let (mut context, stake_pool_accounts, new_referral_fee) = setup(None).await;
+    let (context, stake_pool_accounts, new_referral_fee) = setup(None).await;
 
     let wrong_manager = Keypair::new();
     let transaction = Transaction::new_signed_with_payer(
@@ -231,7 +231,7 @@ async fn fail_sol_wrong_manager() {
 
 #[tokio::test]
 async fn fail_sol_high_referral_fee() {
-    let (mut context, stake_pool_accounts, _new_referral_fee) = setup(None).await;
+    let (context, stake_pool_accounts, _new_referral_fee) = setup(None).await;
 
     let new_referral_fee = 110u8;
     let transaction = Transaction::new_signed_with_payer(
diff --git a/stake-pool/program/tests/set_staker.rs b/stake-pool/program/tests/set_staker.rs
index bef7c8837d1..d3dd61b4c24 100644
--- a/stake-pool/program/tests/set_staker.rs
+++ b/stake-pool/program/tests/set_staker.rs
@@ -112,8 +112,7 @@ async fn success_set_staker_as_staker() {
 
 #[tokio::test]
 async fn fail_wrong_manager() {
-    let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, new_staker) =
-        setup().await;
+    let (banks_client, payer, recent_blockhash, stake_pool_accounts, new_staker) = setup().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[instruction::set_staker(
@@ -146,8 +145,7 @@ async fn fail_wrong_manager() {
 
 #[tokio::test]
 async fn fail_set_staker_without_signature() {
-    let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, new_staker) =
-        setup().await;
+    let (banks_client, payer, recent_blockhash, stake_pool_accounts, new_staker) = setup().await;
 
     let data = borsh::to_vec(&instruction::StakePoolInstruction::SetStaker).unwrap();
     let accounts = vec![
diff --git a/stake-pool/program/tests/set_withdrawal_fee.rs b/stake-pool/program/tests/set_withdrawal_fee.rs
index b36ac69352c..4725685da95 100644
--- a/stake-pool/program/tests/set_withdrawal_fee.rs
+++ b/stake-pool/program/tests/set_withdrawal_fee.rs
@@ -645,7 +645,7 @@ async fn success_increase_fee_from_0() {
 
 #[tokio::test]
 async fn fail_wrong_manager() {
-    let (mut context, stake_pool_accounts, new_stake_withdrawal_fee) = setup(None).await;
+    let (context, stake_pool_accounts, new_stake_withdrawal_fee) = setup(None).await;
 
     let wrong_manager = Keypair::new();
     let transaction = Transaction::new_signed_with_payer(
@@ -678,7 +678,7 @@ async fn fail_wrong_manager() {
 
 #[tokio::test]
 async fn fail_high_withdrawal_fee() {
-    let (mut context, stake_pool_accounts, _new_stake_withdrawal_fee) = setup(None).await;
+    let (context, stake_pool_accounts, _new_stake_withdrawal_fee) = setup(None).await;
 
     let new_stake_withdrawal_fee = Fee {
         numerator: 11,
@@ -714,7 +714,7 @@ async fn fail_high_withdrawal_fee() {
 
 #[tokio::test]
 async fn fail_high_stake_fee_increase() {
-    let (mut context, stake_pool_accounts, _new_stake_withdrawal_fee) = setup(None).await;
+    let (context, stake_pool_accounts, _new_stake_withdrawal_fee) = setup(None).await;
     let new_withdrawal_fee = Fee {
         numerator: 46,
         denominator: 10_000,
@@ -749,7 +749,7 @@ async fn fail_high_stake_fee_increase() {
 
 #[tokio::test]
 async fn fail_high_sol_fee_increase() {
-    let (mut context, stake_pool_accounts, _new_stake_withdrawal_fee) = setup(None).await;
+    let (context, stake_pool_accounts, _new_stake_withdrawal_fee) = setup(None).await;
     let new_withdrawal_fee = Fee {
         numerator: 46,
         denominator: 10_000,
@@ -785,7 +785,7 @@ async fn fail_high_sol_fee_increase() {
 
 #[tokio::test]
 async fn fail_high_stake_fee_increase_from_0() {
-    let (mut context, stake_pool_accounts, _new_stake_withdrawal_fee) = setup(Some(Fee {
+    let (context, stake_pool_accounts, _new_stake_withdrawal_fee) = setup(Some(Fee {
         numerator: 0,
         denominator: 1,
     }))
@@ -824,7 +824,7 @@ async fn fail_high_stake_fee_increase_from_0() {
 
 #[tokio::test]
 async fn fail_high_sol_fee_increase_from_0() {
-    let (mut context, stake_pool_accounts, _new_stake_withdrawal_fee) = setup(Some(Fee {
+    let (context, stake_pool_accounts, _new_stake_withdrawal_fee) = setup(Some(Fee {
         numerator: 0,
         denominator: 1,
     }))
diff --git a/stake-pool/program/tests/update_pool_token_metadata.rs b/stake-pool/program/tests/update_pool_token_metadata.rs
index efe30a963dd..898366c5b6f 100644
--- a/stake-pool/program/tests/update_pool_token_metadata.rs
+++ b/stake-pool/program/tests/update_pool_token_metadata.rs
@@ -106,7 +106,7 @@ async fn success_update_pool_token_metadata() {
 
 #[tokio::test]
 async fn fail_manager_did_not_sign() {
-    let (mut context, stake_pool_accounts) = setup().await;
+    let (context, stake_pool_accounts) = setup().await;
 
     let updated_name = "updated_name";
     let updated_symbol = "USYM";
@@ -149,7 +149,7 @@ async fn fail_manager_did_not_sign() {
 
 #[tokio::test]
 async fn fail_wrong_manager_signed() {
-    let (mut context, stake_pool_accounts) = setup().await;
+    let (context, stake_pool_accounts) = setup().await;
 
     let updated_name = "updated_name";
     let updated_symbol = "USYM";
diff --git a/stake-pool/program/tests/vsa_add.rs b/stake-pool/program/tests/vsa_add.rs
index 3016a28d8b9..af6bd42ecc2 100644
--- a/stake-pool/program/tests/vsa_add.rs
+++ b/stake-pool/program/tests/vsa_add.rs
@@ -145,7 +145,7 @@ async fn success() {
 
 #[tokio::test]
 async fn fail_with_wrong_validator_list_account() {
-    let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, validator_stake) =
+    let (banks_client, payer, recent_blockhash, stake_pool_accounts, validator_stake) =
         setup(1).await;
 
     let wrong_validator_list = Keypair::new();
@@ -228,7 +228,7 @@ async fn fail_double_add() {
 
 #[tokio::test]
 async fn fail_wrong_staker() {
-    let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, validator_stake) =
+    let (banks_client, payer, recent_blockhash, stake_pool_accounts, validator_stake) =
         setup(1).await;
 
     let malicious = Keypair::new();
@@ -269,7 +269,7 @@ async fn fail_wrong_staker() {
 
 #[tokio::test]
 async fn fail_without_signature() {
-    let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, validator_stake) =
+    let (banks_client, payer, recent_blockhash, stake_pool_accounts, validator_stake) =
         setup(1).await;
 
     let accounts = vec![
@@ -323,7 +323,7 @@ async fn fail_without_signature() {
 
 #[tokio::test]
 async fn fail_with_wrong_stake_program_id() {
-    let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, validator_stake) =
+    let (banks_client, payer, recent_blockhash, stake_pool_accounts, validator_stake) =
         setup(1).await;
 
     let wrong_stake_program = Pubkey::new_unique();
@@ -375,7 +375,7 @@ async fn fail_with_wrong_stake_program_id() {
 
 #[tokio::test]
 async fn fail_with_wrong_system_program_id() {
-    let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, validator_stake) =
+    let (banks_client, payer, recent_blockhash, stake_pool_accounts, validator_stake) =
         setup(1).await;
 
     let wrong_system_program = Pubkey::new_unique();
@@ -634,7 +634,7 @@ async fn fail_with_not_enough_reserve_lamports() {
 
 #[tokio::test]
 async fn fail_with_wrong_reserve() {
-    let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, validator_stake) =
+    let (banks_client, payer, recent_blockhash, stake_pool_accounts, validator_stake) =
         setup(1).await;
 
     let wrong_reserve = Pubkey::new_unique();
diff --git a/stake-pool/program/tests/vsa_remove.rs b/stake-pool/program/tests/vsa_remove.rs
index 46571865b2b..9cfb5bdeefb 100644
--- a/stake-pool/program/tests/vsa_remove.rs
+++ b/stake-pool/program/tests/vsa_remove.rs
@@ -121,7 +121,7 @@ async fn success() {
 
 #[tokio::test]
 async fn fail_with_wrong_stake_program_id() {
-    let (mut context, stake_pool_accounts, validator_stake) = setup().await;
+    let (context, stake_pool_accounts, validator_stake) = setup().await;
 
     let wrong_stake_program = Pubkey::new_unique();
 
@@ -168,7 +168,7 @@ async fn fail_with_wrong_stake_program_id() {
 
 #[tokio::test]
 async fn fail_with_wrong_validator_list_account() {
-    let (mut context, stake_pool_accounts, validator_stake) = setup().await;
+    let (context, stake_pool_accounts, validator_stake) = setup().await;
 
     let wrong_validator_list = Keypair::new();
 
@@ -297,7 +297,7 @@ async fn fail_double_remove() {
 
 #[tokio::test]
 async fn fail_wrong_staker() {
-    let (mut context, stake_pool_accounts, validator_stake) = setup().await;
+    let (context, stake_pool_accounts, validator_stake) = setup().await;
 
     let malicious = Keypair::new();
 
@@ -338,7 +338,7 @@ async fn fail_wrong_staker() {
 
 #[tokio::test]
 async fn fail_no_signature() {
-    let (mut context, stake_pool_accounts, validator_stake) = setup().await;
+    let (context, stake_pool_accounts, validator_stake) = setup().await;
 
     let accounts = vec![
         AccountMeta::new(stake_pool_accounts.stake_pool.pubkey(), false),
diff --git a/stake-pool/program/tests/withdraw.rs b/stake-pool/program/tests/withdraw.rs
index 84401a1e91c..3420a0394b9 100644
--- a/stake-pool/program/tests/withdraw.rs
+++ b/stake-pool/program/tests/withdraw.rs
@@ -260,7 +260,7 @@ async fn _success(token_program_id: Pubkey, test_type: SuccessTestType) {
 #[tokio::test]
 async fn fail_with_wrong_stake_program() {
     let (
-        mut context,
+        context,
         stake_pool_accounts,
         validator_stake_account,
         deposit_info,
@@ -363,7 +363,7 @@ async fn fail_with_wrong_withdraw_authority() {
 #[tokio::test]
 async fn fail_with_wrong_token_program_id() {
     let (
-        mut context,
+        context,
         stake_pool_accounts,
         validator_stake_account,
         deposit_info,
diff --git a/token-group/example/tests/initialize_group.rs b/token-group/example/tests/initialize_group.rs
index 07c650422a3..7a78e58a0d0 100644
--- a/token-group/example/tests/initialize_group.rs
+++ b/token-group/example/tests/initialize_group.rs
@@ -39,7 +39,7 @@ async fn test_initialize_group() {
     );
     setup_mint(&token_client, &group_mint, &group_mint_authority).await;
 
-    let mut context = context.lock().await;
+    let context = context.lock().await;
 
     let rent = context.banks_client.get_rent().await.unwrap();
     let space = TlvStateBorrowed::get_base_len() + std::mem::size_of::<TokenGroup>();
diff --git a/token-group/example/tests/initialize_member.rs b/token-group/example/tests/initialize_member.rs
index c5f6ba97869..d87608ff8f5 100644
--- a/token-group/example/tests/initialize_member.rs
+++ b/token-group/example/tests/initialize_member.rs
@@ -64,7 +64,7 @@ async fn test_initialize_group_member() {
     )
     .await;
 
-    let mut context = context.lock().await;
+    let context = context.lock().await;
 
     let rent = context.banks_client.get_rent().await.unwrap();
     let space = TlvStateBorrowed::get_base_len() + std::mem::size_of::<TokenGroup>();
diff --git a/token-group/example/tests/update_group_authority.rs b/token-group/example/tests/update_group_authority.rs
index f74248cc3d2..12aa6779dcb 100644
--- a/token-group/example/tests/update_group_authority.rs
+++ b/token-group/example/tests/update_group_authority.rs
@@ -45,7 +45,7 @@ async fn test_update_group_authority() {
     );
     setup_mint(&token_client, &group_mint, &group_mint_authority).await;
 
-    let mut context = context.lock().await;
+    let context = context.lock().await;
 
     let rent = context.banks_client.get_rent().await.unwrap();
     let space = TlvStateBorrowed::get_base_len() + std::mem::size_of::<TokenGroup>();
diff --git a/token-group/example/tests/update_group_max_size.rs b/token-group/example/tests/update_group_max_size.rs
index 52ba3a8f9e3..2969044880a 100644
--- a/token-group/example/tests/update_group_max_size.rs
+++ b/token-group/example/tests/update_group_max_size.rs
@@ -223,7 +223,7 @@ async fn test_update_group_max_size_fail_immutable_group() {
     );
     setup_mint(&token_client, &group_mint, &group_mint_authority).await;
 
-    let mut context = context.lock().await;
+    let context = context.lock().await;
 
     let rent = context.banks_client.get_rent().await.unwrap();
     let space = TlvStateBorrowed::get_base_len() + std::mem::size_of::<TokenGroup>();
diff --git a/token-lending/flash_loan_receiver/src/processor.rs b/token-lending/flash_loan_receiver/src/processor.rs
index 8d895e8aa98..0f145dc28d9 100644
--- a/token-lending/flash_loan_receiver/src/processor.rs
+++ b/token-lending/flash_loan_receiver/src/processor.rs
@@ -61,9 +61,8 @@ fn unpack_amount(input: &[u8]) -> Result<u64, ProgramError> {
         .and_then(|slice| slice.try_into().ok())
         .map(u64::from_le_bytes)
         .ok_or(ProgramError::InvalidInstructionData)
-        .map_err(|e| {
+        .inspect_err(|e| {
             msg!("Failed to unpack amount.");
-            e
         })?;
     Ok(amount)
 }
diff --git a/token-lending/program/tests/borrow_obligation_liquidity.rs b/token-lending/program/tests/borrow_obligation_liquidity.rs
index 848e58cb91e..8152350749e 100644
--- a/token-lending/program/tests/borrow_obligation_liquidity.rs
+++ b/token-lending/program/tests/borrow_obligation_liquidity.rs
@@ -372,7 +372,7 @@ async fn test_borrow_too_large() {
         },
     );
 
-    let (mut banks_client, payer, recent_blockhash) = test.start().await;
+    let (banks_client, payer, recent_blockhash) = test.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[
@@ -626,7 +626,7 @@ async fn test_borrow_max_receive_less_than_slippage() {
         },
     );
 
-    let (mut banks_client, payer, recent_blockhash) = test.start().await;
+    let (banks_client, payer, recent_blockhash) = test.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[
@@ -732,7 +732,7 @@ async fn test_borrow_less_than_max_with_slippage() {
         },
     );
 
-    let (mut banks_client, payer, recent_blockhash) = test.start().await;
+    let (banks_client, payer, recent_blockhash) = test.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[
diff --git a/token-lending/program/tests/init_lending_market.rs b/token-lending/program/tests/init_lending_market.rs
index ed0aebdd9bf..a4b8d48a429 100644
--- a/token-lending/program/tests/init_lending_market.rs
+++ b/token-lending/program/tests/init_lending_market.rs
@@ -43,7 +43,7 @@ async fn test_already_initialized() {
     );
 
     let existing_market = add_lending_market(&mut test);
-    let (mut banks_client, payer, recent_blockhash) = test.start().await;
+    let (banks_client, payer, recent_blockhash) = test.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[init_lending_market(
diff --git a/token-lending/program/tests/init_obligation.rs b/token-lending/program/tests/init_obligation.rs
index 60d34a2bb0b..9ba184168a4 100644
--- a/token-lending/program/tests/init_obligation.rs
+++ b/token-lending/program/tests/init_obligation.rs
@@ -64,7 +64,7 @@ async fn test_already_initialized() {
         AddObligationArgs::default(),
     );
 
-    let (mut banks_client, payer, recent_blockhash) = test.start().await;
+    let (banks_client, payer, recent_blockhash) = test.start().await;
     let mut transaction = Transaction::new_with_payer(
         &[init_obligation(
             spl_token_lending::id(),
diff --git a/token-lending/program/tests/init_reserve.rs b/token-lending/program/tests/init_reserve.rs
index 719c44dae46..134a7e5277c 100644
--- a/token-lending/program/tests/init_reserve.rs
+++ b/token-lending/program/tests/init_reserve.rs
@@ -107,7 +107,7 @@ async fn test_already_initialized() {
         },
     );
 
-    let (mut banks_client, payer, recent_blockhash) = test.start().await;
+    let (banks_client, payer, recent_blockhash) = test.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[init_reserve(
diff --git a/token-lending/program/tests/modify_reserve_config.rs b/token-lending/program/tests/modify_reserve_config.rs
index d5679069a65..2fe71ce5038 100644
--- a/token-lending/program/tests/modify_reserve_config.rs
+++ b/token-lending/program/tests/modify_reserve_config.rs
@@ -137,7 +137,7 @@ async fn wrong_signer_of_lending_market_cannot_change_reserve_config() {
     let other_lending_market_owner = Keypair::new();
     other_lending_market.owner = other_lending_market_owner;
 
-    let (mut banks_client, payer, recent_blockhash) = test.start().await;
+    let (banks_client, payer, recent_blockhash) = test.start().await;
 
     const OPTIMAL_UTILIZATION_RATE_CHANGE: u8 = 10;
 
diff --git a/token-lending/program/tests/redeem_reserve_collateral.rs b/token-lending/program/tests/redeem_reserve_collateral.rs
index 0340065bf68..61df380303c 100644
--- a/token-lending/program/tests/redeem_reserve_collateral.rs
+++ b/token-lending/program/tests/redeem_reserve_collateral.rs
@@ -52,7 +52,7 @@ async fn test_success() {
         },
     );
 
-    let (mut banks_client, payer, recent_blockhash) = test.start().await;
+    let (banks_client, payer, recent_blockhash) = test.start().await;
 
     let user_transfer_authority = Keypair::new();
     let mut transaction = Transaction::new_with_payer(
diff --git a/token-lending/program/tests/set_lending_market_owner.rs b/token-lending/program/tests/set_lending_market_owner.rs
index 9f120aa9b65..1a6302c091b 100644
--- a/token-lending/program/tests/set_lending_market_owner.rs
+++ b/token-lending/program/tests/set_lending_market_owner.rs
@@ -66,7 +66,7 @@ async fn test_invalid_owner() {
     );
 
     let lending_market = add_lending_market(&mut test);
-    let (mut banks_client, payer, recent_blockhash) = test.start().await;
+    let (banks_client, payer, recent_blockhash) = test.start().await;
 
     let invalid_owner = Keypair::new();
     let new_owner = Pubkey::new_unique();
@@ -104,7 +104,7 @@ async fn test_owner_not_signer() {
     );
 
     let lending_market = add_lending_market(&mut test);
-    let (mut banks_client, payer, recent_blockhash) = test.start().await;
+    let (banks_client, payer, recent_blockhash) = test.start().await;
 
     let new_owner = Pubkey::new_unique();
     let mut transaction = Transaction::new_with_payer(
diff --git a/token-lending/program/tests/withdraw_obligation_collateral.rs b/token-lending/program/tests/withdraw_obligation_collateral.rs
index cfdc3d8b880..bad6bb81130 100644
--- a/token-lending/program/tests/withdraw_obligation_collateral.rs
+++ b/token-lending/program/tests/withdraw_obligation_collateral.rs
@@ -319,7 +319,7 @@ async fn test_withdraw_too_large() {
         },
     );
 
-    let (mut banks_client, payer, recent_blockhash) = test.start().await;
+    let (banks_client, payer, recent_blockhash) = test.start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[
diff --git a/token-metadata/example/tests/initialize.rs b/token-metadata/example/tests/initialize.rs
index ccd50373e84..2dc28ef9b27 100644
--- a/token-metadata/example/tests/initialize.rs
+++ b/token-metadata/example/tests/initialize.rs
@@ -131,7 +131,7 @@ async fn fail_without_authority_signature() {
         client.clone(),
     )
     .await;
-    let mut context = context.lock().await;
+    let context = context.lock().await;
 
     let update_authority = Pubkey::new_unique();
     let name = "MySuperCoolToken".to_string();
@@ -208,7 +208,7 @@ async fn fail_incorrect_authority() {
         client.clone(),
     )
     .await;
-    let mut context = context.lock().await;
+    let context = context.lock().await;
 
     let update_authority = Pubkey::new_unique();
     let name = "MySuperCoolToken".to_string();
diff --git a/token-swap/program/src/processor.rs b/token-swap/program/src/processor.rs
index a596bd21884..09b22b25964 100644
--- a/token-swap/program/src/processor.rs
+++ b/token-swap/program/src/processor.rs
@@ -1263,9 +1263,8 @@ fn invoke_signed_wrapper<T>(
 where
     T: 'static + PrintProgramError + DecodeError<T> + FromPrimitive + Error,
 {
-    invoke_signed(instruction, account_infos, signers_seeds).map_err(|err| {
+    invoke_signed(instruction, account_infos, signers_seeds).inspect_err(|err| {
         err.print::<T>();
-        err
     })
 }
 
diff --git a/token-upgrade/program/tests/functional.rs b/token-upgrade/program/tests/functional.rs
index 06f3d0eef3f..3938f9f65ec 100644
--- a/token-upgrade/program/tests/functional.rs
+++ b/token-upgrade/program/tests/functional.rs
@@ -164,7 +164,7 @@ async fn success(original_program_id: Pubkey, new_program_id: Pubkey) {
         .unwrap();
 
     {
-        let mut context = context.lock().await;
+        let context = context.lock().await;
         let transaction = Transaction::new_signed_with_payer(
             &[exchange(
                 &spl_token_upgrade::id(),
@@ -285,7 +285,7 @@ async fn fail_incorrect_escrow_derivation(original_program_id: Pubkey, new_progr
         &[],
     );
     instruction.accounts[5] = AccountMeta::new_readonly(program_escrow, false);
-    let mut context = context.lock().await;
+    let context = context.lock().await;
     let transaction = Transaction::new_signed_with_payer(
         &[instruction],
         Some(&context.payer.pubkey()),
@@ -379,7 +379,7 @@ async fn fail_decimals_mismatch(original_program_id: Pubkey, new_program_id: Pub
         .await
         .unwrap();
 
-    let mut context = context.lock().await;
+    let context = context.lock().await;
     let transaction = Transaction::new_signed_with_payer(
         &[exchange(
             &spl_token_upgrade::id(),
diff --git a/token/program-2022-test/tests/confidential_transfer.rs b/token/program-2022-test/tests/confidential_transfer.rs
index 3e756082ce2..7c86f2f93d3 100644
--- a/token/program-2022-test/tests/confidential_transfer.rs
+++ b/token/program-2022-test/tests/confidential_transfer.rs
@@ -2847,7 +2847,7 @@ async fn confidential_transfer_configure_token_account_with_registry() {
     let elgamal_keypair = ElGamalKeypair::new_rand();
 
     // create ElGamal registry
-    let mut ctx = context.context.lock().await;
+    let ctx = context.context.lock().await;
     let proof_data =
         confidential_transfer::instruction::PubkeyValidityProofData::new(&elgamal_keypair).unwrap();
     let proof_location = ProofLocation::InstructionOffset(
diff --git a/token/program-2022-test/tests/initialize_account.rs b/token/program-2022-test/tests/initialize_account.rs
index c0cd45250c1..d4bc24f8baf 100644
--- a/token/program-2022-test/tests/initialize_account.rs
+++ b/token/program-2022-test/tests/initialize_account.rs
@@ -27,7 +27,7 @@ use {
 #[tokio::test]
 async fn no_extensions() {
     let context = TestContext::new().await;
-    let mut ctx = context.context.lock().await;
+    let ctx = context.context.lock().await;
     let rent = ctx.banks_client.get_rent().await.unwrap();
     let mint_account = Keypair::new();
     let mint_authority_pubkey = Pubkey::new_unique();
@@ -98,7 +98,7 @@ async fn no_extensions() {
 #[tokio::test]
 async fn fail_on_invalid_mint() {
     let context = TestContext::new().await;
-    let mut ctx = context.context.lock().await;
+    let ctx = context.context.lock().await;
     let rent = ctx.banks_client.get_rent().await.unwrap();
     let mint_account = Keypair::new();
 
@@ -161,7 +161,7 @@ async fn fail_on_invalid_mint() {
 #[tokio::test]
 async fn single_extension() {
     let context = TestContext::new().await;
-    let mut ctx = context.context.lock().await;
+    let ctx = context.context.lock().await;
     let rent = ctx.banks_client.get_rent().await.unwrap();
     let mint_account = Keypair::new();
     let mint_authority_pubkey = Pubkey::new_unique();
diff --git a/token/program-2022-test/tests/initialize_mint.rs b/token/program-2022-test/tests/initialize_mint.rs
index 70cd4649e3a..9152d2942aa 100644
--- a/token/program-2022-test/tests/initialize_mint.rs
+++ b/token/program-2022-test/tests/initialize_mint.rs
@@ -54,7 +54,7 @@ async fn success_base() {
 #[tokio::test]
 async fn fail_extension_no_space() {
     let context = TestContext::new().await;
-    let mut ctx = context.context.lock().await;
+    let ctx = context.context.lock().await;
     let rent = ctx.banks_client.get_rent().await.unwrap();
     let mint_account = Keypair::new();
     let mint_authority_pubkey = Pubkey::new_unique();
@@ -105,7 +105,7 @@ async fn fail_extension_no_space() {
 #[tokio::test]
 async fn fail_extension_after_mint_init() {
     let context = TestContext::new().await;
-    let mut ctx = context.context.lock().await;
+    let ctx = context.context.lock().await;
     let rent = ctx.banks_client.get_rent().await.unwrap();
     let mint_account = Keypair::new();
     let mint_authority_pubkey = Pubkey::new_unique();
@@ -191,7 +191,7 @@ async fn success_extension_and_base() {
 #[tokio::test]
 async fn fail_init_overallocated_mint() {
     let context = TestContext::new().await;
-    let mut ctx = context.context.lock().await;
+    let ctx = context.context.lock().await;
     let rent = ctx.banks_client.get_rent().await.unwrap();
     let mint_account = Keypair::new();
     let mint_authority_pubkey = Pubkey::new_unique();
@@ -238,7 +238,7 @@ async fn fail_init_overallocated_mint() {
 #[tokio::test]
 async fn fail_account_init_after_mint_extension() {
     let context = TestContext::new().await;
-    let mut ctx = context.context.lock().await;
+    let ctx = context.context.lock().await;
     let rent = ctx.banks_client.get_rent().await.unwrap();
     let mint_account = Keypair::new();
     let mint_authority_pubkey = Pubkey::new_unique();
@@ -310,7 +310,7 @@ async fn fail_account_init_after_mint_extension() {
 #[tokio::test]
 async fn fail_account_init_after_mint_init() {
     let context = TestContext::new().await;
-    let mut ctx = context.context.lock().await;
+    let ctx = context.context.lock().await;
     let rent = ctx.banks_client.get_rent().await.unwrap();
     let mint_account = Keypair::new();
     let mint_authority_pubkey = Pubkey::new_unique();
@@ -362,7 +362,7 @@ async fn fail_account_init_after_mint_init() {
 #[tokio::test]
 async fn fail_account_init_after_mint_init_with_extension() {
     let context = TestContext::new().await;
-    let mut ctx = context.context.lock().await;
+    let ctx = context.context.lock().await;
     let rent = ctx.banks_client.get_rent().await.unwrap();
     let mint_account = Keypair::new();
     let mint_authority_pubkey = Pubkey::new_unique();
@@ -422,7 +422,7 @@ async fn fail_account_init_after_mint_init_with_extension() {
 #[tokio::test]
 async fn fail_fee_init_after_mint_init() {
     let context = TestContext::new().await;
-    let mut ctx = context.context.lock().await;
+    let ctx = context.context.lock().await;
     let rent = ctx.banks_client.get_rent().await.unwrap();
     let mint_account = Keypair::new();
     let mint_authority_pubkey = Pubkey::new_unique();
@@ -492,7 +492,7 @@ async fn create_native_mint() {
 #[tokio::test]
 async fn fail_invalid_extensions_combination() {
     let context = TestContext::new().await;
-    let mut ctx = context.context.lock().await;
+    let ctx = context.context.lock().await;
     let rent = ctx.banks_client.get_rent().await.unwrap();
     let mint_account = Keypair::new();
     let mint_authority_pubkey = Pubkey::new_unique();
diff --git a/token/program-2022-test/tests/memo_transfer.rs b/token/program-2022-test/tests/memo_transfer.rs
index 29a1a7a5c98..b8585d8d236 100644
--- a/token/program-2022-test/tests/memo_transfer.rs
+++ b/token/program-2022-test/tests/memo_transfer.rs
@@ -95,7 +95,7 @@ async fn test_memo_transfers(
     // attempt to transfer from alice to bob with misplaced memo, v1 and current
     let mut memo_ix = spl_memo::build_memo(&[240, 159, 166, 150], &[]);
     for program_id in [spl_memo::id(), spl_memo::v1::id()] {
-        let mut ctx = context.lock().await;
+        let ctx = context.lock().await;
         memo_ix.program_id = program_id;
         #[allow(deprecated)]
         let instructions = vec![
@@ -145,7 +145,7 @@ async fn test_memo_transfers(
     assert_eq!(bob_state.base.amount, 10);
 
     // transfer with memo v1
-    let mut ctx = context.lock().await;
+    let ctx = context.lock().await;
     memo_ix.program_id = spl_memo::v1::id();
     #[allow(deprecated)]
     let instructions = vec![
diff --git a/token/program-2022-test/tests/reallocate.rs b/token/program-2022-test/tests/reallocate.rs
index 95e95ee5163..52b0a3290a6 100644
--- a/token/program-2022-test/tests/reallocate.rs
+++ b/token/program-2022-test/tests/reallocate.rs
@@ -227,7 +227,7 @@ async fn reallocate_updates_native_rent_exemption(
 
     // transfer more lamports
     if transfer_lamports > 0 {
-        let mut context = context.lock().await;
+        let context = context.lock().await;
         let instructions = vec![system_instruction::transfer(
             &context.payer.pubkey(),
             &alice_account,
@@ -268,7 +268,7 @@ async fn reallocate_updates_native_rent_exemption(
         ExtensionType::try_calculate_account_len::<Account>(extensions).unwrap()
     );
     let expected_rent_exempt_reserve = {
-        let mut context = context.lock().await;
+        let context = context.lock().await;
         let rent = context.banks_client.get_rent().await.unwrap();
         rent.minimum_balance(account.data.len())
     };
diff --git a/token/program-2022-test/tests/sync_native.rs b/token/program-2022-test/tests/sync_native.rs
index 59cd489cf13..ef5bc56eb2e 100644
--- a/token/program-2022-test/tests/sync_native.rs
+++ b/token/program-2022-test/tests/sync_native.rs
@@ -27,7 +27,7 @@ async fn run_basic(
     // system transfer to account
     let amount = 1_000;
     {
-        let mut context = context.lock().await;
+        let context = context.lock().await;
         let instructions = vec![system_instruction::transfer(
             &context.payer.pubkey(),
             &account,
diff --git a/token/program-2022-test/tests/token_group_update_authority.rs b/token/program-2022-test/tests/token_group_update_authority.rs
index a6f047b2c2a..99688fb3dd0 100644
--- a/token/program-2022-test/tests/token_group_update_authority.rs
+++ b/token/program-2022-test/tests/token_group_update_authority.rs
@@ -179,7 +179,7 @@ async fn fail_authority_checks() {
     );
 
     // no signature
-    let mut context = test_context.context.lock().await;
+    let context = test_context.context.lock().await;
     let mut instruction =
         update_group_authority(&program_id, &mint_pubkey, &authority.pubkey(), None);
     instruction.accounts[1].is_signer = false;
diff --git a/token/program-2022-test/tests/token_metadata_emit.rs b/token/program-2022-test/tests/token_metadata_emit.rs
index 9de6a5e37f8..42fdbd9b5b8 100644
--- a/token/program-2022-test/tests/token_metadata_emit.rs
+++ b/token/program-2022-test/tests/token_metadata_emit.rs
@@ -92,7 +92,7 @@ async fn success(start: Option<u64>, end: Option<u64>) {
         .await
         .unwrap();
 
-    let mut context = test_context.context.lock().await;
+    let context = test_context.context.lock().await;
 
     let transaction = Transaction::new_signed_with_payer(
         &[emit(
diff --git a/token/program-2022-test/tests/token_metadata_remove_key.rs b/token/program-2022-test/tests/token_metadata_remove_key.rs
index 112793c6c95..04354e3ae0e 100644
--- a/token/program-2022-test/tests/token_metadata_remove_key.rs
+++ b/token/program-2022-test/tests/token_metadata_remove_key.rs
@@ -230,7 +230,7 @@ async fn fail_authority_checks() {
     );
 
     // no signature
-    let mut context = test_context.context.lock().await;
+    let context = test_context.context.lock().await;
     let mut instruction = remove_key(
         &program_id,
         &mint_pubkey,
diff --git a/token/program-2022-test/tests/token_metadata_update_authority.rs b/token/program-2022-test/tests/token_metadata_update_authority.rs
index 1a22baf63ee..5efe8a7c3d7 100644
--- a/token/program-2022-test/tests/token_metadata_update_authority.rs
+++ b/token/program-2022-test/tests/token_metadata_update_authority.rs
@@ -201,7 +201,7 @@ async fn fail_authority_checks() {
     );
 
     // no signature
-    let mut context = test_context.context.lock().await;
+    let context = test_context.context.lock().await;
     let mut instruction = update_authority(
         &program_id,
         &mint_pubkey,
diff --git a/token/program-2022/tests/assert_instruction_count.rs b/token/program-2022/tests/assert_instruction_count.rs
index aae242c7ac1..c8fcf753af2 100644
--- a/token/program-2022/tests/assert_instruction_count.rs
+++ b/token/program-2022/tests/assert_instruction_count.rs
@@ -23,7 +23,7 @@ const TRANSFER_AMOUNT: u64 = 1_000_000_000_000_000;
 async fn initialize_mint() {
     let mut pt = ProgramTest::new("spl_token_2022", id(), processor!(Processor::process));
     pt.set_compute_max_units(5_000); // last known 1401
-    let (mut banks_client, payer, recent_blockhash) = pt.start().await;
+    let (banks_client, payer, recent_blockhash) = pt.start().await;
 
     let owner_key = Pubkey::new_unique();
     let mint = Keypair::new();
diff --git a/token/program/tests/assert_instruction_count.rs b/token/program/tests/assert_instruction_count.rs
index a6df337092c..009fb1edb28 100644
--- a/token/program/tests/assert_instruction_count.rs
+++ b/token/program/tests/assert_instruction_count.rs
@@ -23,7 +23,7 @@ const TRANSFER_AMOUNT: u64 = 1_000_000_000_000_000;
 async fn initialize_mint() {
     let mut pt = ProgramTest::new("spl_token", id(), processor!(Processor::process));
     pt.set_compute_max_units(5_000); // last known 2252
-    let (mut banks_client, payer, recent_blockhash) = pt.start().await;
+    let (banks_client, payer, recent_blockhash) = pt.start().await;
 
     let owner_key = Pubkey::new_unique();
     let mint = Keypair::new();
diff --git a/token/transfer-hook/example/tests/functional.rs b/token/transfer-hook/example/tests/functional.rs
index 0d64d1abf28..5e0aa098270 100644
--- a/token/transfer-hook/example/tests/functional.rs
+++ b/token/transfer-hook/example/tests/functional.rs
@@ -220,7 +220,7 @@ async fn success_execute() {
         AccountMeta::new(writable_pubkey, false),
     ];
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let rent = context.banks_client.get_rent().await.unwrap();
     let rent_lamports = rent
         .minimum_balance(ExtraAccountMetaList::size_of(init_extra_account_metas.len()).unwrap());
@@ -460,7 +460,7 @@ async fn fail_incorrect_derivation() {
     // wrong derivation
     let extra_account_metas = get_extra_account_metas_address(&program_id, &mint_address);
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let rent = context.banks_client.get_rent().await.unwrap();
     let rent_lamports = rent.minimum_balance(ExtraAccountMetaList::size_of(0).unwrap());
 
@@ -523,7 +523,7 @@ async fn fail_incorrect_mint() {
 
     let extra_account_metas = get_extra_account_metas_address(&mint_address, &program_id);
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let rent = context.banks_client.get_rent().await.unwrap();
     let rent_lamports = rent.minimum_balance(ExtraAccountMetaList::size_of(0).unwrap());
 
@@ -671,7 +671,7 @@ async fn success_on_chain_invoke() {
         AccountMeta::new(writable_pubkey, false),
     ];
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let rent = context.banks_client.get_rent().await.unwrap();
     let rent_lamports = rent
         .minimum_balance(ExtraAccountMetaList::size_of(init_extra_account_metas.len()).unwrap());
@@ -758,7 +758,7 @@ async fn fail_without_transferring_flag() {
     let extra_account_metas_address = get_extra_account_metas_address(&mint_address, &program_id);
     let extra_account_metas = [];
     let init_extra_account_metas = [];
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let rent = context.banks_client.get_rent().await.unwrap();
     let rent_lamports = rent
         .minimum_balance(ExtraAccountMetaList::size_of(init_extra_account_metas.len()).unwrap());
@@ -884,7 +884,7 @@ async fn success_on_chain_invoke_with_updated_extra_account_metas() {
         ExtraAccountMeta::new_with_pubkey(&writable_pubkey, false, true).unwrap(),
     ];
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let rent = context.banks_client.get_rent().await.unwrap();
     let rent_lamports = rent
         .minimum_balance(ExtraAccountMetaList::size_of(init_extra_account_metas.len()).unwrap());
@@ -1112,7 +1112,7 @@ async fn success_execute_with_updated_extra_account_metas() {
         AccountMeta::new(writable_pubkey, false),
     ];
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let rent = context.banks_client.get_rent().await.unwrap();
     let rent_lamports = rent
         .minimum_balance(ExtraAccountMetaList::size_of(init_extra_account_metas.len()).unwrap());

From f23917a83ad8212b95acf1dcb46657c5965c9d9b Mon Sep 17 00:00:00 2001
From: Jon C <me@jonc.dev>
Date: Wed, 30 Oct 2024 11:05:52 +0100
Subject: [PATCH 3/7] Add workspace lints, start fixing doc comments

---
 Cargo.toml                                    |  7 +++++
 binary-option/program/Cargo.toml              |  3 ++
 binary-oracle-pair/program/Cargo.toml         |  3 ++
 examples/rust/custom-heap/Cargo.toml          |  3 ++
 feature-proposal/program/Cargo.toml           |  3 ++
 governance/addin-mock/program/Cargo.toml      |  3 ++
 governance/chat/program/Cargo.toml            |  3 ++
 governance/program/Cargo.toml                 |  3 ++
 libraries/program-error/derive/src/lib.rs     |  4 +--
 memo/program/src/lib.rs                       |  2 +-
 record/program/Cargo.toml                     |  3 ++
 single-pool/program/Cargo.toml                |  3 ++
 stake-pool/program/Cargo.toml                 |  3 ++
 stake-pool/program/src/state.rs               |  1 -
 stateless-asks/program/Cargo.toml             |  3 ++
 token-group/interface/src/instruction.rs      |  5 ----
 .../flash_loan_receiver/src/processor.rs      |  2 +-
 token-lending/program/Cargo.toml              |  3 ++
 token-lending/program/src/instruction.rs      | 29 +++++++++----------
 token-wrap/program/Cargo.toml                 |  3 ++
 .../elgamal-registry/Cargo.toml               |  3 ++
 .../proof-generation/Cargo.toml               |  3 ++
 token/program-2022/Cargo.toml                 |  3 ++
 token/program/Cargo.toml                      |  3 ++
 24 files changed, 76 insertions(+), 25 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1e8fb54a826..e5db1081db4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -87,6 +87,13 @@ exclude = [
 
 resolver = "2"
 
+[workspace.lints.rust.unexpected_cfgs]
+level = "warn"
+check-cfg = [
+    'cfg(target_os, values("solana"))',
+    'cfg(feature, values("frozen-abi", "no-entrypoint"))',
+]
+
 [workspace.metadata.release]
 pre-release-commit-message = "Publish {{crate_name}} v{{version}}"
 tag-message = "Publish {{crate_name}} v{{version}}"
diff --git a/binary-option/program/Cargo.toml b/binary-option/program/Cargo.toml
index 20f336f7291..5f0469d1486 100644
--- a/binary-option/program/Cargo.toml
+++ b/binary-option/program/Cargo.toml
@@ -20,3 +20,6 @@ uint = "0.10"
 
 [lib]
 crate-type = ["cdylib", "lib"]
+
+[lints]
+workspace = true
diff --git a/binary-oracle-pair/program/Cargo.toml b/binary-oracle-pair/program/Cargo.toml
index 31cfe7b8b33..3e1f23b1451 100644
--- a/binary-oracle-pair/program/Cargo.toml
+++ b/binary-oracle-pair/program/Cargo.toml
@@ -27,3 +27,6 @@ solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
+
+[lints]
+workspace = true
diff --git a/examples/rust/custom-heap/Cargo.toml b/examples/rust/custom-heap/Cargo.toml
index 276ac0d9348..93eaca3022e 100644
--- a/examples/rust/custom-heap/Cargo.toml
+++ b/examples/rust/custom-heap/Cargo.toml
@@ -26,3 +26,6 @@ crate-type = ["cdylib", "lib"]
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
+
+[lints]
+workspace = true
diff --git a/feature-proposal/program/Cargo.toml b/feature-proposal/program/Cargo.toml
index e7bccc3eaae..8674db7f34a 100644
--- a/feature-proposal/program/Cargo.toml
+++ b/feature-proposal/program/Cargo.toml
@@ -27,3 +27,6 @@ crate-type = ["cdylib", "lib"]
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
+
+[lints]
+workspace = true
diff --git a/governance/addin-mock/program/Cargo.toml b/governance/addin-mock/program/Cargo.toml
index 4fd5e41780b..ee3b020bd17 100644
--- a/governance/addin-mock/program/Cargo.toml
+++ b/governance/addin-mock/program/Cargo.toml
@@ -38,3 +38,6 @@ spl-governance-test-sdk = { version = "0.1.4", path = "../../test-sdk" }
 
 [lib]
 crate-type = ["cdylib", "lib"]
+
+[lints]
+workspace = true
diff --git a/governance/chat/program/Cargo.toml b/governance/chat/program/Cargo.toml
index f0e962bca8e..6dc6ca44e4a 100644
--- a/governance/chat/program/Cargo.toml
+++ b/governance/chat/program/Cargo.toml
@@ -42,3 +42,6 @@ spl-governance-addin-mock = { version = "0.1.4", path = "../../addin-mock/progra
 
 [lib]
 crate-type = ["cdylib", "lib"]
+
+[lints]
+workspace = true
diff --git a/governance/program/Cargo.toml b/governance/program/Cargo.toml
index 88aff814725..808d7562267 100644
--- a/governance/program/Cargo.toml
+++ b/governance/program/Cargo.toml
@@ -39,3 +39,6 @@ spl-governance-addin-mock = { version = "0.1.4", path = "../addin-mock/program"
 
 [lib]
 crate-type = ["cdylib", "lib"]
+
+[lints]
+workspace = true
diff --git a/libraries/program-error/derive/src/lib.rs b/libraries/program-error/derive/src/lib.rs
index 2681e85be4e..026b0eb7d0f 100644
--- a/libraries/program-error/derive/src/lib.rs
+++ b/libraries/program-error/derive/src/lib.rs
@@ -68,9 +68,9 @@ pub fn print_program_error(input: TokenStream) -> TokenStream {
 /// a unique `u32` _starting_ error codes from the names of the enum variants.
 /// Notes:
 /// - The _error_ variant will start at this value, and the rest will be
-/// incremented by one
+///   incremented by one
 /// - The value provided is only for code readability, the actual error code
-/// will be a hash of the input string and is checked against your input
+///   will be a hash of the input string and is checked against your input
 ///
 /// Syntax: `#[spl_program_error(hash_error_code_start = 1275525928)]`
 /// Hash Input: `spl_program_error:<enum name>:<variant name>`
diff --git a/memo/program/src/lib.rs b/memo/program/src/lib.rs
index fa792b8bb81..b92e480a811 100644
--- a/memo/program/src/lib.rs
+++ b/memo/program/src/lib.rs
@@ -27,7 +27,7 @@ solana_program::declare_id!("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr");
 /// Accounts expected by this instruction:
 ///
 ///   0. ..0+N. `[signer]` Expected signers; if zero provided, instruction will
-///     be processed as a normal, unsigned spl-memo
+///      be processed as a normal, unsigned spl-memo
 pub fn build_memo(memo: &[u8], signer_pubkeys: &[&Pubkey]) -> Instruction {
     Instruction {
         program_id: id(),
diff --git a/record/program/Cargo.toml b/record/program/Cargo.toml
index ba5d1e41ed1..395d8abaffb 100644
--- a/record/program/Cargo.toml
+++ b/record/program/Cargo.toml
@@ -28,3 +28,6 @@ crate-type = ["cdylib", "lib"]
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
+
+[lints]
+workspace = true
diff --git a/single-pool/program/Cargo.toml b/single-pool/program/Cargo.toml
index 73bb6175c4b..b4ddc82daff 100644
--- a/single-pool/program/Cargo.toml
+++ b/single-pool/program/Cargo.toml
@@ -39,3 +39,6 @@ approx = "0.5.1"
 
 [lib]
 crate-type = ["cdylib", "lib"]
+
+[lints]
+workspace = true
diff --git a/stake-pool/program/Cargo.toml b/stake-pool/program/Cargo.toml
index 3578e7cba4f..ad4c5c35550 100644
--- a/stake-pool/program/Cargo.toml
+++ b/stake-pool/program/Cargo.toml
@@ -47,3 +47,6 @@ test-case = "3.3"
 
 [lib]
 crate-type = ["cdylib", "lib"]
+
+[lints]
+workspace = true
diff --git a/stake-pool/program/src/state.rs b/stake-pool/program/src/state.rs
index a10a2652915..831c18779ef 100644
--- a/stake-pool/program/src/state.rs
+++ b/stake-pool/program/src/state.rs
@@ -765,7 +765,6 @@ impl Sealed for ValidatorStakeInfo {}
 impl Pack for ValidatorStakeInfo {
     const LEN: usize = 73;
     fn pack_into_slice(&self, data: &mut [u8]) {
-        let data = data;
         // Removing this unwrap would require changing from `Pack` to some other
         // trait or `bytemuck`, so it stays in for now
         borsh::to_writer(data, self).unwrap();
diff --git a/stateless-asks/program/Cargo.toml b/stateless-asks/program/Cargo.toml
index 68fb97d2164..582426cd3ed 100644
--- a/stateless-asks/program/Cargo.toml
+++ b/stateless-asks/program/Cargo.toml
@@ -28,3 +28,6 @@ crate-type = ["cdylib", "lib"]
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
+
+[lints]
+workspace = true
diff --git a/token-group/interface/src/instruction.rs b/token-group/interface/src/instruction.rs
index 2ba4306683b..3a7b927e3d0 100644
--- a/token-group/interface/src/instruction.rs
+++ b/token-group/interface/src/instruction.rs
@@ -245,11 +245,6 @@ pub fn initialize_member(
 mod test {
     use {super::*, crate::NAMESPACE, solana_program::hash};
 
-    #[repr(C)]
-    #[derive(Clone, Copy, Debug, Default, PartialEq, Pod, Zeroable, SplDiscriminate)]
-    #[discriminator_hash_input("mock_group")]
-    struct MockGroup;
-
     fn instruction_pack_unpack<I>(instruction: TokenGroupInstruction, discriminator: &[u8], data: I)
     where
         I: core::fmt::Debug + PartialEq + Pod + Zeroable + SplDiscriminate,
diff --git a/token-lending/flash_loan_receiver/src/processor.rs b/token-lending/flash_loan_receiver/src/processor.rs
index 0f145dc28d9..f9f9c350fbd 100644
--- a/token-lending/flash_loan_receiver/src/processor.rs
+++ b/token-lending/flash_loan_receiver/src/processor.rs
@@ -61,7 +61,7 @@ fn unpack_amount(input: &[u8]) -> Result<u64, ProgramError> {
         .and_then(|slice| slice.try_into().ok())
         .map(u64::from_le_bytes)
         .ok_or(ProgramError::InvalidInstructionData)
-        .inspect_err(|e| {
+        .inspect_err(|_| {
             msg!("Failed to unpack amount.");
         })?;
     Ok(amount)
diff --git a/token-lending/program/Cargo.toml b/token-lending/program/Cargo.toml
index 9a4eb04f8b6..9c65cb886be 100644
--- a/token-lending/program/Cargo.toml
+++ b/token-lending/program/Cargo.toml
@@ -29,3 +29,6 @@ solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]
+
+[lints]
+workspace = true
diff --git a/token-lending/program/src/instruction.rs b/token-lending/program/src/instruction.rs
index 5455ef92b7e..80de917043f 100644
--- a/token-lending/program/src/instruction.rs
+++ b/token-lending/program/src/instruction.rs
@@ -67,13 +67,13 @@ pub enum LendingInstruction {
     ///   8. `[]` Pyth product account.
     ///   9. `[]` Pyth price account. This will be used as the reserve liquidity
     ///      oracle account.
-    ///   10 `[]` Lending market account.
-    ///   11 `[]` Derived lending market authority.
-    ///   12 `[signer]` Lending market owner.
-    ///   13 `[signer]` User transfer authority ($authority).
-    ///   14 `[]` Clock sysvar.
-    ///   15 `[]` Rent sysvar.
-    ///   16 `[]` Token program id.
+    ///   10. `[]` Lending market account.
+    ///   11. `[]` Derived lending market authority.
+    ///   12. `[signer]` Lending market owner.
+    ///   13. `[signer]` User transfer authority ($authority).
+    ///   14. `[]` Clock sysvar.
+    ///   15. `[]` Rent sysvar.
+    ///   16. `[]` Token program id.
     InitReserve {
         /// Initial amount of liquidity to deposit into the new reserve
         liquidity_amount: u64,
@@ -158,9 +158,8 @@ pub enum LendingInstruction {
     ///
     ///   0. `[writable]` Obligation account.
     ///   1. `[]` Clock sysvar.
-    ///   .. `[]` Collateral deposit reserve accounts - refreshed, all, in
-    /// order.   .. `[]` Liquidity borrow reserve accounts - refreshed, all,
-    /// in order.
+    /// .. `[]` Collateral deposit reserve accounts - refreshed, all, in order.
+    /// .. `[]` Liquidity borrow reserve accounts - refreshed, all, in order.
     RefreshObligation,
 
     // 8
@@ -227,7 +226,7 @@ pub enum LendingInstruction {
     ///   7. `[signer]` Obligation owner.
     ///   8. `[]` Clock sysvar.
     ///   9. `[]` Token program id.
-    ///   10 `[optional, writable]` Host fee receiver account.
+    ///   10. `[optional, writable]` Host fee receiver account.
     BorrowObligationLiquidity {
         /// Amount of liquidity to borrow - u64::MAX for 100% of borrowing power
         liquidity_amount: u64,
@@ -276,8 +275,8 @@ pub enum LendingInstruction {
     ///   7. `[]` Lending market account.
     ///   8. `[]` Derived lending market authority.
     ///   9. `[signer]` User transfer authority ($authority).
-    ///   10 `[]` Clock sysvar.
-    ///   11 `[]` Token program id.
+    ///   10. `[]` Clock sysvar.
+    ///   11. `[]` Token program id.
     LiquidateObligation {
         /// Amount of liquidity to repay - u64::MAX for up to 100% of borrowed
         /// amount
@@ -303,7 +302,7 @@ pub enum LendingInstruction {
     ///   8. `[]` Flash loan receiver program id. Must implement an instruction
     ///      that has tag of 0 and a signature of `(amount: u64)` This
     ///      instruction must return the amount to the source liquidity account.
-    ///   .. `[any]` Additional accounts expected by the receiving program's
+    /// .. `[any]` Additional accounts expected by the receiving program's
     /// `ReceiveFlashLoan` instruction.
     ///
     ///   The flash loan receiver program that is to be invoked should contain
@@ -323,7 +322,7 @@ pub enum LendingInstruction {
     /// `FlashLoan` instruction above.   ReceiveFlashLoan {
     ///       // Amount that must be repaid by the receiver program
     ///       amount: u64
-    ///   }
+    ///  }
     FlashLoan {
         /// The amount that is to be borrowed - u64::MAX for up to 100% of
         /// available liquidity
diff --git a/token-wrap/program/Cargo.toml b/token-wrap/program/Cargo.toml
index e33a9fd7ced..80020c42d48 100644
--- a/token-wrap/program/Cargo.toml
+++ b/token-wrap/program/Cargo.toml
@@ -25,3 +25,6 @@ crate-type = ["cdylib", "lib"]
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
+
+[lints]
+workspace = true
diff --git a/token/confidential-transfer/elgamal-registry/Cargo.toml b/token/confidential-transfer/elgamal-registry/Cargo.toml
index 52bd2ac9c7d..49c76f1079d 100644
--- a/token/confidential-transfer/elgamal-registry/Cargo.toml
+++ b/token/confidential-transfer/elgamal-registry/Cargo.toml
@@ -23,3 +23,6 @@ crate-type = ["cdylib", "lib"]
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
+
+[lints]
+workspace = true
diff --git a/token/confidential-transfer/proof-generation/Cargo.toml b/token/confidential-transfer/proof-generation/Cargo.toml
index 9028085dfb7..a14d9c17a54 100644
--- a/token/confidential-transfer/proof-generation/Cargo.toml
+++ b/token/confidential-transfer/proof-generation/Cargo.toml
@@ -16,3 +16,6 @@ thiserror = "1.0.65"
 
 [lib]
 crate-type = ["cdylib", "lib"]
+
+[lints]
+workspace = true
diff --git a/token/program-2022/Cargo.toml b/token/program-2022/Cargo.toml
index 0f1db6fb28f..5461a95cf05 100644
--- a/token/program-2022/Cargo.toml
+++ b/token/program-2022/Cargo.toml
@@ -57,3 +57,6 @@ crate-type = ["cdylib", "lib"]
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
+
+[lints]
+workspace = true
diff --git a/token/program/Cargo.toml b/token/program/Cargo.toml
index 120db36bfc7..3b363fb5b43 100644
--- a/token/program/Cargo.toml
+++ b/token/program/Cargo.toml
@@ -33,3 +33,6 @@ crate-type = ["cdylib", "lib"]
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
+
+[lints]
+workspace = true

From 4b190a16a6a90d89184dffc389fc5e1f4f0053d9 Mon Sep 17 00:00:00 2001
From: Jon C <me@jonc.dev>
Date: Wed, 30 Oct 2024 11:31:07 +0100
Subject: [PATCH 4/7] Update doc comments for clippy

---
 governance/program/src/lib.rs                 |  1 +
 libraries/type-length-value/src/state.rs      |  3 +-
 stake-pool/program/src/instruction.rs         | 28 +++++++----
 token-lending/program/src/instruction.rs      | 18 +++----
 .../tests/helpers/flash_loan_receiver.rs      |  4 +-
 token-metadata/interface/src/instruction.rs   |  5 +-
 token-swap/program/src/curve/offset.rs        |  2 +
 token-swap/program/src/instruction.rs         |  4 +-
 token-wrap/program/src/instruction.rs         |  8 ++--
 .../confidential_transfer/instruction.rs      | 48 +++++++++++--------
 .../confidential_transfer_fee/instruction.rs  |  4 +-
 .../src/extension/transfer_fee/instruction.rs |  2 +-
 .../interface/src/instruction.rs              |  4 +-
 13 files changed, 73 insertions(+), 58 deletions(-)

diff --git a/governance/program/src/lib.rs b/governance/program/src/lib.rs
index 7fd08c7b074..91c6ee6bef6 100644
--- a/governance/program/src/lib.rs
+++ b/governance/program/src/lib.rs
@@ -1,4 +1,5 @@
 #![allow(clippy::arithmetic_side_effects)]
+#![allow(clippy::doc_lazy_continuation)]
 #![deny(missing_docs)]
 //! A Governance program for the Solana blockchain.
 
diff --git a/libraries/type-length-value/src/state.rs b/libraries/type-length-value/src/state.rs
index 8ca7c20a060..ac7a60054ad 100644
--- a/libraries/type-length-value/src/state.rs
+++ b/libraries/type-length-value/src/state.rs
@@ -375,8 +375,7 @@ impl<'data> TlvStateMut<'data> {
 
     /// Packs the default TLV data into the first open slot in the data buffer.
     /// Handles repetition based on the boolean arg provided:
-    /// * `true`:   If extension is already found in the buffer,
-    /// it returns an error.
+    /// * `true`:   If extension is already found in the buffer, it returns an error.
     /// * `false`:  Will add a new entry to the next open slot.
     pub fn init_value<V: SplDiscriminate + Pod + Default>(
         &mut self,
diff --git a/stake-pool/program/src/instruction.rs b/stake-pool/program/src/instruction.rs
index 9709bef0fe3..6d454e528c3 100644
--- a/stake-pool/program/src/instruction.rs
+++ b/stake-pool/program/src/instruction.rs
@@ -192,11 +192,14 @@ pub enum StakePoolInstruction {
     /// 11. `[]` Stake Config sysvar
     /// 12. `[]` System program
     /// 13. `[]` Stake program
-    ///  userdata: amount of lamports to increase on the given validator.
-    ///  The actual amount split into the transient stake account is:
-    ///  `lamports + stake_rent_exemption`
-    ///  The rent-exemption of the stake account is withdrawn back to the
-    /// reserve  after it is merged.
+    ///
+    /// userdata: amount of lamports to increase on the given validator.
+    ///
+    /// The actual amount split into the transient stake account is:
+    /// `lamports + stake_rent_exemption`.
+    ///
+    /// The rent-exemption of the stake account is withdrawn back to the
+    /// reserve after it is merged.
     IncreaseValidatorStake {
         /// amount of lamports to increase on the given validator
         lamports: u64,
@@ -329,6 +332,7 @@ pub enum StakePoolInstruction {
     ///  10. `[]` Sysvar clock account (required)
     ///  11. `[]` Pool token program id
     ///  12. `[]` Stake program id,
+    ///
     ///  userdata: amount of pool tokens to withdraw
     WithdrawStake(u64),
 
@@ -463,11 +467,14 @@ pub enum StakePoolInstruction {
     /// 11. `[]` Stake Config sysvar
     /// 12. `[]` System program
     /// 13. `[]` Stake program
-    ///  userdata: amount of lamports to increase on the given validator.
-    ///  The actual amount split into the transient stake account is:
-    ///  `lamports + stake_rent_exemption`
-    ///  The rent-exemption of the stake account is withdrawn back to the
-    /// reserve  after it is merged.
+    ///
+    /// userdata: amount of lamports to increase on the given validator.
+    ///
+    /// The actual amount split into the transient stake account is:
+    /// `lamports + stake_rent_exemption`.
+    ///
+    /// The rent-exemption of the stake account is withdrawn back to the
+    /// reserve after it is merged.
     IncreaseAdditionalValidatorStake {
         /// amount of lamports to increase on the given validator
         lamports: u64,
@@ -674,6 +681,7 @@ pub enum StakePoolInstruction {
     ///  10. `[]` Sysvar clock account (required)
     ///  11. `[]` Pool token program id
     ///  12. `[]` Stake program id,
+    ///
     ///  userdata: amount of pool tokens to withdraw
     WithdrawStakeWithSlippage {
         /// Pool tokens to burn in exchange for lamports
diff --git a/token-lending/program/src/instruction.rs b/token-lending/program/src/instruction.rs
index 80de917043f..8546565b7a4 100644
--- a/token-lending/program/src/instruction.rs
+++ b/token-lending/program/src/instruction.rs
@@ -158,8 +158,8 @@ pub enum LendingInstruction {
     ///
     ///   0. `[writable]` Obligation account.
     ///   1. `[]` Clock sysvar.
-    /// .. `[]` Collateral deposit reserve accounts - refreshed, all, in order.
-    /// .. `[]` Liquidity borrow reserve accounts - refreshed, all, in order.
+    ///   2. .. `[]` Collateral deposit reserve accounts - refreshed, all, in order.
+    ///   3. .. `[]` Liquidity borrow reserve accounts - refreshed, all, in order.
     RefreshObligation,
 
     // 8
@@ -302,8 +302,8 @@ pub enum LendingInstruction {
     ///   8. `[]` Flash loan receiver program id. Must implement an instruction
     ///      that has tag of 0 and a signature of `(amount: u64)` This
     ///      instruction must return the amount to the source liquidity account.
-    /// .. `[any]` Additional accounts expected by the receiving program's
-    /// `ReceiveFlashLoan` instruction.
+    ///   9. .. `[any]` Additional accounts expected by the receiving program's
+    ///      `ReceiveFlashLoan` instruction.
     ///
     ///   The flash loan receiver program that is to be invoked should contain
     /// an instruction with   tag `0` and accept the total amount (including
@@ -318,11 +318,11 @@ pub enum LendingInstruction {
     ///   1. `[writable]` Destination liquidity (matching the source from
     ///      above).
     ///   2. `[]` Token program id
-    ///   .. `[any]` Additional accounts provided to the lending program's
-    /// `FlashLoan` instruction above.   ReceiveFlashLoan {
-    ///       // Amount that must be repaid by the receiver program
-    ///       amount: u64
-    ///  }
+    ///   3. .. `[any]` Additional accounts provided to the lending program's
+    ///      `FlashLoan` instruction above.   ReceiveFlashLoan {
+    ///          // Amount that must be repaid by the receiver program
+    ///          amount: u64
+    ///      }
     FlashLoan {
         /// The amount that is to be borrowed - u64::MAX for up to 100% of
         /// available liquidity
diff --git a/token-lending/program/tests/helpers/flash_loan_receiver.rs b/token-lending/program/tests/helpers/flash_loan_receiver.rs
index 2c8e50952a6..6d258d8213e 100644
--- a/token-lending/program/tests/helpers/flash_loan_receiver.rs
+++ b/token-lending/program/tests/helpers/flash_loan_receiver.rs
@@ -23,8 +23,8 @@ pub enum FlashLoanReceiverInstruction {
     ///   1. `[writable]` Destination liquidity (matching the source from
     ///      above).
     ///   2. `[]` Token program id
-    ///   .. `[any]` Additional accounts provided to the lending program's
-    /// `FlashLoan` instruction above.
+    ///   3. ..`[any]` Additional accounts provided to the lending program's
+    ///      `FlashLoan` instruction above.
     ReceiveFlashLoan {
         /// The amount that is loaned
         amount: u64,
diff --git a/token-metadata/interface/src/instruction.rs b/token-metadata/interface/src/instruction.rs
index bcb606b3a8b..cfc6e62a3ac 100644
--- a/token-metadata/interface/src/instruction.rs
+++ b/token-metadata/interface/src/instruction.rs
@@ -104,10 +104,9 @@ pub enum TokenMetadataInstruction {
     /// By the end of the instruction, the metadata account must be properly
     /// resized based on the new size of the TLV entry.
     ///   * If the new size is larger, the program must first reallocate to
-    ///     avoid
-    ///   overwriting other TLV entries.
+    ///     avoid overwriting other TLV entries.
     ///   * If the new size is smaller, the program must reallocate at the end
-    ///   so that it's possible to iterate over TLV entries
+    ///     so that it's possible to iterate over TLV entries
     ///
     /// Accounts expected by this instruction:
     ///
diff --git a/token-swap/program/src/curve/offset.rs b/token-swap/program/src/curve/offset.rs
index c1d3f499877..8d5937536d0 100644
--- a/token-swap/program/src/curve/offset.rs
+++ b/token-swap/program/src/curve/offset.rs
@@ -33,9 +33,11 @@ pub struct OffsetCurve {
 impl CurveCalculator for OffsetCurve {
     /// Constant product swap ensures token a * (token b + offset) = constant
     /// This is guaranteed to work for all values such that:
+    ///
     ///  - 1 <= source_amount <= u64::MAX
     ///  - 1 <= (swap_source_amount * (swap_destination_amount +
     ///    token_b_offset)) <= u128::MAX
+    ///
     /// If the offset and token B are both close to u64::MAX, there can be
     /// overflow errors with the invariant.
     fn swap_without_fees(
diff --git a/token-swap/program/src/instruction.rs b/token-swap/program/src/instruction.rs
index b81b57ec8be..cc84c77af65 100644
--- a/token-swap/program/src/instruction.rs
+++ b/token-swap/program/src/instruction.rs
@@ -108,9 +108,9 @@ pub enum SwapInstruction {
     ///   4. `[writable]` Pool Token Mint. Must be empty, owned by swap
     ///      authority.
     ///   5. `[]` Pool Token Account to deposit trading and withdraw fees.
-    ///   Must be empty, not owned by swap authority
+    ///      Must be empty, not owned by swap authority
     ///   6. `[writable]` Pool Token Account to deposit the initial pool token
-    ///   supply.  Must be empty, not owned by swap authority.
+    ///      supply. Must be empty, not owned by swap authority.
     ///   7. `[]` Pool Token program id
     Initialize(Initialize),
 
diff --git a/token-wrap/program/src/instruction.rs b/token-wrap/program/src/instruction.rs
index fc5975c9dd5..bca604a95e6 100644
--- a/token-wrap/program/src/instruction.rs
+++ b/token-wrap/program/src/instruction.rs
@@ -45,8 +45,8 @@ pub enum TokenWrapInstruction {
     /// 6. `[]` SPL Token program for unwrapped mint
     /// 7. `[]` SPL Token program for wrapped mint
     /// 8. `[signer]` Transfer authority on unwrapped token account
-    /// 8..8+M. `[signer]` (Optional) M multisig signers on unwrapped token
-    /// account
+    /// 9. ..8+M. `[signer]` (Optional) M multisig signers on unwrapped token
+    ///    account
     ///
     /// Data expected by this instruction:
     ///   * little-endian u64 representing the amount to wrap
@@ -72,8 +72,8 @@ pub enum TokenWrapInstruction {
     /// 6. `[]` SPL Token program for wrapped mint
     /// 7. `[]` SPL Token program for unwrapped mint
     /// 8. `[signer]` Transfer authority on wrapped token account
-    /// 8..8+M. `[signer]` (Optional) M multisig signers on wrapped token
-    /// account
+    /// 9. ..8+M. `[signer]` (Optional) M multisig signers on wrapped token
+    ///    account
     ///
     /// Data expected by this instruction:
     ///   * little-endian u64 representing the amount to unwrap
diff --git a/token/program-2022/src/extension/confidential_transfer/instruction.rs b/token/program-2022/src/extension/confidential_transfer/instruction.rs
index e82f4f521af..e1b591ac058 100644
--- a/token/program-2022/src/extension/confidential_transfer/instruction.rs
+++ b/token/program-2022/src/extension/confidential_transfer/instruction.rs
@@ -102,8 +102,8 @@ pub enum ConfidentialTransferInstruction {
     ///   3. `[]` (Optional) Record account if the accompanying proof is to be
     ///      read from a record account.
     ///   4. `[]` The multisig source account owner.
-    ///   5.. `[signer]` Required M signer accounts for the SPL Token Multisig
-    /// account.
+    ///   5. .. `[signer]` Required M signer accounts for the SPL Token Multisig
+    ///      account.
     ///
     /// Data expected by this instruction:
     ///   `ConfigureAccountInstructionData`
@@ -166,8 +166,8 @@ pub enum ConfidentialTransferInstruction {
     ///   2. `[]` (Optional) Record account if the accompanying proof is to be
     ///      read from a record account.
     ///   3. `[]` The multisig account owner.
-    ///   4.. `[signer]` Required M signer accounts for the SPL Token Multisig
-    /// account.
+    ///   4. .. `[signer]` Required M signer accounts for the SPL Token Multisig
+    ///      account.
     ///
     /// Data expected by this instruction:
     ///   `EmptyAccountInstructionData`
@@ -194,8 +194,8 @@ pub enum ConfidentialTransferInstruction {
     ///   0. `[writable]` The SPL Token account.
     ///   1. `[]` The token mint.
     ///   2. `[]` The multisig account owner or delegate.
-    ///   3.. `[signer]` Required M signer accounts for the SPL Token Multisig
-    /// account.
+    ///   3. .. `[signer]` Required M signer accounts for the SPL Token Multisig
+    ///      account.
     ///
     /// Data expected by this instruction:
     ///   `DepositInstructionData`
@@ -207,8 +207,10 @@ pub enum ConfidentialTransferInstruction {
     /// In order for this instruction to be successfully processed, it must be
     /// accompanied by the following list of `zk_elgamal_proof` program
     /// instructions:
+    ///
     /// - `VerifyCiphertextCommitmentEquality`
     /// - `VerifyBatchedRangeProofU64`
+    ///
     /// These instructions can be accompanied in the same transaction or can be
     /// pre-verified into a context state account, in which case, only their
     /// context state account address need to be provided.
@@ -241,8 +243,8 @@ pub enum ConfidentialTransferInstruction {
     ///   4. `[]` (Optional) Range proof record account or context state
     ///      account.
     ///   5. `[]` The multisig  source account owner.
-    ///   6.. `[signer]` Required M signer accounts for the SPL Token Multisig
-    /// account.
+    ///   6. .. `[signer]` Required M signer accounts for the SPL Token Multisig
+    ///      account.
     ///
     /// Data expected by this instruction:
     ///   `WithdrawInstructionData`
@@ -253,9 +255,11 @@ pub enum ConfidentialTransferInstruction {
     /// In order for this instruction to be successfully processed, it must be
     /// accompanied by the following list of `zk_elgamal_proof` program
     /// instructions:
+    ///
     /// - `VerifyCiphertextCommitmentEquality`
     /// - `VerifyBatchedGroupedCiphertext3HandlesValidity`
     /// - `VerifyBatchedRangeProofU128`
+    ///
     /// These instructions can be accompanied in the same transaction or can be
     /// pre-verified into a context state account, in which case, only their
     /// context state account addresses need to be provided.
@@ -291,8 +295,8 @@ pub enum ConfidentialTransferInstruction {
     ///   7. `[]` (Optional) Range proof record account or context state
     ///      account.
     ///   8. `[]` The multisig  source account owner.
-    ///   9.. `[signer]` Required M signer accounts for the SPL Token Multisig
-    /// account.
+    ///   9. .. `[signer]` Required M signer accounts for the SPL Token Multisig
+    ///      account.
     ///
     /// Data expected by this instruction:
     ///   `TransferInstructionData`
@@ -319,8 +323,8 @@ pub enum ConfidentialTransferInstruction {
     ///   * Multisignature owner/delegate
     ///   0. `[writable]` The SPL Token account.
     ///   1. `[]` The multisig account owner.
-    ///   2.. `[signer]` Required M signer accounts for the SPL Token Multisig
-    /// account.
+    ///   2. .. `[signer]` Required M signer accounts for the SPL Token Multisig
+    ///      account.
     ///
     /// Data expected by this instruction:
     ///   `ApplyPendingBalanceData`
@@ -338,8 +342,8 @@ pub enum ConfidentialTransferInstruction {
     ///   * Multisignature owner/delegate
     ///   0. `[writable]` The SPL Token account.
     ///   1. `[]` Multisig authority.
-    ///   2.. `[signer]` Required M signer accounts for the SPL Token Multisig
-    /// account.
+    ///   2. .. `[signer]` Required M signer accounts for the SPL Token Multisig
+    ///      account.
     ///
     /// Data expected by this instruction:
     ///   None
@@ -363,8 +367,8 @@ pub enum ConfidentialTransferInstruction {
     ///   * Multisignature owner/delegate
     ///   0. `[writable]` The SPL Token account.
     ///   1. `[]` The multisig account owner.
-    ///   2.. `[signer]` Required M signer accounts for the SPL Token Multisig
-    /// account.
+    ///   2. .. `[signer]` Required M signer accounts for the SPL Token Multisig
+    ///      account.
     ///
     /// Data expected by this instruction:
     ///   None
@@ -382,8 +386,8 @@ pub enum ConfidentialTransferInstruction {
     ///   * Multisignature owner/delegate
     ///   0. `[writable]` The SPL Token account.
     ///   1. `[]` The multisig account owner.
-    ///   2.. `[signer]` Required M signer accounts for the SPL Token Multisig
-    /// account.
+    ///   2. .. `[signer]` Required M signer accounts for the SPL Token Multisig
+    ///      account.
     ///
     /// Data expected by this instruction:
     ///   None
@@ -404,8 +408,8 @@ pub enum ConfidentialTransferInstruction {
     ///   * Multisignature owner/delegate
     ///   0. `[writable]` The SPL Token account.
     ///   1. `[]` The multisig account owner.
-    ///   2.. `[signer]` Required M signer accounts for the SPL Token Multisig
-    /// account.
+    ///   2. .. `[signer]` Required M signer accounts for the SPL Token Multisig
+    ///      account.
     ///
     /// Data expected by this instruction:
     ///   None
@@ -416,12 +420,14 @@ pub enum ConfidentialTransferInstruction {
     /// In order for this instruction to be successfully processed, it must be
     /// accompanied by the following list of `zk_elgamal_proof` program
     /// instructions:
+    ///
     /// - `VerifyCiphertextCommitmentEquality`
     /// - `VerifyBatchedGroupedCiphertext3HandlesValidity` (transfer amount
     ///   ciphertext)
     /// - `VerifyPercentageWithFee`
     /// - `VerifyBatchedGroupedCiphertext2HandlesValidity` (fee ciphertext)
     /// - `VerifyBatchedRangeProofU256`
+    ///
     /// These instructions can be accompanied in the same transaction or can be
     /// pre-verified into a context state account, in which case, only their
     /// context state account addresses need to be provided.
@@ -467,7 +473,7 @@ pub enum ConfidentialTransferInstruction {
     ///   9. `[]` (Optional) Range proof record account or context state
     ///      account.
     ///   10. `[]` The multisig  source account owner.
-    ///   11.. `[signer]` Required M signer accounts for the SPL Token Multisig
+    ///   11. .. `[signer]` Required M signer accounts for the SPL Token Multisig
     ///
     /// Data expected by this instruction:
     ///   `TransferWithFeeInstructionData`
diff --git a/token/program-2022/src/extension/confidential_transfer_fee/instruction.rs b/token/program-2022/src/extension/confidential_transfer_fee/instruction.rs
index 6c625df3c20..5978159d33a 100644
--- a/token/program-2022/src/extension/confidential_transfer_fee/instruction.rs
+++ b/token/program-2022/src/extension/confidential_transfer_fee/instruction.rs
@@ -91,7 +91,7 @@ pub enum ConfidentialTransferFeeInstruction {
     ///   3. `[]` (Optional) Record account if the accompanying proof is to be
     ///      read from a record account.
     ///   4. `[]` The mint's multisig `withdraw_withheld_authority`.
-    ///   5. ..3+M `[signer]` M signer accounts.
+    ///   5. ..5+M `[signer]` M signer accounts.
     ///
     /// Data expected by this instruction:
     ///   WithdrawWithheldTokensFromMintData
@@ -158,7 +158,7 @@ pub enum ConfidentialTransferFeeInstruction {
     ///      read from a record account.
     ///   4. `[]` The mint's multisig `withdraw_withheld_authority`.
     ///   5. ..5+M `[signer]` M signer accounts.
-    ///   5+M+1. ..5+M+N `[writable]` The source accounts to withdraw from.
+    ///   6. 5+M+1..5+M+N `[writable]` The source accounts to withdraw from.
     ///
     /// Data expected by this instruction:
     ///   WithdrawWithheldTokensFromAccountsData
diff --git a/token/program-2022/src/extension/transfer_fee/instruction.rs b/token/program-2022/src/extension/transfer_fee/instruction.rs
index f0cad6d229b..ee31e4c71cb 100644
--- a/token/program-2022/src/extension/transfer_fee/instruction.rs
+++ b/token/program-2022/src/extension/transfer_fee/instruction.rs
@@ -117,7 +117,7 @@ pub enum TransferFeeInstruction {
     ///   1. `[writable]` The destination account.
     ///   2. `[]` The mint's multisig `withdraw_withheld_authority`.
     ///   3. ..3+M `[signer]` M signer accounts.
-    ///   3+M+1. ..3+M+N `[writable]` The source accounts to withdraw from.
+    ///   4. 3+M+1..3+M+N `[writable]` The source accounts to withdraw from.
     WithdrawWithheldTokensFromAccounts {
         /// Number of token accounts harvested
         num_token_accounts: u8,
diff --git a/token/transfer-hook/interface/src/instruction.rs b/token/transfer-hook/interface/src/instruction.rs
index 88880546450..d6d71323450 100644
--- a/token/transfer-hook/interface/src/instruction.rs
+++ b/token/transfer-hook/interface/src/instruction.rs
@@ -26,8 +26,8 @@ pub enum TransferHookInstruction {
     ///   2. `[]` Destination account
     ///   3. `[]` Source account's owner/delegate
     ///   4. `[]` (Optional) Validation account
-    ///   5..5+M `[]` `M` optional additional accounts, written in validation
-    /// account     data
+    ///   5. ..5+M `[]` `M` optional additional accounts, written in validation
+    ///      account data
     Execute {
         /// Amount of tokens to transfer
         amount: u64,

From 0e8e13d59401a7210c5190138eaa878bffbb746a Mon Sep 17 00:00:00 2001
From: Jon C <me@jonc.dev>
Date: Wed, 30 Oct 2024 12:15:03 +0100
Subject: [PATCH 5/7] Re-run cargo fmt after doc comment update

---
 libraries/type-length-value/src/state.rs             |  3 ++-
 token-lending/program/src/instruction.rs             | 12 ++++++------
 token-swap/program/src/instruction.rs                |  4 ++--
 .../extension/confidential_transfer/instruction.rs   |  3 ++-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/libraries/type-length-value/src/state.rs b/libraries/type-length-value/src/state.rs
index ac7a60054ad..11b933862ee 100644
--- a/libraries/type-length-value/src/state.rs
+++ b/libraries/type-length-value/src/state.rs
@@ -375,7 +375,8 @@ impl<'data> TlvStateMut<'data> {
 
     /// Packs the default TLV data into the first open slot in the data buffer.
     /// Handles repetition based on the boolean arg provided:
-    /// * `true`:   If extension is already found in the buffer, it returns an error.
+    /// * `true`:   If extension is already found in the buffer, it returns an
+    ///   error.
     /// * `false`:  Will add a new entry to the next open slot.
     pub fn init_value<V: SplDiscriminate + Pod + Default>(
         &mut self,
diff --git a/token-lending/program/src/instruction.rs b/token-lending/program/src/instruction.rs
index 8546565b7a4..3ef6841230b 100644
--- a/token-lending/program/src/instruction.rs
+++ b/token-lending/program/src/instruction.rs
@@ -158,8 +158,10 @@ pub enum LendingInstruction {
     ///
     ///   0. `[writable]` Obligation account.
     ///   1. `[]` Clock sysvar.
-    ///   2. .. `[]` Collateral deposit reserve accounts - refreshed, all, in order.
-    ///   3. .. `[]` Liquidity borrow reserve accounts - refreshed, all, in order.
+    ///   2. .. `[]` Collateral deposit reserve accounts - refreshed, all, in
+    ///      order.
+    ///   3. .. `[]` Liquidity borrow reserve accounts - refreshed, all, in
+    ///      order.
     RefreshObligation,
 
     // 8
@@ -319,10 +321,8 @@ pub enum LendingInstruction {
     ///      above).
     ///   2. `[]` Token program id
     ///   3. .. `[any]` Additional accounts provided to the lending program's
-    ///      `FlashLoan` instruction above.   ReceiveFlashLoan {
-    ///          // Amount that must be repaid by the receiver program
-    ///          amount: u64
-    ///      }
+    ///      `FlashLoan` instruction above.   ReceiveFlashLoan { // Amount that
+    ///      must be repaid by the receiver program amount: u64 }
     FlashLoan {
         /// The amount that is to be borrowed - u64::MAX for up to 100% of
         /// available liquidity
diff --git a/token-swap/program/src/instruction.rs b/token-swap/program/src/instruction.rs
index cc84c77af65..874727d3d35 100644
--- a/token-swap/program/src/instruction.rs
+++ b/token-swap/program/src/instruction.rs
@@ -107,8 +107,8 @@ pub enum SwapInstruction {
     ///   3. `[]` token_b Account. Must be non zero, owned by swap authority.
     ///   4. `[writable]` Pool Token Mint. Must be empty, owned by swap
     ///      authority.
-    ///   5. `[]` Pool Token Account to deposit trading and withdraw fees.
-    ///      Must be empty, not owned by swap authority
+    ///   5. `[]` Pool Token Account to deposit trading and withdraw fees. Must
+    ///      be empty, not owned by swap authority
     ///   6. `[writable]` Pool Token Account to deposit the initial pool token
     ///      supply. Must be empty, not owned by swap authority.
     ///   7. `[]` Pool Token program id
diff --git a/token/program-2022/src/extension/confidential_transfer/instruction.rs b/token/program-2022/src/extension/confidential_transfer/instruction.rs
index e1b591ac058..48c4bea411f 100644
--- a/token/program-2022/src/extension/confidential_transfer/instruction.rs
+++ b/token/program-2022/src/extension/confidential_transfer/instruction.rs
@@ -473,7 +473,8 @@ pub enum ConfidentialTransferInstruction {
     ///   9. `[]` (Optional) Range proof record account or context state
     ///      account.
     ///   10. `[]` The multisig  source account owner.
-    ///   11. .. `[signer]` Required M signer accounts for the SPL Token Multisig
+    ///   11. .. `[signer]` Required M signer accounts for the SPL Token
+    ///       Multisig
     ///
     /// Data expected by this instruction:
     ///   `TransferWithFeeInstructionData`

From a326b9f0352e8bf3eb9c43702977b88eb2cb291f Mon Sep 17 00:00:00 2001
From: Jon C <me@jonc.dev>
Date: Wed, 30 Oct 2024 18:47:53 +0100
Subject: [PATCH 6/7] Update solana-version

---
 ci/solana-version.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ci/solana-version.sh b/ci/solana-version.sh
index 33af40e8a8a..a299a5ee36d 100755
--- a/ci/solana-version.sh
+++ b/ci/solana-version.sh
@@ -14,9 +14,7 @@
 if [[ -n $SOLANA_VERSION ]]; then
   solana_version="$SOLANA_VERSION"
 else
-  # This file is now out of sync with the versions in Cargo.toml.
-  # Update to v2.1 once the tarball is ready
-  solana_version=v2.0.14
+  solana_version=v2.1.0
 fi
 
 export solana_version="$solana_version"

From 6c5b3463135d52b57345e6ad4af651ee37a750e6 Mon Sep 17 00:00:00 2001
From: Jon C <me@jonc.dev>
Date: Wed, 30 Oct 2024 18:54:22 +0100
Subject: [PATCH 7/7] Update CI jobs

---
 .github/workflows/pull-request-account-compression.yml | 5 ++++-
 .github/workflows/pull-request-token.yml               | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pull-request-account-compression.yml b/.github/workflows/pull-request-account-compression.yml
index 48f63c7a9a6..6e925fb27ab 100644
--- a/.github/workflows/pull-request-account-compression.yml
+++ b/.github/workflows/pull-request-account-compression.yml
@@ -32,10 +32,11 @@ jobs:
 
       - name: Set env vars
         run: |
+          echo "RUST_STABLE_VERSION=1.78.0" >> $GITHUB_ENV
+          echo "SOLANA_VERSION=v2.0.14" >> $GITHUB_ENV
           source ci/rust-version.sh
           echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV
           source ci/solana-version.sh
-          echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV
           source ci/install-anchor.sh
           echo "ANCHOR_CLI_VERSION=$anchor_cli_version" >> $GITHUB_ENV
 
@@ -94,4 +95,6 @@ jobs:
           key: node-${{ hashFiles('pnpm-lock.yaml') }}
           restore-keys: |
             node-
+      - name: Set env vars
+        run: echo "SOLANA_VERSION=v2.0.14" >> $GITHUB_ENV
       - run: ./ci/js-test-account-compression.sh
diff --git a/.github/workflows/pull-request-token.yml b/.github/workflows/pull-request-token.yml
index db250efb876..18ed249ef75 100644
--- a/.github/workflows/pull-request-token.yml
+++ b/.github/workflows/pull-request-token.yml
@@ -205,7 +205,6 @@ jobs:
 
       - name: Set env vars
         run: |
-          echo "RUST_STABLE_VERSION=1.78.0" >> $GITHUB_ENV
           source ci/rust-version.sh
           echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV
           source ci/solana-version.sh
@@ -213,7 +212,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: ${{ env.RUST_STABLE_VERSION }}
+          toolchain: ${{ env.RUST_STABLE }}
 
       - uses: actions/cache@v4
         with: