From ebbad72fc431fb726004d68c56270e88c869428d Mon Sep 17 00:00:00 2001
From: acheron <98934430+acheroncrypto@users.noreply.github.com>
Date: Fri, 1 Nov 2024 14:17:19 +0100
Subject: [PATCH] Upgrade Solana to 2.1.0 (#3339)

---
 .github/workflows/no-caching-tests.yaml |    2 +-
 .github/workflows/tests.yaml            |    2 +-
 Cargo.lock                              | 1582 ++++++++++++++++-------
 Cargo.toml                              |    9 +
 bench/BINARY_SIZE.md                    |    5 +-
 bench/COMPUTE_UNITS.md                  |  182 +--
 bench/STACK_MEMORY.md                   |  182 +--
 client/src/lib.rs                       |    2 +-
 setup-tests.sh                          |    4 +-
 tests/bench/bench.json                  |  348 ++---
 10 files changed, 1508 insertions(+), 810 deletions(-)

diff --git a/.github/workflows/no-caching-tests.yaml b/.github/workflows/no-caching-tests.yaml
index c24565a4e5..488a1da578 100644
--- a/.github/workflows/no-caching-tests.yaml
+++ b/.github/workflows/no-caching-tests.yaml
@@ -11,7 +11,7 @@ jobs:
     uses: ./.github/workflows/reusable-tests.yaml
     with:
       cache: false
-      solana_cli_version: 2.0.8
+      solana_cli_version: 2.1.0
       node_version: 20.16.0
       cargo_profile: release
       anchor_binary_name: anchor-binary-no-caching
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index eed3754862..ee5011e6ee 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -14,7 +14,7 @@ jobs:
     uses: ./.github/workflows/reusable-tests.yaml
     with:
       cache: true
-      solana_cli_version: 2.0.8
+      solana_cli_version: 2.1.0
       node_version: 20.16.0
       cargo_profile: debug
       anchor_binary_name: anchor-binary
diff --git a/Cargo.lock b/Cargo.lock
index 8ce63837b8..9ce8095830 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -297,7 +297,7 @@ dependencies = [
  "anchor-lang",
  "borsh 0.10.3",
  "mpl-token-metadata",
- "spl-associated-token-account 5.0.0",
+ "spl-associated-token-account",
  "spl-memo",
  "spl-pod 0.4.0",
  "spl-token",
@@ -398,9 +398,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
 
 [[package]]
 name = "ark-bn254"
@@ -585,12 +585,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "assert_matches"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
-
 [[package]]
 name = "async-channel"
 version = "1.9.0"
@@ -598,7 +592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
 dependencies = [
  "concurrent-queue",
- "event-listener",
+ "event-listener 2.5.3",
  "futures-core",
 ]
 
@@ -617,23 +611,25 @@ 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]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -742,18 +738,18 @@ 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",
 ]
 
 [[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",
@@ -769,7 +765,6 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "block-padding",
  "generic-array",
 ]
 
@@ -782,12 +777,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[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"
@@ -805,7 +794,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]]
@@ -831,7 +820,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
  "syn_derive",
 ]
 
@@ -905,22 +894,22 @@ dependencies = [
 
 [[package]]
 name = "bytemuck"
-version = "1.17.1"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2"
+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
+checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -931,9 +920,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
 
 [[package]]
 name = "caps"
@@ -957,14 +946,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 = "cfg-if"
 version = "1.0.0"
@@ -973,15 +969,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.86",
+]
 
 [[package]]
 name = "chrono"
@@ -1018,27 +1019,11 @@ dependencies = [
  "atty",
  "bitflags 1.3.2",
  "strsim 0.8.0",
- "textwrap 0.11.0",
+ "textwrap",
  "unicode-width",
  "vec_map",
 ]
 
-[[package]]
-name = "clap"
-version = "3.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
-dependencies = [
- "atty",
- "bitflags 1.3.2",
- "clap_lex 0.2.4",
- "indexmap 1.9.3",
- "once_cell",
- "strsim 0.10.0",
- "termcolor",
- "textwrap 0.16.0",
-]
-
 [[package]]
 name = "clap"
 version = "4.5.17"
@@ -1057,7 +1042,7 @@ checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
 dependencies = [
  "anstream",
  "anstyle",
- "clap_lex 0.7.2",
+ "clap_lex",
  "strsim 0.11.1",
 ]
 
@@ -1079,16 +1064,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -1116,11 +1092,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.3.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1275,18 +1261,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",
+ "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.86",
+]
+
 [[package]]
 name = "darling"
 version = "0.20.3"
@@ -1308,7 +1322,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.10.0",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -1319,7 +1333,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -1468,7 +1482,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -1491,7 +1505,7 @@ checksum = "a6cbae11b3de8fce2a456e8ea3dada226b35fe791f0dc1d360c0941f0bb681f3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -1515,7 +1529,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",
@@ -1582,7 +1596,7 @@ checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -1631,6 +1645,27 @@ version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
+[[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 = "fastrand"
 version = "2.0.1"
@@ -1643,6 +1678,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.22"
@@ -1655,6 +1696,21 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[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.2"
@@ -1688,9 +1744,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1703,9 +1759,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1713,15 +1769,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1730,38 +1786,44 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+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 = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1829,14 +1891,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
 [[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",
+ "dashmap",
+ "futures",
+ "futures-timer",
+ "no-std-compat",
+ "nonzero_ext",
+ "parking_lot",
+ "portable-atomic",
+ "quanta",
+ "rand 0.8.5",
+ "smallvec",
+ "spinning_top",
 ]
 
 [[package]]
@@ -1888,6 +1959,12 @@ version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
 
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -2033,7 +2110,7 @@ dependencies = [
  "futures-util",
  "http",
  "hyper",
- "rustls",
+ "rustls 0.21.12",
  "tokio",
  "tokio-rustls",
 ]
@@ -2089,12 +2166,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.1",
+ "hashbrown 0.15.0",
 ]
 
 [[package]]
@@ -2184,20 +2261,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.26"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+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",
 ]
@@ -2256,15 +2353,15 @@ checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d"
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 
 [[package]]
 name = "libsecp256k1"
@@ -2435,17 +2532,23 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
 
 [[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",
- "cfg_aliases 0.1.1",
+ "cfg_aliases",
  "libc",
  "memoffset",
 ]
 
+[[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.3"
@@ -2456,6 +2559,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 = "num"
 version = "0.2.1"
@@ -2526,7 +2635,7 @@ checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -2598,7 +2707,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -2627,9 +2736,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "opaque-debug"
@@ -2644,10 +2753,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
-name = "os_str_bytes"
-version = "6.5.1"
+name = "parking"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
@@ -2733,7 +2842,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
 ]
 
 [[package]]
@@ -2766,7 +2875,7 @@ dependencies = [
  "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -2805,12 +2914,6 @@ version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
-[[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"
@@ -2825,9 +2928,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.4.3"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
 
 [[package]]
 name = "portpicker"
@@ -2899,9 +3002,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",
 ]
@@ -2915,18 +3018,34 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[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",
+]
+
 [[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 0.5.7",
  "thiserror",
  "tokio",
  "tracing",
@@ -2934,16 +3053,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.8",
+ "rustc-hash 2.0.0",
+ "rustls 0.23.16",
+ "rustls-platform-verifier",
  "slab",
  "thiserror",
  "tinyvec",
@@ -2952,15 +3071,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 0.5.7",
  "tracing",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3043,6 +3163,15 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
+[[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"
@@ -3146,8 +3275,8 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls",
- "rustls-pemfile",
+ "rustls 0.21.12",
+ "rustls-pemfile 1.0.3",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -3243,6 +3372,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"
@@ -3267,7 +3402,7 @@ version = "0.38.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -3282,18 +3417,33 @@ checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "log",
  "ring 0.17.8",
- "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.8",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.8",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-native-certs"
-version = "0.6.3"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
+checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile",
+ "rustls-pemfile 2.2.0",
+ "rustls-pki-types",
  "schannel",
  "security-framework",
 ]
@@ -3307,6 +3457,48 @@ dependencies = [
  "base64 0.21.7",
 ]
 
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "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",
+]
+
+[[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"
@@ -3317,6 +3509,17 @@ dependencies = [
  "untrusted 0.9.0",
 ]
 
+[[package]]
+name = "rustls-webpki"
+version = "0.102.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+dependencies = [
+ "ring 0.17.8",
+ "rustls-pki-types",
+ "untrusted 0.9.0",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.17"
@@ -3358,20 +3561,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.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.55",
-]
 
 [[package]]
 name = "sct"
@@ -3385,22 +3574,23 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.9.2"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+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.9.1"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3414,38 +3604,38 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
 dependencies = [
  "serde_derive",
 ]
 
 [[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",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
 dependencies = [
  "itoa",
  "memchr",
@@ -3476,24 +3666,25 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "2.3.3"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe"
+checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"
 dependencies = [
  "serde",
+ "serde_derive",
  "serde_with_macros",
 ]
 
 [[package]]
 name = "serde_with_macros"
-version = "2.3.3"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f"
+checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -3502,7 +3693,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",
@@ -3544,18 +3735,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",
-]
-
 [[package]]
 name = "sha3"
 version = "0.10.8"
@@ -3581,6 +3760,12 @@ dependencies = [
  "dirs",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.1"
@@ -3637,11 +3822,25 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[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.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e92694b819c0baf7fe9d1f3d74c0360b08c49054e888f9bfbba731653bb7ff22"
+checksum = "14e5b1c167335942b659d077552607f79b2eca3472e40eeed97a2c55838b84ef"
 dependencies = [
  "Inflector",
  "base64 0.22.1",
@@ -3652,6 +3851,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
+ "solana-account-decoder-client-types",
  "solana-config-program",
  "solana-sdk",
  "spl-token",
@@ -3662,15 +3862,90 @@ 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-atomic-u64"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "391b795afcdcad39ddc6c938d64b789d036cdfe00d9dc5ff83024cf2da9f066f"
+dependencies = [
+ "parking_lot",
+]
+
+[[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-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-clap-utils"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf985fe4abeed8401b715d3c3cf08551455ea18bfe1e6fcf96f995f20723e053"
+checksum = "1709e1b0aefc8062fca29a4fde8d35f39ee95586e77cc6360e9bfc50a094c44f"
 dependencies = [
  "chrono",
  "clap 2.34.0",
  "rpassword",
+ "solana-derivation-path",
  "solana-remote-wallet",
  "solana-sdk",
  "thiserror",
@@ -3681,9 +3956,9 @@ dependencies = [
 
 [[package]]
 name = "solana-cli-config"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe3d1d535798e8becae4d742d37269d0791f454a34443a95c810865b776ac378"
+checksum = "384fda0ddf3099eab0f702b326663f499e84731e8584fd7d0c6d8bab03bead79"
 dependencies = [
  "dirs-next",
  "lazy_static",
@@ -3697,23 +3972,22 @@ dependencies = [
 
 [[package]]
 name = "solana-client"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a455a20e3e03d2da6d1e4f6c1f122c4ba4ab119651f02bd6744cc5af03e7774"
+checksum = "1d9a40b8e9e11604e8c05e8b5fcdb89359235db47d1aae84dcba0fc98e95dd0c"
 dependencies = [
  "async-trait",
  "bincode",
  "dashmap",
  "futures",
  "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",
@@ -3728,41 +4002,53 @@ 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.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1610de88eddf42a9a4b0a8f31eb3f7f9863850dedf51355508550975e8895cd"
+checksum = "ebf2f023f471bd1195b7f420e13ffc2422592dd48e71104b4901300b49ac493e"
 dependencies = [
- "rustc_version",
  "solana-sdk",
 ]
 
 [[package]]
 name = "solana-config-program"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7961fbad7a0facdc03037b484bacbf80198f68347d37ed84b2866b63c24015"
+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.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "163e56d6851952e4ccde37a9b3fb6edab0207b6eb871da506434d55df4e8de94"
+checksum = "5f45dd2a6d5d55ed951781486231d0d2ee9ff7047fdafaed01ee021e236319d0"
 dependencies = [
  "async-trait",
  "bincode",
  "crossbeam-channel",
  "futures-util",
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "log",
  "rand 0.8.5",
  "rayon",
@@ -3773,24 +4059,75 @@ dependencies = [
  "tokio",
 ]
 
+[[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.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147c81e77b74f5d0a52579c1cf982fffb8c4491fb3baabf0e4fa19e2f6f39030"
+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-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.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "044ee289987278e800857536e4eafaa04fba676e19edd11d06d1302cbded6f92"
+checksum = "281c481c0efa41a7ddada5dbffabee9099a6b01e9d748b7135366df589f7415e"
 dependencies = [
  "bincode",
  "byteorder",
@@ -3810,22 +4147,112 @@ 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-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-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.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f101319f4740095125c5006be1dc6d4b6108180def37ae94df42f16e78b93f4"
+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-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.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcc3c188176db5d4e60c137525439c4b881dfd262dd306abcac4c568f15177a6"
+checksum = "367c5431bad14b10fbb62614b48720b746672558dba3244167ff7d251890c355"
 dependencies = [
  "env_logger",
  "lazy_static",
@@ -3834,19 +4261,15 @@ dependencies = [
 
 [[package]]
 name = "solana-measure"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fe09f58977e579c3e91f0a7032a1d741e76327924ae868d17beb5d496b40c8f"
-dependencies = [
- "log",
- "solana-sdk",
-]
+checksum = "33b2047a2f588082b71080b060918f107c3330ae1505f759c3b2d74bae9d9c88"
 
 [[package]]
 name = "solana-metrics"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7860d18901af0b24e05d7631cd655924eb056d83a52040234f827cc3cc8da0c6"
+checksum = "6319c74238e8ed4f7159fd37c693a574ab8316d03b053103f9cc83dce13f1d5c"
 dependencies = [
  "crossbeam-channel",
  "gethostname",
@@ -3857,14 +4280,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.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b6723ddcc4393d9d2d5e258871461d0002e45c7d9b6ea895bff1011d16163e9"
+checksum = "bbac19474a4c4f91cb264c2fccead8a1a4f65384ce650b24360d9df5650e65bc"
 dependencies = [
  "bincode",
- "clap 3.2.25",
  "crossbeam-channel",
  "log",
  "nix",
@@ -3872,25 +4309,36 @@ dependencies = [
  "serde",
  "serde_derive",
  "socket2 0.5.7",
- "solana-logger",
  "solana-sdk",
- "solana-version",
- "static_assertions",
  "tokio",
  "url",
 ]
 
+[[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.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9393d11aa5643f6afdffa8ab7b12d8149b7b32409149f673f832f2be442fbe10"
+checksum = "e8299f1ba518f9888da8cafa861addc6ffdd639c689e3ce219ae08212c0dcd0e"
 dependencies = [
  "ahash",
  "bincode",
  "bv",
  "caps",
- "curve25519-dalek",
+ "curve25519-dalek 4.1.3",
  "dlopen2",
  "fnv",
  "lazy_static",
@@ -3899,27 +4347,33 @@ 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-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.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d899c2a1d37290dcfeeb9d1c0032915a29bd48f35759f19ff1e0f6b096eca0b"
+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",
@@ -3929,11 +4383,11 @@ 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",
  "num-bigint 0.4.6",
@@ -3941,27 +4395,109 @@ dependencies = [
  "num-traits",
  "parking_lot",
  "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.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2612ef05b38afcbf642f9be889819713b23564a26d3f612b2ab5616c9ea4c19"
+checksum = "ba1de51df173401d50c0f4cf750f5070d7a4c82125a03c1aec9622dc041b0b54"
 dependencies = [
  "base64 0.22.1",
  "bincode",
- "eager",
  "enum-iterator",
  "itertools 0.12.1",
  "libc",
@@ -3970,23 +4506,52 @@ 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",
  "thiserror",
 ]
 
+[[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.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be61b8e62654303ba158764fb37b4706cc280c7cd239dc977edaf599dfb79875"
+checksum = "9d28adf5ff89c19ef3cb24d0f484afa05852697881c2e4ef12aec190d61f76d8"
 dependencies = [
  "crossbeam-channel",
  "futures-util",
@@ -4009,11 +4574,11 @@ dependencies = [
 
 [[package]]
 name = "solana-quic-client"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bcf89e7ed0daabc4db107d6c38453bbd0ef84150f0acec760c65579361378cb"
+checksum = "259c6d420c0b7620557700f13fbbdb00afbb1b82274485c27ba30dd660ea921b"
 dependencies = [
- "async-mutex",
+ "async-lock",
  "async-trait",
  "futures",
  "itertools 0.12.1",
@@ -4021,7 +4586,7 @@ dependencies = [
  "log",
  "quinn",
  "quinn-proto",
- "rustls",
+ "rustls 0.23.16",
  "solana-connection-cache",
  "solana-measure",
  "solana-metrics",
@@ -4035,9 +4600,9 @@ dependencies = [
 
 [[package]]
 name = "solana-rayon-threadlimit"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45d6268135fcf812d9e9add2dff578b7ac8a0d003d6f95b996aec7a0311aad8e"
+checksum = "4c69806ad1a7b0986f750134e13e55d83919631d81a2328a588615740e14ed0a"
 dependencies = [
  "lazy_static",
  "num_cpus",
@@ -4045,9 +4610,9 @@ dependencies = [
 
 [[package]]
 name = "solana-remote-wallet"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc12b8f2e668712995ae972c497663fdcb61f19b925029d104e19917b8d66428"
+checksum = "6f36cf8ad0090276b5e9c73512df889b84092761ed733a26781b164c9e95f544"
 dependencies = [
  "console",
  "dialoguer",
@@ -4057,16 +4622,28 @@ dependencies = [
  "parking_lot",
  "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-client"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "846113929e8458f5dcb875d379cc28bdb9149ba68db80202b220795608bc3227"
+checksum = "3b05822aceeb484074a72d82a1b289da9fc3383f9ba3f55ce4bfd003bf9d62e6"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4080,10 +4657,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",
@@ -4091,9 +4668,9 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-client-api"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "272eb64c9baf966eccf4fa5c8ed9344fe162d2a13a2ac09cf2cd2b40a85a3a65"
+checksum = "cb9c6e64f01cfafef9b2d43d6adb02979bb22f579ec8ee88b77796259acce92e"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -4105,46 +4682,48 @@ 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.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23cf6f2875e47a5ac67b00dda4306646bb63ae5bb79ef408758cf1bad810497b"
+checksum = "7f0ab2d1ca3769c5058c689b438d35eb1cb7d2a32fc4b2b7c16fe72fa187927c"
 dependencies = [
- "clap 2.34.0",
- "solana-clap-utils",
  "solana-rpc-client",
  "solana-sdk",
  "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.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62d86ef4a245cec35b7b0c24a659e22cc2d1fbbad65c141e332cc5928ed04dc"
+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",
  "getrandom 0.1.16",
  "hmac 0.12.1",
  "itertools 0.12.1",
@@ -4153,39 +4732,66 @@ dependencies = [
  "libsecp256k1",
  "log",
  "memmap2",
+ "num-derive 0.4.0",
+ "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",
  "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.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23198ed620c4a61c97fe49bd907fc965659aea9a5ed0ea0cf90084eecc72a3c1"
+checksum = "1bd2265b93dce9d3dcf9f395abf1a85b5e06e4da4aa60ca147620003ac3abc67"
 dependencies = [
  "bs58",
  "proc-macro2",
  "quote",
- "rustversion",
- "syn 2.0.55",
+ "syn 2.0.86",
+]
+
+[[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]]
@@ -4194,19 +4800,108 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183"
 
+[[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",
+ "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-streamer"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cef6776681796df95aeaacf5af2f017fd6e215579f6589ea67904bc384b4bcc"
+checksum = "ff771524872781eca074e0ba221d72b07fa0800cc1a7ffa400a9eb3e125fb922"
 dependencies = [
  "async-channel",
  "bytes",
  "crossbeam-channel",
  "dashmap",
+ "futures",
  "futures-util",
+ "governor",
  "histogram",
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "itertools 0.12.1",
  "libc",
  "log",
@@ -4216,8 +4911,9 @@ dependencies = [
  "quinn",
  "quinn-proto",
  "rand 0.8.5",
- "rustls",
+ "rustls 0.23.16",
  "smallvec",
+ "socket2 0.5.7",
  "solana-measure",
  "solana-metrics",
  "solana-perf",
@@ -4225,14 +4921,15 @@ dependencies = [
  "solana-transaction-metrics-tracker",
  "thiserror",
  "tokio",
+ "tokio-util",
  "x509-parser",
 ]
 
 [[package]]
 name = "solana-thin-client"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff07c0d23dd839eda4324a02c8634855bdd1f72c385f4466e5caf78e7a5e2a25"
+checksum = "10314ae3e0889cf38140902862d2c2ea481895c82c19f51dc4457b7dfa3aa6d0"
 dependencies = [
  "bincode",
  "log",
@@ -4243,22 +4940,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.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fce3b3fb075bd06f360c74d77816d3527dbf9bb2f2e89f9e0a52a55c06575871"
+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",
@@ -4267,13 +4974,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.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23895b81f3cc9ebf1472609bd2ce75b9bdea0f89a0c3245d5c72df354a92a4d"
+checksum = "b0b668c986a83e6b2eb8f130039045b54abc37ee821853250755386d26c1c668"
 dependencies = [
- "Inflector",
  "base64 0.22.1",
  "bincode",
  "lazy_static",
@@ -4281,40 +4999,32 @@ dependencies = [
  "rand 0.8.5",
  "solana-perf",
  "solana-sdk",
+ "solana-short-vec",
 ]
 
 [[package]]
-name = "solana-transaction-status"
-version = "2.0.8"
+name = "solana-transaction-status-client-types"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4873ad4df45ef4f88b68982ac651caa93f489a4bfe62eedb2f59ea48da1df88e"
+checksum = "5fb35fb678fec581e9bdf6350d2c7f5829951a6280038fc06949b1589a9605e1"
 dependencies = [
- "Inflector",
  "base64 0.22.1",
  "bincode",
- "borsh 1.5.1",
  "bs58",
- "lazy_static",
- "log",
  "serde",
  "serde_derive",
  "serde_json",
- "solana-account-decoder",
+ "solana-account-decoder-client-types",
  "solana-sdk",
- "spl-associated-token-account 4.0.0",
- "spl-memo",
- "spl-token",
- "spl-token-2022 4.0.0",
- "spl-token-group-interface 0.3.0",
- "spl-token-metadata-interface 0.4.0",
+ "solana-signature",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-type-overrides"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "540b1df966da86b0e183e124e48fef59605daf57b22809842b5273cb49277a89"
+checksum = "2066f25d460d63801f91436c2640aaba4f2dc95aa18fe1e76f7f2c063e981d4e"
 dependencies = [
  "lazy_static",
  "rand 0.8.5",
@@ -4322,9 +5032,9 @@ dependencies = [
 
 [[package]]
 name = "solana-udp-client"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91423aac2b1410e5f81faeb8cf655d63249d525761c4bd3f92a2c8e7641060bb"
+checksum = "95ec0cbc2d5e3379fafb2c1493f2358f07c09e76e2081c44e3a8c36da12fbd40"
 dependencies = [
  "async-trait",
  "solana-connection-cache",
@@ -4337,27 +5047,26 @@ dependencies = [
 
 [[package]]
 name = "solana-version"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfc990baf7a1c8d08eff49add6b971b6f4c37c8a2ae4967b4c4300475226e71c"
+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.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5755419c8efaea27fd5fcd241ba43bcf248e7e420bb4733211236517ae93f38b"
+checksum = "5ab46788981765ee706094ca53ad8421aae0286a6b948e892fa7db88992a5373"
 dependencies = [
  "itertools 0.12.1",
  "log",
- "rustc_version",
  "serde",
  "serde_derive",
  "solana-sdk",
@@ -4366,17 +5075,17 @@ dependencies = [
 
 [[package]]
 name = "solana-vote-program"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8165c8bc37e34456f352715acb309eb65e014beca0297eaccdd4319dfea79981"
+checksum = "637cadc921725d1804a451ea7d2dff83310a12b75e0b6c83a8bb67ebc02d10f1"
 dependencies = [
  "bincode",
  "log",
  "num-derive 0.4.0",
  "num-traits",
- "rustc_version",
  "serde",
  "serde_derive",
+ "solana-feature-set",
  "solana-metrics",
  "solana-program",
  "solana-program-runtime",
@@ -4386,38 +5095,41 @@ dependencies = [
 
 [[package]]
 name = "solana-zk-sdk"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b497ac230fa5ccc7509cfd99be56cb819b22b111cf57fc7e23eaf9e6ffcbb4fd"
+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 0.4.0",
  "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-sdk"
-version = "2.0.8"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b286fa24abe68536297e232670d01d2c478f6d75a46311809c0a07bf251f3dfc"
+checksum = "ed293089d8eebd6b5c1b53ee4ad6817889fea254274ddb34cb01ad35a2f817cb"
 dependencies = [
  "aes-gcm-siv",
  "base64 0.22.1",
@@ -4425,18 +5137,19 @@ dependencies = [
  "bytemuck",
  "bytemuck_derive",
  "byteorder",
- "curve25519-dalek",
+ "curve25519-dalek 4.1.3",
  "itertools 0.12.1",
  "lazy_static",
  "merlin",
  "num-derive 0.4.0",
  "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",
@@ -4446,13 +5159,12 @@ dependencies = [
 
 [[package]]
 name = "solana_rbpf"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff08afd63f70a1ba712fb0017be41e93b017f7e874785b54bb5ec9aa8949781d"
+checksum = "1c1941b5ef0c3ce8f2ac5dd984d0fb1a97423c4ff2a02eec81e3913f02e2ac2b"
 dependencies = [
  "byteorder",
- "combine",
- "goblin",
+ "combine 3.8.1",
  "hash32",
  "libc",
  "log",
@@ -4490,19 +5202,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
 [[package]]
-name = "spl-associated-token-account"
-version = "4.0.0"
+name = "spinning_top"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68034596cf4804880d265f834af1ff2f821ad5293e41fa0f8f59086c181fc38e"
+checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300"
 dependencies = [
- "assert_matches",
- "borsh 1.5.1",
- "num-derive 0.4.0",
- "num-traits",
- "solana-program",
- "spl-token",
- "spl-token-2022 4.0.0",
- "thiserror",
+ "lock_api",
 ]
 
 [[package]]
@@ -4549,7 +5254,7 @@ checksum = "d9e8418ea6269dcfb01c712f0444d2c75542c04448b480e87de59d2865edc750"
 dependencies = [
  "quote",
  "spl-discriminator-syn",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -4561,7 +5266,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sha2 0.10.8",
- "syn 2.0.55",
+ "syn 2.0.86",
  "thiserror",
 ]
 
@@ -4624,7 +5329,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sha2 0.10.8",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -4748,10 +5453,9 @@ dependencies = [
 [[package]]
 name = "spl-token-confidential-transfer-proof-generation"
 version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216517cc8cd26dfe768521542f221f91049be102d1eefd8054cde881d1b5d267"
+source = "git+https://github.com/solana-labs/solana-program-library?rev=8e0ed0a#8e0ed0ab0d1caeb0b8125c0879ec6ae96a0685d0"
 dependencies = [
- "curve25519-dalek",
+ "curve25519-dalek 4.1.3",
  "solana-zk-sdk",
  "thiserror",
 ]
@@ -4855,12 +5559,6 @@ dependencies = [
  "spl-program-error",
 ]
 
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
 [[package]]
 name = "string_cache"
 version = "0.8.7"
@@ -4911,9 +5609,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.55"
+version = "2.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0"
+checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4929,7 +5627,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -5033,30 +5731,24 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
-
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -5101,7 +5793,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",
@@ -5160,7 +5852,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -5169,15 +5861,15 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
- "rustls",
+ "rustls 0.21.12",
  "tokio",
 ]
 
 [[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",
@@ -5192,7 +5884,7 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
 dependencies = [
  "futures-util",
  "log",
- "rustls",
+ "rustls 0.21.12",
  "tokio",
  "tokio-rustls",
  "tungstenite",
@@ -5261,7 +5953,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -5274,7 +5966,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -5287,7 +5979,7 @@ version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "toml_datetime",
  "winnow",
 ]
@@ -5307,21 +5999,9 @@ dependencies = [
  "cfg-if",
  "log",
  "pin-project-lite",
- "tracing-attributes",
  "tracing-core",
 ]
 
-[[package]]
-name = "tracing-attributes"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.55",
-]
-
 [[package]]
 name = "tracing-core"
 version = "0.1.31"
@@ -5350,7 +6030,7 @@ dependencies = [
  "httparse",
  "log",
  "rand 0.8.5",
- "rustls",
+ "rustls 0.21.12",
  "sha1",
  "thiserror",
  "url",
@@ -5533,26 +6213,27 @@ 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",
+ "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",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
  "wasm-bindgen-shared",
 ]
 
@@ -5570,9 +6251,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",
@@ -5580,22 +6261,22 @@ 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",
- "syn 2.0.55",
+ "syn 2.0.86",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[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"
@@ -5613,7 +6294,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]]
@@ -5622,6 +6303,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 = "winapi"
 version = "0.3.9"
@@ -5857,14 +6547,14 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[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",
 ]
@@ -5877,35 +6567,33 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.86",
 ]
 
 [[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.2+zstd.1.5.2"
+version = "7.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
+checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
 dependencies = [
- "libc",
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.8+zstd.1.5.5"
+version = "2.0.13+zstd.1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
+checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
 dependencies = [
  "cc",
- "libc",
  "pkg-config",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index a6abc075cc..52c19b8dc1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,3 +21,12 @@ exclude = [
     "tests/cfo/deps/openbook-dex",
 ]
 resolver = "2"
+
+# TODO: Remove once there is a new compatible release on crates.io
+#
+# The latest version of this crate on crates.io depends on `curve25519-dalek ^3.2.1` which
+# conflicts with `solana-* ^2.1`.
+#
+# Details: https://github.com/solana-labs/solana-program-library/pull/7416#discussion_r1824643243
+[patch.crates-io]
+spl-token-confidential-transfer-proof-generation = { git = "https://github.com/solana-labs/solana-program-library", rev = "8e0ed0a" }
\ No newline at end of file
diff --git a/bench/BINARY_SIZE.md b/bench/BINARY_SIZE.md
index c9087121f2..493c99359a 100644
--- a/bench/BINARY_SIZE.md
+++ b/bench/BINARY_SIZE.md
@@ -14,15 +14,16 @@ The programs and their tests are located in [/tests/bench](https://github.com/co
 
 ## [Unreleased]
 
-Solana version: 2.0.8
+Solana version: 2.1.0
 
 | Program | Binary Size | -                        |
 | ------- | ----------- | ------------------------ |
-| bench   | 1,097,424   | 🔴 **+306,416 (38.74%)** |
+| bench   | 1,042,424   | 🔴 **+251,416 (31.78%)** |
 
 ### Notable changes
 
 - lang: Use closures for `init` constraints to reduce the stack usage of `try_accounts`. Note that the binary size increase is exaggerated for the bench program because it uses unusual number of `init` constraints. Impact for normal programs will be a lot less severe. ([#2939](https://github.com/coral-xyz/anchor/pull/2939)).
+- Upgrade to Solana `2.1.0`. This upgrade decreased the binary size ~5% (55,000 bytes) ([#3339](https://github.com/coral-xyz/anchor/pull/3339)).
 
 ---
 
diff --git a/bench/COMPUTE_UNITS.md b/bench/COMPUTE_UNITS.md
index d9196f7baf..2afed41a8d 100644
--- a/bench/COMPUTE_UNITS.md
+++ b/bench/COMPUTE_UNITS.md
@@ -14,97 +14,97 @@ The programs and their tests are located in [/tests/bench](https://github.com/co
 
 ## [Unreleased]
 
-Solana version: 2.0.8
-
-| Instruction                 | Compute Units | -                     |
-| --------------------------- | ------------- | --------------------- |
-| accountInfo1                | 573           | 🟢 **-28 (4.66%)**    |
-| accountInfo2                | 899           | 🟢 **-24 (2.60%)**    |
-| accountInfo4                | 1,561         | 🟢 **-22 (1.39%)**    |
-| accountInfo8                | 2,957         | 🟢 **-18 (0.61%)**    |
-| accountEmptyInit1           | 5,014         | 🟢 **-20 (0.40%)**    |
-| accountEmpty1               | 649           | 🟢 **-3 (0.46%)**     |
-| accountEmptyInit2           | 9,155         | 🟢 **-532 (5.49%)**   |
-| accountEmpty2               | 1,015         | 🟢 **-1 (0.10%)**     |
-| accountEmptyInit4           | 17,465        | 🟢 **-1,036 (5.60%)** |
-| accountEmpty4               | 1,740         | 🔴 **+3 (0.17%)**     |
-| accountEmptyInit8           | 34,115        | 🟢 **-2,054 (5.68%)** |
-| accountEmpty8               | 3,193         | 🔴 **+7 (0.22%)**     |
-| accountSizedInit1           | 5,107         | 🔴 **+1 (0.02%)**     |
-| accountSized1               | 690           | 🔴 **+22 (3.29%)**    |
-| accountSizedInit2           | 9,313         | 🟢 **-515 (5.24%)**   |
-| accountSized2               | 1,069         | 🔴 **+23 (2.20%)**    |
-| accountSizedInit4           | 17,812        | 🟢 **-1,025 (5.44%)** |
-| accountSized4               | 1,834         | 🔴 **+27 (1.49%)**    |
-| accountSizedInit8           | 34,706        | 🟢 **-2,055 (5.59%)** |
-| accountSized8               | 3,357         | 🔴 **+31 (0.93%)**    |
-| accountUnsizedInit1         | 5,227         | 🔴 **+28 (0.54%)**    |
-| accountUnsized1             | 746           | 🔴 **+44 (6.27%)**    |
-| accountUnsizedInit2         | 9,599         | 🟢 **-479 (4.75%)**   |
-| accountUnsized2             | 1,163         | 🔴 **+47 (4.21%)**    |
-| accountUnsizedInit4         | 18,276        | 🟢 **-983 (5.10%)**   |
-| accountUnsized4             | 2,000         | 🔴 **+47 (2.41%)**    |
-| accountUnsizedInit8         | 35,328        | 🟢 **-2,003 (5.37%)** |
-| accountUnsized8             | 3,671         | 🔴 **+45 (1.24%)**    |
-| boxedAccountEmptyInit1      | 5,106         | 🔴 **+42 (0.83%)**    |
-| boxedAccountEmpty1          | 740           | 🔴 **+69 (10.28%)**   |
-| boxedAccountEmptyInit2      | 9,268         | 🟢 **-453 (4.66%)**   |
-| boxedAccountEmpty2          | 1,125         | 🔴 **+73 (6.94%)**    |
-| boxedAccountEmptyInit4      | 17,619        | 🟢 **-963 (5.18%)**   |
-| boxedAccountEmpty4          | 1,886         | 🔴 **+75 (4.14%)**    |
-| boxedAccountEmptyInit8      | 34,346        | 🟢 **-1,983 (5.46%)** |
-| boxedAccountEmpty8          | 3,435         | 🔴 **+78 (2.32%)**    |
-| boxedAccountSizedInit1      | 5,189         | 🔴 **+70 (1.37%)**    |
-| boxedAccountSized1          | 780           | 🔴 **+94 (13.70%)**   |
-| boxedAccountSizedInit2      | 9,411         | 🟢 **-434 (4.41%)**   |
-| boxedAccountSized2          | 1,180         | 🔴 **+95 (8.76%)**    |
-| boxedAccountSizedInit4      | 17,879        | 🟢 **-946 (5.03%)**   |
-| boxedAccountSized4          | 1,974         | 🔴 **+100 (5.34%)**   |
-| boxedAccountSizedInit8      | 34,842        | 🟢 **-1,982 (5.38%)** |
-| boxedAccountSized8          | 3,593         | 🔴 **+103 (2.95%)**   |
-| boxedAccountUnsizedInit1    | 5,300         | 🔴 **+93 (1.79%)**    |
-| boxedAccountUnsized1        | 838           | 🔴 **+117 (16.23%)**  |
-| boxedAccountUnsizedInit2    | 9,609         | 🟢 **-406 (4.05%)**   |
-| boxedAccountUnsized2        | 1,275         | 🔴 **+118 (10.20%)**  |
-| boxedAccountUnsizedInit4    | 18,251        | 🟢 **-909 (4.74%)**   |
-| boxedAccountUnsized4        | 2,138         | 🔴 **+119 (5.89%)**   |
-| boxedAccountUnsizedInit8    | 35,562        | 🟢 **-1,934 (5.16%)** |
-| boxedAccountUnsized8        | 3,895         | 🔴 **+119 (3.15%)**   |
-| boxedInterfaceAccountMint1  | 1,502         | 🔴 **+130 (9.48%)**   |
-| boxedInterfaceAccountMint2  | 2,423         | 🔴 **+130 (5.67%)**   |
-| boxedInterfaceAccountMint4  | 4,256         | 🔴 **+135 (3.28%)**   |
-| boxedInterfaceAccountMint8  | 7,950         | 🔴 **+139 (1.78%)**   |
-| boxedInterfaceAccountToken1 | 2,198         | 🔴 **+142 (6.91%)**   |
-| boxedInterfaceAccountToken2 | 3,803         | 🔴 **+143 (3.91%)**   |
-| boxedInterfaceAccountToken4 | 7,004         | 🔴 **+146 (2.13%)**   |
-| boxedInterfaceAccountToken8 | 13,434        | 🔴 **+150 (1.13%)**   |
-| interfaceAccountMint1       | 1,626         | 🔴 **+154 (10.46%)**  |
-| interfaceAccountMint2       | 2,788         | 🔴 **+157 (5.97%)**   |
-| interfaceAccountMint4       | 5,110         | 🔴 **+159 (3.21%)**   |
-| interfaceAccountMint8       | 9,749         | 🔴 **+161 (1.68%)**   |
-| interfaceAccountToken1      | 2,296         | 🔴 **+166 (7.79%)**   |
-| interfaceAccountToken2      | 4,096         | 🔴 **+168 (4.28%)**   |
-| interfaceAccountToken4      | 7,692         | 🔴 **+171 (2.27%)**   |
-| interface1                  | 774           | 🔴 **+174 (29.00%)**  |
-| interface2                  | 923           | 🔴 **+178 (23.89%)**  |
-| interface4                  | 1,214         | 🔴 **+181 (17.52%)**  |
-| interface8                  | 1,799         | 🔴 **+183 (11.32%)**  |
-| program1                    | 782           | 🔴 **+186 (31.21%)**  |
-| program2                    | 927           | 🔴 **+190 (25.78%)**  |
-| program4                    | 1,210         | 🔴 **+191 (18.74%)**  |
-| program8                    | 1,779         | 🔴 **+195 (12.31%)**  |
-| signer1                     | 779           | 🔴 **+199 (34.31%)**  |
-| signer2                     | 1,074         | 🔴 **+202 (23.17%)**  |
-| signer4                     | 1,657         | 🔴 **+203 (13.96%)**  |
-| signer8                     | 2,826         | 🔴 **+208 (7.94%)**   |
-| systemAccount1              | 802           | 🔴 **+210 (35.47%)**  |
-| systemAccount2              | 1,108         | 🔴 **+214 (23.94%)**  |
-| systemAccount4              | 1,713         | 🔴 **+216 (14.43%)**  |
-| systemAccount8              | 2,926         | 🔴 **+219 (8.09%)**   |
-| uncheckedAccount1           | 785           | 🔴 **+222 (39.43%)**  |
-| uncheckedAccount2           | 1,061         | 🔴 **+225 (26.91%)**  |
-| uncheckedAccount4           | 1,604         | 🔴 **+226 (16.40%)**  |
-| uncheckedAccount8           | 2,699         | 🔴 **+231 (9.36%)**   |
+Solana version: 2.1.0
+
+| Instruction                 | Compute Units | -                      |
+| --------------------------- | ------------- | ---------------------- |
+| accountInfo1                | 571           | 🟢 **-30 (4.99%)**     |
+| accountInfo2                | 895           | 🟢 **-28 (3.03%)**     |
+| accountInfo4                | 1,553         | 🟢 **-30 (1.90%)**     |
+| accountInfo8                | 2,923         | 🟢 **-52 (1.75%)**     |
+| accountEmptyInit1           | 5,016         | 🟢 **-18 (0.36%)**     |
+| accountEmpty1               | 645           | 🟢 **-7 (1.07%)**      |
+| accountEmptyInit2           | 9,167         | 🟢 **-520 (5.37%)**    |
+| accountEmpty2               | 1,007         | 🟢 **-9 (0.89%)**      |
+| accountEmptyInit4           | 17,496        | 🟢 **-1,005 (5.43%)**  |
+| accountEmpty4               | 1,724         | 🟢 **-13 (0.75%)**     |
+| accountEmptyInit8           | 34,187        | 🟢 **-1,982 (5.48%)**  |
+| accountEmpty8               | 3,163         | 🟢 **-23 (0.72%)**     |
+| accountSizedInit1           | 5,125         | 🔴 **+19 (0.37%)**     |
+| accountSized1               | 693           | 🔴 **+25 (3.74%)**     |
+| accountSizedInit2           | 9,355         | 🟢 **-473 (4.81%)**    |
+| accountSized2               | 1,075         | 🔴 **+29 (2.77%)**     |
+| accountSizedInit4           | 17,902        | 🟢 **-935 (4.96%)**    |
+| accountSized4               | 1,848         | 🔴 **+41 (2.27%)**     |
+| accountSizedInit8           | 34,897        | 🟢 **-1,864 (5.07%)**  |
+| accountSized8               | 3,387         | 🔴 **+61 (1.83%)**     |
+| accountUnsizedInit1         | 5,238         | 🔴 **+39 (0.75%)**     |
+| accountUnsized1             | 746           | 🔴 **+44 (6.27%)**     |
+| accountUnsizedInit2         | 9,625         | 🟢 **-453 (4.49%)**    |
+| accountUnsized2             | 1,163         | 🔴 **+47 (4.21%)**     |
+| accountUnsizedInit4         | 18,335        | 🟢 **-924 (4.80%)**    |
+| accountUnsized4             | 2,002         | 🔴 **+49 (2.51%)**     |
+| accountUnsizedInit8         | 35,457        | 🟢 **-1,874 (5.02%)**  |
+| accountUnsized8             | 3,673         | 🔴 **+47 (1.30%)**     |
+| boxedAccountEmptyInit1      | 5,108         | 🔴 **+44 (0.87%)**     |
+| boxedAccountEmpty1          | 734           | 🔴 **+63 (9.39%)**     |
+| boxedAccountEmptyInit2      | 9,280         | 🟢 **-441 (4.54%)**    |
+| boxedAccountEmpty2          | 1,116         | 🔴 **+64 (6.08%)**     |
+| boxedAccountEmptyInit4      | 17,650        | 🟢 **-932 (5.02%)**    |
+| boxedAccountEmpty4          | 1,872         | 🔴 **+61 (3.37%)**     |
+| boxedAccountEmptyInit8      | 34,417        | 🟢 **-1,912 (5.26%)**  |
+| boxedAccountEmpty8          | 3,401         | 🔴 **+44 (1.31%)**     |
+| boxedAccountSizedInit1      | 5,204         | 🔴 **+85 (1.66%)**     |
+| boxedAccountSized1          | 783           | 🔴 **+97 (14.14%)**    |
+| boxedAccountSizedInit2      | 9,449         | 🟢 **-396 (4.02%)**    |
+| boxedAccountSized2          | 1,190         | 🔴 **+105 (9.68%)**    |
+| boxedAccountSizedInit4      | 17,962        | 🟢 **-863 (4.58%)**    |
+| boxedAccountSized4          | 1,996         | 🔴 **+122 (6.51%)**    |
+| boxedAccountSizedInit8      | 35,017        | 🟢 **-1,807 (4.91%)**  |
+| boxedAccountSized8          | 3,628         | 🔴 **+138 (3.95%)**    |
+| boxedAccountUnsizedInit1    | 5,304         | 🔴 **+97 (1.86%)**     |
+| boxedAccountUnsized1        | 836           | 🔴 **+115 (15.95%)**   |
+| boxedAccountUnsizedInit2    | 9,625         | 🟢 **-390 (3.89%)**    |
+| boxedAccountUnsized2        | 1,270         | 🔴 **+113 (9.77%)**    |
+| boxedAccountUnsizedInit4    | 18,290        | 🟢 **-870 (4.54%)**    |
+| boxedAccountUnsized4        | 2,132         | 🔴 **+113 (5.60%)**    |
+| boxedAccountUnsizedInit8    | 35,649        | 🟢 **-1,847 (4.93%)**  |
+| boxedAccountUnsized8        | 3,881         | 🔴 **+105 (2.78%)**    |
+| boxedInterfaceAccountMint1  | 1,351         | 🟢 **-21 (1.53%)**     |
+| boxedInterfaceAccountMint2  | 2,123         | 🟢 **-170 (7.41%)**    |
+| boxedInterfaceAccountMint4  | 3,656         | 🟢 **-465 (11.28%)**   |
+| boxedInterfaceAccountMint8  | 6,738         | 🟢 **-1,073 (13.74%)** |
+| boxedInterfaceAccountToken1 | 2,011         | 🟢 **-45 (2.19%)**     |
+| boxedInterfaceAccountToken2 | 3,431         | 🟢 **-229 (6.26%)**    |
+| boxedInterfaceAccountToken4 | 6,260         | 🟢 **-598 (8.72%)**    |
+| boxedInterfaceAccountToken8 | 11,934        | 🟢 **-1,350 (10.16%)** |
+| interfaceAccountMint1       | 1,476         | 🔴 **+4 (0.27%)**      |
+| interfaceAccountMint2       | 2,489         | 🟢 **-142 (5.40%)**    |
+| interfaceAccountMint4       | 4,511         | 🟢 **-440 (8.89%)**    |
+| interfaceAccountMint8       | 8,550         | 🟢 **-1,038 (10.83%)** |
+| interfaceAccountToken1      | 2,111         | 🟢 **-19 (0.89%)**     |
+| interfaceAccountToken2      | 3,729         | 🟢 **-199 (5.07%)**    |
+| interfaceAccountToken4      | 6,955         | 🟢 **-566 (7.53%)**    |
+| interface1                  | 769           | 🔴 **+169 (28.17%)**   |
+| interface2                  | 912           | 🔴 **+167 (22.42%)**   |
+| interface4                  | 1,189         | 🔴 **+156 (15.10%)**   |
+| interface8                  | 1,748         | 🔴 **+132 (8.17%)**    |
+| program1                    | 779           | 🔴 **+183 (30.70%)**   |
+| program2                    | 920           | 🔴 **+183 (24.83%)**   |
+| program4                    | 1,193         | 🔴 **+174 (17.08%)**   |
+| program8                    | 1,744         | 🔴 **+160 (10.10%)**   |
+| signer1                     | 774           | 🔴 **+194 (33.45%)**   |
+| signer2                     | 1,064         | 🔴 **+192 (22.02%)**   |
+| signer4                     | 1,637         | 🔴 **+183 (12.59%)**   |
+| signer8                     | 2,788         | 🔴 **+170 (6.49%)**    |
+| systemAccount1              | 796           | 🔴 **+204 (34.46%)**   |
+| systemAccount2              | 1,096         | 🔴 **+202 (22.60%)**   |
+| systemAccount4              | 1,689         | 🔴 **+192 (12.83%)**   |
+| systemAccount8              | 2,880         | 🔴 **+173 (6.39%)**    |
+| uncheckedAccount1           | 783           | 🔴 **+220 (39.08%)**   |
+| uncheckedAccount2           | 1,056         | 🔴 **+220 (26.32%)**   |
+| uncheckedAccount4           | 1,594         | 🔴 **+216 (15.67%)**   |
+| uncheckedAccount8           | 2,679         | 🔴 **+211 (8.55%)**    |
 
 ### Notable changes
 
diff --git a/bench/STACK_MEMORY.md b/bench/STACK_MEMORY.md
index 24a49be117..3104ff441f 100644
--- a/bench/STACK_MEMORY.md
+++ b/bench/STACK_MEMORY.md
@@ -14,97 +14,97 @@ The programs and their tests are located in [/tests/bench](https://github.com/co
 
 ## [Unreleased]
 
-Solana version: 2.0.8
-
-| Instruction                    | Stack Memory | -   |
-| ------------------------------ | ------------ | --- |
-| account_info1                  | 144          | -   |
-| account_info2                  | 144          | -   |
-| account_info4                  | 144          | -   |
-| account_info8                  | 144          | -   |
-| account_empty_init1            | 144          | -   |
-| account_empty_init2            | 144          | -   |
-| account_empty_init4            | 192          | -   |
-| account_empty_init8            | 224          | -   |
-| account_empty1                 | 144          | -   |
-| account_empty2                 | 144          | -   |
-| account_empty4                 | 144          | -   |
-| account_empty8                 | 144          | -   |
-| account_sized_init1            | 176          | -   |
-| account_sized_init2            | 192          | -   |
-| account_sized_init4            | 224          | -   |
-| account_sized_init8            | 288          | -   |
-| account_sized1                 | 144          | -   |
-| account_sized2                 | 144          | -   |
-| account_sized4                 | 144          | -   |
-| account_sized8                 | 144          | -   |
-| account_unsized_init1          | 192          | -   |
-| account_unsized_init2          | 224          | -   |
-| account_unsized_init4          | 288          | -   |
-| account_unsized_init8          | 416          | -   |
-| account_unsized1               | 144          | -   |
-| account_unsized2               | 144          | -   |
-| account_unsized4               | 144          | -   |
-| account_unsized8               | 144          | -   |
-| boxed_account_empty_init1      | 144          | -   |
-| boxed_account_empty_init2      | 144          | -   |
-| boxed_account_empty_init4      | 192          | -   |
-| boxed_account_empty_init8      | 224          | -   |
-| boxed_account_empty1           | 144          | -   |
-| boxed_account_empty2           | 144          | -   |
-| boxed_account_empty4           | 144          | -   |
-| boxed_account_empty8           | 144          | -   |
-| boxed_account_sized_init1      | 144          | -   |
-| boxed_account_sized_init2      | 144          | -   |
-| boxed_account_sized_init4      | 192          | -   |
-| boxed_account_sized_init8      | 224          | -   |
-| boxed_account_sized1           | 144          | -   |
-| boxed_account_sized2           | 144          | -   |
-| boxed_account_sized4           | 144          | -   |
-| boxed_account_sized8           | 144          | -   |
-| boxed_account_unsized_init1    | 144          | -   |
-| boxed_account_unsized_init2    | 144          | -   |
-| boxed_account_unsized_init4    | 192          | -   |
-| boxed_account_unsized_init8    | 224          | -   |
-| boxed_account_unsized1         | 144          | -   |
-| boxed_account_unsized2         | 144          | -   |
-| boxed_account_unsized4         | 144          | -   |
-| boxed_account_unsized8         | 144          | -   |
-| boxed_interface_account_mint1  | 144          | -   |
-| boxed_interface_account_mint2  | 144          | -   |
-| boxed_interface_account_mint4  | 144          | -   |
-| boxed_interface_account_mint8  | 144          | -   |
-| boxed_interface_account_token1 | 144          | -   |
-| boxed_interface_account_token2 | 144          | -   |
-| boxed_interface_account_token4 | 144          | -   |
-| boxed_interface_account_token8 | 144          | -   |
-| interface_account_mint1        | 144          | -   |
-| interface_account_mint2        | 144          | -   |
-| interface_account_mint4        | 144          | -   |
-| interface_account_mint8        | 144          | -   |
-| interface_account_token1       | 144          | -   |
-| interface_account_token2       | 144          | -   |
-| interface_account_token4       | 144          | -   |
-| interface1                     | 144          | -   |
-| interface2                     | 144          | -   |
-| interface4                     | 144          | -   |
-| interface8                     | 144          | -   |
-| program1                       | 144          | -   |
-| program2                       | 144          | -   |
-| program4                       | 144          | -   |
-| program8                       | 144          | -   |
-| signer1                        | 144          | -   |
-| signer2                        | 144          | -   |
-| signer4                        | 144          | -   |
-| signer8                        | 144          | -   |
-| system_account1                | 144          | -   |
-| system_account2                | 144          | -   |
-| system_account4                | 144          | -   |
-| system_account8                | 144          | -   |
-| unchecked_account1             | 144          | -   |
-| unchecked_account2             | 144          | -   |
-| unchecked_account4             | 144          | -   |
-| unchecked_account8             | 144          | -   |
+Solana version: 2.1.0
+
+| Instruction                    | Stack Memory | -                    |
+| ------------------------------ | ------------ | -------------------- |
+| account_info1                  | 46           | 🟢 **-98 (68.06%)**  |
+| account_info2                  | 80           | 🟢 **-64 (44.44%)**  |
+| account_info4                  | 80           | 🟢 **-64 (44.44%)**  |
+| account_info8                  | 80           | 🟢 **-64 (44.44%)**  |
+| account_empty_init1            | 88           | 🟢 **-56 (38.89%)**  |
+| account_empty_init2            | 88           | 🟢 **-56 (38.89%)**  |
+| account_empty_init4            | 88           | 🟢 **-104 (54.17%)** |
+| account_empty_init8            | 88           | 🟢 **-136 (60.71%)** |
+| account_empty1                 | 88           | 🟢 **-56 (38.89%)**  |
+| account_empty2                 | 88           | 🟢 **-56 (38.89%)**  |
+| account_empty4                 | 88           | 🟢 **-56 (38.89%)**  |
+| account_empty8                 | 88           | 🟢 **-56 (38.89%)**  |
+| account_sized_init1            | 88           | 🟢 **-88 (50.00%)**  |
+| account_sized_init2            | 88           | 🟢 **-104 (54.17%)** |
+| account_sized_init4            | 88           | 🟢 **-136 (60.71%)** |
+| account_sized_init8            | 88           | 🟢 **-200 (69.44%)** |
+| account_sized1                 | 88           | 🟢 **-56 (38.89%)**  |
+| account_sized2                 | 88           | 🟢 **-56 (38.89%)**  |
+| account_sized4                 | 88           | 🟢 **-56 (38.89%)**  |
+| account_sized8                 | 88           | 🟢 **-56 (38.89%)**  |
+| account_unsized_init1          | 88           | 🟢 **-104 (54.17%)** |
+| account_unsized_init2          | 88           | 🟢 **-136 (60.71%)** |
+| account_unsized_init4          | 88           | 🟢 **-200 (69.44%)** |
+| account_unsized_init8          | 88           | 🟢 **-328 (78.85%)** |
+| account_unsized1               | 88           | 🟢 **-56 (38.89%)**  |
+| account_unsized2               | 88           | 🟢 **-56 (38.89%)**  |
+| account_unsized4               | 88           | 🟢 **-56 (38.89%)**  |
+| account_unsized8               | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_account_empty_init1      | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_account_empty_init2      | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_account_empty_init4      | 88           | 🟢 **-104 (54.17%)** |
+| boxed_account_empty_init8      | 88           | 🟢 **-136 (60.71%)** |
+| boxed_account_empty1           | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_account_empty2           | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_account_empty4           | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_account_empty8           | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_account_sized_init1      | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_account_sized_init2      | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_account_sized_init4      | 88           | 🟢 **-104 (54.17%)** |
+| boxed_account_sized_init8      | 88           | 🟢 **-136 (60.71%)** |
+| boxed_account_sized1           | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_account_sized2           | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_account_sized4           | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_account_sized8           | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_account_unsized_init1    | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_account_unsized_init2    | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_account_unsized_init4    | 88           | 🟢 **-104 (54.17%)** |
+| boxed_account_unsized_init8    | 88           | 🟢 **-136 (60.71%)** |
+| boxed_account_unsized1         | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_account_unsized2         | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_account_unsized4         | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_account_unsized8         | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_interface_account_mint1  | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_interface_account_mint2  | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_interface_account_mint4  | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_interface_account_mint8  | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_interface_account_token1 | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_interface_account_token2 | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_interface_account_token4 | 88           | 🟢 **-56 (38.89%)**  |
+| boxed_interface_account_token8 | 88           | 🟢 **-56 (38.89%)**  |
+| interface_account_mint1        | 88           | 🟢 **-56 (38.89%)**  |
+| interface_account_mint2        | 88           | 🟢 **-56 (38.89%)**  |
+| interface_account_mint4        | 88           | 🟢 **-56 (38.89%)**  |
+| interface_account_mint8        | 88           | 🟢 **-56 (38.89%)**  |
+| interface_account_token1       | 80           | 🟢 **-64 (44.44%)**  |
+| interface_account_token2       | 80           | 🟢 **-64 (44.44%)**  |
+| interface_account_token4       | 80           | 🟢 **-64 (44.44%)**  |
+| interface1                     | 88           | 🟢 **-56 (38.89%)**  |
+| interface2                     | 88           | 🟢 **-56 (38.89%)**  |
+| interface4                     | 88           | 🟢 **-56 (38.89%)**  |
+| interface8                     | 88           | 🟢 **-56 (38.89%)**  |
+| program1                       | 88           | 🟢 **-56 (38.89%)**  |
+| program2                       | 88           | 🟢 **-56 (38.89%)**  |
+| program4                       | 88           | 🟢 **-56 (38.89%)**  |
+| program8                       | 88           | 🟢 **-56 (38.89%)**  |
+| signer1                        | 88           | 🟢 **-56 (38.89%)**  |
+| signer2                        | 88           | 🟢 **-56 (38.89%)**  |
+| signer4                        | 88           | 🟢 **-56 (38.89%)**  |
+| signer8                        | 88           | 🟢 **-56 (38.89%)**  |
+| system_account1                | 88           | 🟢 **-56 (38.89%)**  |
+| system_account2                | 88           | 🟢 **-56 (38.89%)**  |
+| system_account4                | 88           | 🟢 **-56 (38.89%)**  |
+| system_account8                | 88           | 🟢 **-56 (38.89%)**  |
+| unchecked_account1             | 88           | 🟢 **-56 (38.89%)**  |
+| unchecked_account2             | 88           | 🟢 **-56 (38.89%)**  |
+| unchecked_account4             | 88           | 🟢 **-56 (38.89%)**  |
+| unchecked_account8             | 88           | 🟢 **-56 (38.89%)**  |
 
 ### Notable changes
 
diff --git a/client/src/lib.rs b/client/src/lib.rs
index f13206496c..eca609ed40 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -67,7 +67,7 @@
 //! This feature allows passing in a custom RPC client when creating program instances, which is
 //! useful for mocking RPC responses, e.g. via [`RpcClient::new_mock`].
 //!
-//! [`RpcClient::new_mock`]: https://docs.rs/solana-client/2.0.8/solana_client/rpc_client/struct.RpcClient.html#method.new_mock
+//! [`RpcClient::new_mock`]: https://docs.rs/solana-client/2.1.0/solana_client/rpc_client/struct.RpcClient.html#method.new_mock
 
 use anchor_lang::solana_program::program_error::ProgramError;
 use anchor_lang::solana_program::pubkey::Pubkey;
diff --git a/setup-tests.sh b/setup-tests.sh
index 57410a8c5d..3820504a7d 100755
--- a/setup-tests.sh
+++ b/setup-tests.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 active_version=$(solana -V | awk '{print $2}')
-if [ "$active_version" != "2.0.8" ]; then
-  agave-install init 2.0.8
+if [ "$active_version" != "2.1.0" ]; then
+  agave-install init 2.1.0
 fi
 
 git submodule update --init --recursive --depth 1
diff --git a/tests/bench/bench.json b/tests/bench/bench.json
index e4f57adf21..622e1b6be9 100644
--- a/tests/bench/bench.json
+++ b/tests/bench/bench.json
@@ -930,188 +930,188 @@
     }
   },
   "unreleased": {
-    "solanaVersion": "2.0.8",
+    "solanaVersion": "2.1.0",
     "result": {
       "binarySize": {
-        "bench": 1097424
+        "bench": 1042424
       },
       "computeUnits": {
-        "accountInfo1": 573,
-        "accountInfo2": 899,
-        "accountInfo4": 1561,
-        "accountInfo8": 2957,
-        "accountEmptyInit1": 5014,
-        "accountEmpty1": 649,
-        "accountEmptyInit2": 9155,
-        "accountEmpty2": 1015,
-        "accountEmptyInit4": 17465,
-        "accountEmpty4": 1740,
-        "accountEmptyInit8": 34115,
-        "accountEmpty8": 3193,
-        "accountSizedInit1": 5107,
-        "accountSized1": 690,
-        "accountSizedInit2": 9313,
-        "accountSized2": 1069,
-        "accountSizedInit4": 17812,
-        "accountSized4": 1834,
-        "accountSizedInit8": 34706,
-        "accountSized8": 3357,
-        "accountUnsizedInit1": 5227,
+        "accountInfo1": 571,
+        "accountInfo2": 895,
+        "accountInfo4": 1553,
+        "accountInfo8": 2923,
+        "accountEmptyInit1": 5016,
+        "accountEmpty1": 645,
+        "accountEmptyInit2": 9167,
+        "accountEmpty2": 1007,
+        "accountEmptyInit4": 17496,
+        "accountEmpty4": 1724,
+        "accountEmptyInit8": 34187,
+        "accountEmpty8": 3163,
+        "accountSizedInit1": 5125,
+        "accountSized1": 693,
+        "accountSizedInit2": 9355,
+        "accountSized2": 1075,
+        "accountSizedInit4": 17902,
+        "accountSized4": 1848,
+        "accountSizedInit8": 34897,
+        "accountSized8": 3387,
+        "accountUnsizedInit1": 5238,
         "accountUnsized1": 746,
-        "accountUnsizedInit2": 9599,
+        "accountUnsizedInit2": 9625,
         "accountUnsized2": 1163,
-        "accountUnsizedInit4": 18276,
-        "accountUnsized4": 2000,
-        "accountUnsizedInit8": 35328,
-        "accountUnsized8": 3671,
-        "boxedAccountEmptyInit1": 5106,
-        "boxedAccountEmpty1": 740,
-        "boxedAccountEmptyInit2": 9268,
-        "boxedAccountEmpty2": 1125,
-        "boxedAccountEmptyInit4": 17619,
-        "boxedAccountEmpty4": 1886,
-        "boxedAccountEmptyInit8": 34346,
-        "boxedAccountEmpty8": 3435,
-        "boxedAccountSizedInit1": 5189,
-        "boxedAccountSized1": 780,
-        "boxedAccountSizedInit2": 9411,
-        "boxedAccountSized2": 1180,
-        "boxedAccountSizedInit4": 17879,
-        "boxedAccountSized4": 1974,
-        "boxedAccountSizedInit8": 34842,
-        "boxedAccountSized8": 3593,
-        "boxedAccountUnsizedInit1": 5300,
-        "boxedAccountUnsized1": 838,
-        "boxedAccountUnsizedInit2": 9609,
-        "boxedAccountUnsized2": 1275,
-        "boxedAccountUnsizedInit4": 18251,
-        "boxedAccountUnsized4": 2138,
-        "boxedAccountUnsizedInit8": 35562,
-        "boxedAccountUnsized8": 3895,
-        "boxedInterfaceAccountMint1": 1502,
-        "boxedInterfaceAccountMint2": 2423,
-        "boxedInterfaceAccountMint4": 4256,
-        "boxedInterfaceAccountMint8": 7950,
-        "boxedInterfaceAccountToken1": 2198,
-        "boxedInterfaceAccountToken2": 3803,
-        "boxedInterfaceAccountToken4": 7004,
-        "boxedInterfaceAccountToken8": 13434,
-        "interfaceAccountMint1": 1626,
-        "interfaceAccountMint2": 2788,
-        "interfaceAccountMint4": 5110,
-        "interfaceAccountMint8": 9749,
-        "interfaceAccountToken1": 2296,
-        "interfaceAccountToken2": 4096,
-        "interfaceAccountToken4": 7692,
-        "interface1": 774,
-        "interface2": 923,
-        "interface4": 1214,
-        "interface8": 1799,
-        "program1": 782,
-        "program2": 927,
-        "program4": 1210,
-        "program8": 1779,
-        "signer1": 779,
-        "signer2": 1074,
-        "signer4": 1657,
-        "signer8": 2826,
-        "systemAccount1": 802,
-        "systemAccount2": 1108,
-        "systemAccount4": 1713,
-        "systemAccount8": 2926,
-        "uncheckedAccount1": 785,
-        "uncheckedAccount2": 1061,
-        "uncheckedAccount4": 1604,
-        "uncheckedAccount8": 2699
+        "accountUnsizedInit4": 18335,
+        "accountUnsized4": 2002,
+        "accountUnsizedInit8": 35457,
+        "accountUnsized8": 3673,
+        "boxedAccountEmptyInit1": 5108,
+        "boxedAccountEmpty1": 734,
+        "boxedAccountEmptyInit2": 9280,
+        "boxedAccountEmpty2": 1116,
+        "boxedAccountEmptyInit4": 17650,
+        "boxedAccountEmpty4": 1872,
+        "boxedAccountEmptyInit8": 34417,
+        "boxedAccountEmpty8": 3401,
+        "boxedAccountSizedInit1": 5204,
+        "boxedAccountSized1": 783,
+        "boxedAccountSizedInit2": 9449,
+        "boxedAccountSized2": 1190,
+        "boxedAccountSizedInit4": 17962,
+        "boxedAccountSized4": 1996,
+        "boxedAccountSizedInit8": 35017,
+        "boxedAccountSized8": 3628,
+        "boxedAccountUnsizedInit1": 5304,
+        "boxedAccountUnsized1": 836,
+        "boxedAccountUnsizedInit2": 9625,
+        "boxedAccountUnsized2": 1270,
+        "boxedAccountUnsizedInit4": 18290,
+        "boxedAccountUnsized4": 2132,
+        "boxedAccountUnsizedInit8": 35649,
+        "boxedAccountUnsized8": 3881,
+        "boxedInterfaceAccountMint1": 1351,
+        "boxedInterfaceAccountMint2": 2123,
+        "boxedInterfaceAccountMint4": 3656,
+        "boxedInterfaceAccountMint8": 6738,
+        "boxedInterfaceAccountToken1": 2011,
+        "boxedInterfaceAccountToken2": 3431,
+        "boxedInterfaceAccountToken4": 6260,
+        "boxedInterfaceAccountToken8": 11934,
+        "interfaceAccountMint1": 1476,
+        "interfaceAccountMint2": 2489,
+        "interfaceAccountMint4": 4511,
+        "interfaceAccountMint8": 8550,
+        "interfaceAccountToken1": 2111,
+        "interfaceAccountToken2": 3729,
+        "interfaceAccountToken4": 6955,
+        "interface1": 769,
+        "interface2": 912,
+        "interface4": 1189,
+        "interface8": 1748,
+        "program1": 779,
+        "program2": 920,
+        "program4": 1193,
+        "program8": 1744,
+        "signer1": 774,
+        "signer2": 1064,
+        "signer4": 1637,
+        "signer8": 2788,
+        "systemAccount1": 796,
+        "systemAccount2": 1096,
+        "systemAccount4": 1689,
+        "systemAccount8": 2880,
+        "uncheckedAccount1": 783,
+        "uncheckedAccount2": 1056,
+        "uncheckedAccount4": 1594,
+        "uncheckedAccount8": 2679
       },
       "stackMemory": {
-        "account_info1": 144,
-        "account_info2": 144,
-        "account_info4": 144,
-        "account_info8": 144,
-        "account_empty_init1": 144,
-        "account_empty_init2": 144,
-        "account_empty_init4": 192,
-        "account_empty_init8": 224,
-        "account_empty1": 144,
-        "account_empty2": 144,
-        "account_empty4": 144,
-        "account_empty8": 144,
-        "account_sized_init1": 176,
-        "account_sized_init2": 192,
-        "account_sized_init4": 224,
-        "account_sized_init8": 288,
-        "account_sized1": 144,
-        "account_sized2": 144,
-        "account_sized4": 144,
-        "account_sized8": 144,
-        "account_unsized_init1": 192,
-        "account_unsized_init2": 224,
-        "account_unsized_init4": 288,
-        "account_unsized_init8": 416,
-        "account_unsized1": 144,
-        "account_unsized2": 144,
-        "account_unsized4": 144,
-        "account_unsized8": 144,
-        "boxed_account_empty_init1": 144,
-        "boxed_account_empty_init2": 144,
-        "boxed_account_empty_init4": 192,
-        "boxed_account_empty_init8": 224,
-        "boxed_account_empty1": 144,
-        "boxed_account_empty2": 144,
-        "boxed_account_empty4": 144,
-        "boxed_account_empty8": 144,
-        "boxed_account_sized_init1": 144,
-        "boxed_account_sized_init2": 144,
-        "boxed_account_sized_init4": 192,
-        "boxed_account_sized_init8": 224,
-        "boxed_account_sized1": 144,
-        "boxed_account_sized2": 144,
-        "boxed_account_sized4": 144,
-        "boxed_account_sized8": 144,
-        "boxed_account_unsized_init1": 144,
-        "boxed_account_unsized_init2": 144,
-        "boxed_account_unsized_init4": 192,
-        "boxed_account_unsized_init8": 224,
-        "boxed_account_unsized1": 144,
-        "boxed_account_unsized2": 144,
-        "boxed_account_unsized4": 144,
-        "boxed_account_unsized8": 144,
-        "boxed_interface_account_mint1": 144,
-        "boxed_interface_account_mint2": 144,
-        "boxed_interface_account_mint4": 144,
-        "boxed_interface_account_mint8": 144,
-        "boxed_interface_account_token1": 144,
-        "boxed_interface_account_token2": 144,
-        "boxed_interface_account_token4": 144,
-        "boxed_interface_account_token8": 144,
-        "interface_account_mint1": 144,
-        "interface_account_mint2": 144,
-        "interface_account_mint4": 144,
-        "interface_account_mint8": 144,
-        "interface_account_token1": 144,
-        "interface_account_token2": 144,
-        "interface_account_token4": 144,
-        "interface1": 144,
-        "interface2": 144,
-        "interface4": 144,
-        "interface8": 144,
-        "program1": 144,
-        "program2": 144,
-        "program4": 144,
-        "program8": 144,
-        "signer1": 144,
-        "signer2": 144,
-        "signer4": 144,
-        "signer8": 144,
-        "system_account1": 144,
-        "system_account2": 144,
-        "system_account4": 144,
-        "system_account8": 144,
-        "unchecked_account1": 144,
-        "unchecked_account2": 144,
-        "unchecked_account4": 144,
-        "unchecked_account8": 144
+        "account_info1": 46,
+        "account_info2": 80,
+        "account_info4": 80,
+        "account_info8": 80,
+        "account_empty_init1": 88,
+        "account_empty_init2": 88,
+        "account_empty_init4": 88,
+        "account_empty_init8": 88,
+        "account_empty1": 88,
+        "account_empty2": 88,
+        "account_empty4": 88,
+        "account_empty8": 88,
+        "account_sized_init1": 88,
+        "account_sized_init2": 88,
+        "account_sized_init4": 88,
+        "account_sized_init8": 88,
+        "account_sized1": 88,
+        "account_sized2": 88,
+        "account_sized4": 88,
+        "account_sized8": 88,
+        "account_unsized_init1": 88,
+        "account_unsized_init2": 88,
+        "account_unsized_init4": 88,
+        "account_unsized_init8": 88,
+        "account_unsized1": 88,
+        "account_unsized2": 88,
+        "account_unsized4": 88,
+        "account_unsized8": 88,
+        "boxed_account_empty_init1": 88,
+        "boxed_account_empty_init2": 88,
+        "boxed_account_empty_init4": 88,
+        "boxed_account_empty_init8": 88,
+        "boxed_account_empty1": 88,
+        "boxed_account_empty2": 88,
+        "boxed_account_empty4": 88,
+        "boxed_account_empty8": 88,
+        "boxed_account_sized_init1": 88,
+        "boxed_account_sized_init2": 88,
+        "boxed_account_sized_init4": 88,
+        "boxed_account_sized_init8": 88,
+        "boxed_account_sized1": 88,
+        "boxed_account_sized2": 88,
+        "boxed_account_sized4": 88,
+        "boxed_account_sized8": 88,
+        "boxed_account_unsized_init1": 88,
+        "boxed_account_unsized_init2": 88,
+        "boxed_account_unsized_init4": 88,
+        "boxed_account_unsized_init8": 88,
+        "boxed_account_unsized1": 88,
+        "boxed_account_unsized2": 88,
+        "boxed_account_unsized4": 88,
+        "boxed_account_unsized8": 88,
+        "boxed_interface_account_mint1": 88,
+        "boxed_interface_account_mint2": 88,
+        "boxed_interface_account_mint4": 88,
+        "boxed_interface_account_mint8": 88,
+        "boxed_interface_account_token1": 88,
+        "boxed_interface_account_token2": 88,
+        "boxed_interface_account_token4": 88,
+        "boxed_interface_account_token8": 88,
+        "interface_account_mint1": 88,
+        "interface_account_mint2": 88,
+        "interface_account_mint4": 88,
+        "interface_account_mint8": 88,
+        "interface_account_token1": 80,
+        "interface_account_token2": 80,
+        "interface_account_token4": 80,
+        "interface1": 88,
+        "interface2": 88,
+        "interface4": 88,
+        "interface8": 88,
+        "program1": 88,
+        "program2": 88,
+        "program4": 88,
+        "program8": 88,
+        "signer1": 88,
+        "signer2": 88,
+        "signer4": 88,
+        "signer8": 88,
+        "system_account1": 88,
+        "system_account2": 88,
+        "system_account4": 88,
+        "system_account8": 88,
+        "unchecked_account1": 88,
+        "unchecked_account2": 88,
+        "unchecked_account4": 88,
+        "unchecked_account8": 88
       }
     }
   }