From c66b3232938186623c535cec8deba6b98353420b Mon Sep 17 00:00:00 2001
From: acheron <98934430+acheroncrypto@users.noreply.github.com>
Date: Thu, 28 Mar 2024 05:52:24 +0100
Subject: [PATCH] Upgrade Solana to 1.18.8 (#2867)

---
 .github/workflows/no-caching-tests.yaml       |   2 +-
 .github/workflows/tests.yaml                  |   2 +-
 CHANGELOG.md                                  |   1 +
 Cargo.lock                                    | 829 +++++++++++-------
 bench/BINARY_SIZE.md                          |  10 +-
 bench/COMPUTE_UNITS.md                        | 182 ++--
 bench/STACK_MEMORY.md                         | 182 ++--
 cli/Cargo.toml                                |  10 +-
 client/Cargo.toml                             |   6 +-
 client/example/Cargo.toml                     |   2 +-
 docker/Makefile                               |   2 +-
 lang/Cargo.toml                               |   5 +-
 setup-tests.sh                                |   4 +-
 spl/Cargo.toml                                |   2 +-
 tests/bench/bench.json                        | 332 +++----
 tests/bench/tests/stack-memory.ts             |   2 +-
 tests/escrow/Anchor.toml                      |   8 -
 tests/spl/token-proxy/Anchor.toml             |   8 -
 tests/spl/token-wrapper/Anchor.toml           |   8 -
 tests/spl/transfer-hook/Anchor.toml           |   8 -
 tests/zero-copy/programs/zero-copy/Cargo.toml |   2 +-
 21 files changed, 880 insertions(+), 727 deletions(-)

diff --git a/.github/workflows/no-caching-tests.yaml b/.github/workflows/no-caching-tests.yaml
index 18afdba6a..bb997e91b 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: 1.17.0
+      solana_cli_version: 1.18.8
       solang_version: 0.3.2
       node_version: 18.18.0
       cargo_profile: release
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index a0b0d2aaa..870b2acea 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: 1.17.0
+      solana_cli_version: 1.18.8
       solang_version: 0.3.2
       node_version: 18.18.0
       cargo_profile: debug
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4dd181d31..13495e039 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@ The minor version will be incremented upon a breaking change and the patch versi
 - ts: Fix not being able to use numbers in instruction, account, or event names in some cases due to case conversion ([#2824](https://github.com/coral-xyz/anchor/pull/2824)).
 - cli: Fix excessive test validator requests ([#2828](https://github.com/coral-xyz/anchor/pull/2828)).
 - client: Fix `parse_logs_response` to prevent panics when more than 1 outer instruction exists in logs ([#2856](https://github.com/coral-xyz/anchor/pull/2856)).
+- avm, cli: Fix `stdsimd` feature compilation error from `ahash` when installing the CLI using newer Rust versions ([#2867](https://github.com/coral-xyz/anchor/pull/2867)).
 
 ### Breaking
 
diff --git a/Cargo.lock b/Cargo.lock
index 6563e1933..7af9cfec7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -76,9 +76,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.6"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
  "getrandom 0.2.10",
@@ -188,7 +188,7 @@ dependencies = [
  "anchor-idl",
  "anchor-lang",
  "anyhow",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
  "cargo_toml",
  "chrono",
@@ -277,7 +277,6 @@ dependencies = [
 name = "anchor-lang"
 version = "0.29.0"
 dependencies = [
- "ahash 0.8.6",
  "anchor-attribute-access-control",
  "anchor-attribute-account",
  "anchor-attribute-constant",
@@ -289,7 +288,7 @@ dependencies = [
  "anchor-derive-space",
  "anchor-syn",
  "arrayref",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
  "borsh 0.10.3",
  "bytemuck",
@@ -310,7 +309,7 @@ dependencies = [
  "spl-associated-token-account",
  "spl-memo",
  "spl-token 4.0.0",
- "spl-token-2022",
+ "spl-token-2022 0.9.0",
  "toml_edit 0.21.0",
 ]
 
@@ -634,13 +633,13 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.73"
+version = "0.1.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
+checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -705,9 +704,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.4"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64ct"
@@ -747,9 +746,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 dependencies = [
  "serde",
 ]
@@ -822,6 +821,16 @@ dependencies = [
  "hashbrown 0.13.2",
 ]
 
+[[package]]
+name = "borsh"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667"
+dependencies = [
+ "borsh-derive 1.3.1",
+ "cfg_aliases",
+]
+
 [[package]]
 name = "borsh-derive"
 version = "0.9.3"
@@ -848,6 +857,20 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "borsh-derive"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.55",
+ "syn_derive",
+]
+
 [[package]]
 name = "borsh-derive-internal"
 version = "0.9.3"
@@ -946,9 +969,9 @@ dependencies = [
 
 [[package]]
 name = "bytemuck"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
+checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
 dependencies = [
  "bytemuck_derive",
 ]
@@ -961,14 +984,14 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
@@ -1012,6 +1035,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
 [[package]]
 name = "chrono"
 version = "0.4.31"
@@ -1098,7 +1127,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1146,15 +1175,15 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.15.7"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
 dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
  "unicode-width",
- "windows-sys 0.45.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1225,11 +1254,10 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.8"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
 dependencies = [
- "cfg-if",
  "crossbeam-utils",
 ]
 
@@ -1259,12 +1287,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.16"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
-dependencies = [
- "cfg-if",
-]
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "crunchy"
@@ -1336,7 +1361,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.10.0",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1347,17 +1372,20 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
 name = "dashmap"
-version = "4.0.2"
+version = "5.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
  "cfg-if",
- "num_cpus",
+ "hashbrown 0.14.1",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
 ]
 
 [[package]]
@@ -1499,7 +1527,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1522,7 +1550,7 @@ checksum = "a6cbae11b3de8fce2a456e8ea3dada226b35fe791f0dc1d360c0941f0bb681f3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1598,22 +1626,22 @@ dependencies = [
 
 [[package]]
 name = "enum-iterator"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689"
+checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94"
 dependencies = [
  "enum-iterator-derive",
 ]
 
 [[package]]
 name = "enum-iterator-derive"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb"
+checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1740,18 +1768,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
  "percent-encoding",
 ]
 
 [[package]]
 name = "futures"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1764,9 +1792,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1774,15 +1802,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1791,38 +1819,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1949,7 +1977,7 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
- "ahash 0.8.6",
+ "ahash 0.8.11",
 ]
 
 [[package]]
@@ -2133,9 +2161,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
@@ -2169,9 +2197,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.2"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.1",
@@ -2260,9 +2288,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.64"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2327,9 +2355,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.148"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libsecp256k1"
@@ -2381,12 +2409,13 @@ dependencies = [
 
 [[package]]
 name = "light-poseidon"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "949bdd22e4ed93481d45e9a6badb34b99132bcad0c8a8d4f05c42f7dcc7b90bc"
+checksum = "3c9a85a9752c549ceb7578064b4ed891179d20acd85f27318573b64d2d7ee7ee"
 dependencies = [
  "ark-bn254",
  "ark-ff",
+ "num-bigint 0.4.4",
  "thiserror",
 ]
 
@@ -2606,7 +2635,7 @@ checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -2681,11 +2710,11 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb"
+checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
 dependencies = [
- "num_enum_derive 0.7.0",
+ "num_enum_derive 0.7.2",
 ]
 
 [[package]]
@@ -2709,19 +2738,19 @@ dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597"
+checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -2836,9 +2865,9 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "percentage"
@@ -2856,7 +2885,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap 2.0.2",
+ "indexmap 2.2.6",
 ]
 
 [[package]]
@@ -2889,7 +2918,7 @@ dependencies = [
  "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -3004,10 +3033,42 @@ dependencies = [
 ]
 
 [[package]]
-name = "proc-macro2"
-version = "1.0.67"
+name = "proc-macro-crate"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.0",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
 dependencies = [
  "unicode-ident",
 ]
@@ -3029,7 +3090,7 @@ checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -3051,13 +3112,13 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1"
+checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a"
 dependencies = [
  "bytes",
  "rand 0.8.5",
- "ring",
+ "ring 0.16.20",
  "rustc-hash",
  "rustls",
  "rustls-native-certs",
@@ -3075,16 +3136,16 @@ checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7"
 dependencies = [
  "bytes",
  "libc",
- "socket2 0.5.4",
+ "socket2 0.5.6",
  "tracing",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -3171,9 +3232,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
  "either",
  "rayon-core",
@@ -3181,9 +3242,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -3196,7 +3257,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
 dependencies = [
  "pem",
- "ring",
+ "ring 0.16.20",
  "time",
  "yasna",
 ]
@@ -3261,12 +3322,12 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 
 [[package]]
 name = "reqwest"
-version = "0.11.21"
+version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78fdbab6a7e1d7b13cc8ff10197f47986b41c639300cc3c8158cac7847c9bbef"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
  "async-compression",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -3289,6 +3350,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
+ "sync_wrapper",
  "system-configuration",
  "tokio",
  "tokio-rustls",
@@ -3311,21 +3373,36 @@ dependencies = [
  "cc",
  "libc",
  "once_cell",
- "spin",
- "untrusted",
+ "spin 0.5.2",
+ "untrusted 0.7.1",
  "web-sys",
  "winapi",
 ]
 
 [[package]]
-name = "rpassword"
-version = "7.2.0"
+name = "ring"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.10",
+ "libc",
+ "spin 0.9.8",
+ "untrusted 0.9.0",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rpassword"
+version = "7.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f"
 dependencies = [
  "libc",
  "rtoolbox",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -3374,7 +3451,7 @@ version = "0.38.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.5.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -3383,12 +3460,12 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.21.7"
+version = "0.21.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
+checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
 dependencies = [
  "log",
- "ring",
+ "ring 0.17.8",
  "rustls-webpki",
  "sct",
 ]
@@ -3411,17 +3488,17 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
 dependencies = [
- "base64 0.21.4",
+ "base64 0.21.7",
 ]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.101.6"
+version = "0.101.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
 dependencies = [
- "ring",
- "untrusted",
+ "ring 0.17.8",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
@@ -3483,7 +3560,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -3492,8 +3569,8 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
 dependencies = [
- "ring",
- "untrusted",
+ "ring 0.16.20",
+ "untrusted 0.7.1",
 ]
 
 [[package]]
@@ -3521,44 +3598,44 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.19"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0"
+checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
 
 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.12"
+version = "0.11.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff"
+checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.107"
+version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
 dependencies = [
  "itoa",
  "ryu",
@@ -3605,16 +3682,16 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.25"
+version = "0.9.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574"
+checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9"
 dependencies = [
- "indexmap 2.0.2",
+ "indexmap 2.2.6",
  "itoa",
  "ryu",
  "serde",
@@ -3774,22 +3851,22 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.4"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
+checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "solana-account-decoder"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d67ecc499b9cc79c9f34c1bbae2ba3f102d9bfaa78f48ad49d11f433bc4c7b4"
+checksum = "e3b359495f76e0570a3e611e8963f4703828f7516e6577d38d642644ad205c16"
 dependencies = [
  "Inflector",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
  "bs58 0.4.0",
  "bv",
@@ -3800,7 +3877,8 @@ dependencies = [
  "solana-config-program",
  "solana-sdk",
  "spl-token 4.0.0",
- "spl-token-2022",
+ "spl-token-2022 1.0.0",
+ "spl-token-group-interface",
  "spl-token-metadata-interface",
  "thiserror",
  "zstd",
@@ -3808,9 +3886,9 @@ dependencies = [
 
 [[package]]
 name = "solana-clap-utils"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26cf9322dc6cad9902a6a5ef77ad9cd9149b64c757c1ffa536c4243bd7136159"
+checksum = "94d44534a77097037399d613994d521a3bb56ce63d423d77efdb1d4b06666d2d"
 dependencies = [
  "chrono",
  "clap 2.34.0",
@@ -3825,9 +3903,9 @@ dependencies = [
 
 [[package]]
 name = "solana-cli-config"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e3476dc3b63bb2e0da304f10df299b20942ae57054eaed2cc411a5449876bd"
+checksum = "7702ec83f471b3a0daffd7e7f6acbe50f9228f2bb66d1276e32b6ed253d45afb"
 dependencies = [
  "dirs-next",
  "lazy_static",
@@ -3841,16 +3919,16 @@ dependencies = [
 
 [[package]]
 name = "solana-client"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df5d23b030f09ea0a3e0d89d22b453849e33f45a89ef0eeae152a21c58752985"
+checksum = "a55322d541c2147ea979832641ca718651eb7a9284fa25b9d6c4cb21fd6f1850"
 dependencies = [
  "async-trait",
  "bincode",
  "dashmap",
  "futures",
  "futures-util",
- "indexmap 2.0.2",
+ "indexmap 2.2.6",
  "indicatif",
  "log",
  "quinn",
@@ -3874,9 +3952,9 @@ dependencies = [
 
 [[package]]
 name = "solana-config-program"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "117a5204fb9e7982f2058373d3f21b7997846aed4ca562cf6e84aef4c729c75b"
+checksum = "63f328bb6c0a8013218fb71ef31c6524359eae1d328f4ffef4d14e3e7141f84f"
 dependencies = [
  "bincode",
  "chrono",
@@ -3888,15 +3966,15 @@ dependencies = [
 
 [[package]]
 name = "solana-connection-cache"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c2f6c76632ec5d6e59aae8fe13095d27c3ae2af143f6973684856babdcd2da"
+checksum = "bb39f5996aa944722975efe70adb01f91705cf42e0d302eacb868f51d5c92601"
 dependencies = [
  "async-trait",
  "bincode",
  "crossbeam-channel",
  "futures-util",
- "indexmap 2.0.2",
+ "indexmap 2.2.6",
  "log",
  "rand 0.8.5",
  "rayon",
@@ -3910,9 +3988,9 @@ dependencies = [
 
 [[package]]
 name = "solana-faucet"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cd45403c75e5104c79f6875b2326196af76572534c80cfadaed3145ed087aa"
+checksum = "d7b735bf282e23763f94856aec8de91552d1b9d00eed7cb318fadda2775a94d2"
 dependencies = [
  "bincode",
  "byteorder",
@@ -3934,17 +4012,13 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fdc9268b1abba206e1a8a234473eb5f7f7af660a86e4d468e7e79b3e5667aa9"
+checksum = "033e98b727d281cc22381ff703f58b70822b8c32ddb7aca9e7eb3a9c1d465371"
 dependencies = [
- "ahash 0.8.6",
- "blake3",
  "block-buffer 0.10.4",
  "bs58 0.4.0",
  "bv",
- "byteorder",
- "cc",
  "either",
  "generic-array",
  "im",
@@ -3955,7 +4029,6 @@ dependencies = [
  "serde",
  "serde_bytes",
  "serde_derive",
- "serde_json",
  "sha2 0.10.8",
  "solana-frozen-abi-macro",
  "subtle",
@@ -3964,21 +4037,21 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi-macro"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86118cc8437c60d1a474501f6095df880aaac422ab04523a984015c5b7334428"
+checksum = "aab7183079f7a0c0b71454fd365e12bce9a773b8099f6c2a92ba6887c42a9d0f"
 dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
 name = "solana-logger"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "060dcc6a1ee83aa2df01126e0319b17a84d13251b7660fa1e69241e110252779"
+checksum = "7c5559aeadd3adc219fa7169e96a8c5dda618c7f06985f91f2a5f55b9814c7a2"
 dependencies = [
  "env_logger",
  "lazy_static",
@@ -3987,9 +4060,9 @@ dependencies = [
 
 [[package]]
 name = "solana-measure"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a23bcca30fdb20efb5f2d81d61ad9cf1ec0f0141b3bbc095835140db72930f"
+checksum = "041ab11f1e02d4dbe4f45e6854c312ae2518a5cbe3327b767cab2bc9a8fc0740"
 dependencies = [
  "log",
  "solana-sdk",
@@ -3997,9 +4070,9 @@ dependencies = [
 
 [[package]]
 name = "solana-metrics"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2d29f683e800cbfb836ceec63fdbf5f42388c21fdacb2e16160b10be3b08cd"
+checksum = "4aab373e70aa970e62d16ba1e7e21c54519582c57b680fd31d80421aa3a983a1"
 dependencies = [
  "crossbeam-channel",
  "gethostname",
@@ -4012,9 +4085,9 @@ dependencies = [
 
 [[package]]
 name = "solana-net-utils"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "687c740f5b45166666e016ac43cc1001fa5bf9e8f7b9e24cb0a554c6ce35bfd6"
+checksum = "736fc2f0fc5a0948d8cb74152d68733c7a682ff8b8ef8df27e75d164c2ed6969"
 dependencies = [
  "bincode",
  "clap 3.2.25",
@@ -4024,7 +4097,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_derive",
- "socket2 0.5.4",
+ "socket2 0.5.6",
  "solana-logger",
  "solana-sdk",
  "solana-version",
@@ -4034,11 +4107,11 @@ dependencies = [
 
 [[package]]
 name = "solana-perf"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d0b706a083218777c52adbb6138b96c143e06031d41ec9c32cf1da9c352c7c"
+checksum = "80e9a1f74df1265cc43c843367a833cff05b8a1b5467676ae540f479751aab3c"
 dependencies = [
- "ahash 0.8.6",
+ "ahash 0.8.11",
  "bincode",
  "bv",
  "caps",
@@ -4051,7 +4124,10 @@ dependencies = [
  "nix",
  "rand 0.8.5",
  "rayon",
+ "rustc_version",
  "serde",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
  "solana-metrics",
  "solana-rayon-threadlimit",
  "solana-sdk",
@@ -4060,20 +4136,21 @@ dependencies = [
 
 [[package]]
 name = "solana-program"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05c940ad70659c2366331fd136d67cc968acadbc1f6ad13cff9ffe7e392aa831"
+checksum = "0af84e0c085510c9d1660d1f7e50e8b94ec97f27e23e13d960db353d98b55c8a"
 dependencies = [
  "ark-bn254",
  "ark-ec",
  "ark-ff",
  "ark-serialize",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
- "bitflags 2.4.0",
+ "bitflags 2.5.0",
  "blake3",
  "borsh 0.10.3",
  "borsh 0.9.3",
+ "borsh 1.3.1",
  "bs58 0.4.0",
  "bv",
  "bytemuck",
@@ -4091,7 +4168,7 @@ dependencies = [
  "log",
  "memoffset 0.9.0",
  "num-bigint 0.4.4",
- "num-derive 0.3.3",
+ "num-derive 0.4.0",
  "num-traits",
  "parking_lot",
  "rand 0.8.5",
@@ -4114,18 +4191,18 @@ dependencies = [
 
 [[package]]
 name = "solana-program-runtime"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ffcc34819f5b9da3c5ba4045d572e97a60544b8ed49d604ab0a9cc990f875e2"
+checksum = "69c13c6ac710cb7e4325de42e7f382109d0b9d6495942b38d0e4b528a8a9961a"
 dependencies = [
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
  "eager",
  "enum-iterator",
  "itertools 0.10.5",
  "libc",
  "log",
- "num-derive 0.3.3",
+ "num-derive 0.4.0",
  "num-traits",
  "percentage",
  "rand 0.8.5",
@@ -4142,9 +4219,9 @@ dependencies = [
 
 [[package]]
 name = "solana-pubsub-client"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076dbe759e2c86aa5c8b57575d2bd593980bde82b59cb6192261b5d6111dfcd1"
+checksum = "13c0575b3106c15019ad451cc81d5bf328ab07a27e0eadc4af31740b88faf586"
 dependencies = [
  "crossbeam-channel",
  "futures-util",
@@ -4167,9 +4244,9 @@ dependencies = [
 
 [[package]]
 name = "solana-quic-client"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5bbf483ec8e440a80b02ef4aa37d0cb6dc77403dc8dfd1a72bdba90429539a"
+checksum = "1a81e5186b7cf170616579921da3027b6f94f7275153d38e83b9b2be3fb07ac2"
 dependencies = [
  "async-mutex",
  "async-trait",
@@ -4194,9 +4271,9 @@ dependencies = [
 
 [[package]]
 name = "solana-rayon-threadlimit"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f23c92c4fb6a1036b7910fb86fbfbf213fabcb3f0d143e6472511d312e0091e"
+checksum = "881229e01194a0fc5d6115867d2ee5ce0abfb80d53cab3822c4a6bf96210d474"
 dependencies = [
  "lazy_static",
  "num_cpus",
@@ -4204,14 +4281,14 @@ dependencies = [
 
 [[package]]
 name = "solana-remote-wallet"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b7545aa3e2201494e3a1379bb487caa1081786ddf17959ffb819eef9c9202db"
+checksum = "acf5b80ef02505a7cd7e248c25f839ba5669a13595462eac212dde0895d690ad"
 dependencies = [
  "console",
  "dialoguer",
  "log",
- "num-derive 0.3.3",
+ "num-derive 0.4.0",
  "num-traits",
  "parking_lot",
  "qstring",
@@ -4223,12 +4300,12 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-client"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e24f3f022731f854f97fa88190a4bdf4a6a2e11704999ef4882320d7edc4eb"
+checksum = "cbb2a4cace9ef7c02062efdaa54cfefa13c91fa48cc0c827852adadf7e406963"
 dependencies = [
  "async-trait",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
  "bs58 0.4.0",
  "indicatif",
@@ -4249,11 +4326,11 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-client-api"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae82221d8d5d447cdc27355caa54f96f52af195a984f70c7e8fa0d8e4a4b0f3"
+checksum = "adb658d90dca6aece251e0d4288e6e1b06c1b10315abb118032a2e230f8d872f"
 dependencies = [
- "base64 0.21.4",
+ "base64 0.21.7",
  "bs58 0.4.0",
  "jsonrpc-core",
  "reqwest",
@@ -4265,15 +4342,15 @@ dependencies = [
  "solana-sdk",
  "solana-transaction-status",
  "solana-version",
- "spl-token-2022",
+ "spl-token-2022 1.0.0",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-rpc-client-nonce-utils"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0795902effc5404f43a0a54a489f9d84a5c7eb62164234288690a608582ee4a"
+checksum = "bb0d2d0a1b6936a90b1d831a32605118c6f11d7c0dd3b37fb174eab5e1a0b5f3"
 dependencies = [
  "clap 2.34.0",
  "solana-clap-utils",
@@ -4284,15 +4361,15 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3db7ae7c80ba537e4b8c1b4655fda680aa1452c8c955113f985b74b235fc3102"
+checksum = "68caf1d34891521523df18dc3c13ce20d54a59c3a390729450267a4c9aa96017"
 dependencies = [
  "assert_matches",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
- "bitflags 2.4.0",
- "borsh 0.10.3",
+ "bitflags 2.5.0",
+ "borsh 1.3.1",
  "bs58 0.4.0",
  "bytemuck",
  "byteorder",
@@ -4309,9 +4386,9 @@ dependencies = [
  "libsecp256k1",
  "log",
  "memmap2",
- "num-derive 0.3.3",
+ "num-derive 0.4.0",
  "num-traits",
- "num_enum 0.6.1",
+ "num_enum 0.7.2",
  "pbkdf2 0.11.0",
  "qstring",
  "qualifier_attr",
@@ -4326,6 +4403,7 @@ dependencies = [
  "serde_with",
  "sha2 0.10.8",
  "sha3 0.10.8",
+ "siphasher",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
  "solana-logger",
@@ -4338,29 +4416,35 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk-macro"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1da4a7421c09ee4dbf81df06407933d4f68f8990ae87a2feaee6e1b03c97d1d"
+checksum = "5cff24eec74815028ebcffe639cf63ff50fb78dadcbf71a8b95b44e7ad1bb6b2"
 dependencies = [
  "bs58 0.4.0",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
-name = "solana-streamer"
-version = "1.17.0"
+name = "solana-security-txt"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28b4f623d32af2793e7ebdd24bd04f704a77f6a7975cf8204275ebc918d4685"
+checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183"
+
+[[package]]
+name = "solana-streamer"
+version = "1.18.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3af7e0e90d5b6e4aa7182b9f8221fe5a9da4106afc031ac3697a860c2da7c8ac"
 dependencies = [
  "async-channel",
  "bytes",
  "crossbeam-channel",
  "futures-util",
  "histogram",
- "indexmap 2.0.2",
+ "indexmap 2.2.6",
  "itertools 0.10.5",
  "libc",
  "log",
@@ -4383,9 +4467,9 @@ dependencies = [
 
 [[package]]
 name = "solana-thin-client"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ec81c9b19cc3a02e423782758305c63460b664912217e61e273e0105f7dc0b"
+checksum = "5e55c9d6f7970a9e846256bbf57a571ada379fb300ba39958992fbadf5c24ca5"
 dependencies = [
  "bincode",
  "log",
@@ -4398,14 +4482,14 @@ dependencies = [
 
 [[package]]
 name = "solana-tpu-client"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf9e6a85761ebc7be477e95b5787f206e6f64d09d297006881edbe30c99106d0"
+checksum = "fb8859de54d3fbfee458b11536af0f357977044c3b31c9a1154af5c8874ae485"
 dependencies = [
  "async-trait",
  "bincode",
  "futures-util",
- "indexmap 2.0.2",
+ "indexmap 2.2.6",
  "indicatif",
  "log",
  "rayon",
@@ -4422,12 +4506,12 @@ dependencies = [
 
 [[package]]
 name = "solana-transaction-status"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2eaba311b1be47ae8a1ed8d082d2c35cd89a39c5daf73514668c735574d4ecd"
+checksum = "c2be62abd39aad39d5377e3ad4f1af7fc7e12577edb0d6ac6405f533f9ce74e7"
 dependencies = [
  "Inflector",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
  "borsh 0.10.3",
  "bs58 0.4.0",
@@ -4441,15 +4525,15 @@ dependencies = [
  "spl-associated-token-account",
  "spl-memo",
  "spl-token 4.0.0",
- "spl-token-2022",
+ "spl-token-2022 1.0.0",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-udp-client"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6f3750d7c9218e2a0e5ad73b62e293a71489c6425e64e98d5315dc64939eee6"
+checksum = "2d67fd02dc01d0e7f06079625aaaa7de9ea86d757e16df3ec76cd6e162a91f23"
 dependencies = [
  "async-trait",
  "solana-connection-cache",
@@ -4462,9 +4546,9 @@ dependencies = [
 
 [[package]]
 name = "solana-version"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19dc9876647351f50ac415afcd9bc8ea3892883a077cd240f84490a0670ab021"
+checksum = "26db373e381b715773164fb9ae47a89f56bbb6fb50469b1b970134d5c6f6ce4d"
 dependencies = [
  "log",
  "rustc_version",
@@ -4478,13 +4562,13 @@ dependencies = [
 
 [[package]]
 name = "solana-vote-program"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "480b27798516d7065b358f3ec056b2ede79e0dc8406a9697c6028f289a09398d"
+checksum = "6c579e4599523cefa128db4075d0fc7b1177434b23ac4f72140a394dd4b4f648"
 dependencies = [
  "bincode",
  "log",
- "num-derive 0.3.3",
+ "num-derive 0.4.0",
  "num-traits",
  "rustc_version",
  "serde",
@@ -4500,12 +4584,12 @@ dependencies = [
 
 [[package]]
 name = "solana-zk-token-sdk"
-version = "1.17.0"
+version = "1.18.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8690fff97c3cb2acfdb49d126f8b958736884f58bd1c7fd2230984f132095f05"
+checksum = "09a78337e50d3ed0b8a6e521969c0e81dfa3649f4d718e88a7e9a0d04ca0d0e0"
 dependencies = [
  "aes-gcm-siv",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bincode",
  "bytemuck",
  "byteorder",
@@ -4514,7 +4598,7 @@ dependencies = [
  "itertools 0.10.5",
  "lazy_static",
  "merlin",
- "num-derive 0.3.3",
+ "num-derive 0.4.0",
  "num-traits",
  "rand 0.7.3",
  "serde",
@@ -4529,9 +4613,9 @@ dependencies = [
 
 [[package]]
 name = "solana_rbpf"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "103318aa365ff7caa8cf534f2246b5eb7e5b34668736d52b1266b143f7a21196"
+checksum = "3d457cc2ba742c120492a64b7fa60e22c575e891f6b55039f4d736568fb112a3"
 dependencies = [
  "byteorder",
  "combine",
@@ -4566,6 +4650,12 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
 [[package]]
 name = "spki"
 version = "0.5.4"
@@ -4578,9 +4668,9 @@ dependencies = [
 
 [[package]]
 name = "spl-associated-token-account"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "385e31c29981488f2820b2022d8e731aae3b02e6e18e2fd854e4c9a94dc44fc3"
+checksum = "992d9c64c2564cc8f63a4b508bf3ebcdf2254b0429b13cd1d31adb6162432a5f"
 dependencies = [
  "assert_matches",
  "borsh 0.10.3",
@@ -4588,7 +4678,7 @@ dependencies = [
  "num-traits",
  "solana-program",
  "spl-token 4.0.0",
- "spl-token-2022",
+ "spl-token-2022 1.0.0",
  "thiserror",
 ]
 
@@ -4611,7 +4701,7 @@ checksum = "fadbefec4f3c678215ca72bd71862697bb06b41fd77c0088902dd3203354387b"
 dependencies = [
  "quote",
  "spl-discriminator-syn",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -4623,7 +4713,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sha2 0.10.8",
- "syn 2.0.37",
+ "syn 2.0.55",
  "thiserror",
 ]
 
@@ -4671,7 +4761,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sha2 0.10.8",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -4688,6 +4778,20 @@ dependencies = [
  "spl-type-length-value",
 ]
 
+[[package]]
+name = "spl-tlv-account-resolution"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "615d381f48ddd2bb3c57c7f7fb207591a2a05054639b18a62e785117dd7a8683"
+dependencies = [
+ "bytemuck",
+ "solana-program",
+ "spl-discriminator",
+ "spl-pod",
+ "spl-program-error",
+ "spl-type-length-value",
+]
+
 [[package]]
 name = "spl-token"
 version = "3.5.0"
@@ -4728,18 +4832,55 @@ dependencies = [
  "bytemuck",
  "num-derive 0.4.0",
  "num-traits",
- "num_enum 0.7.0",
+ "num_enum 0.7.2",
  "solana-program",
  "solana-zk-token-sdk",
  "spl-memo",
  "spl-pod",
  "spl-token 4.0.0",
  "spl-token-metadata-interface",
- "spl-transfer-hook-interface",
+ "spl-transfer-hook-interface 0.3.0",
  "spl-type-length-value",
  "thiserror",
 ]
 
+[[package]]
+name = "spl-token-2022"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d697fac19fd74ff472dfcc13f0b442dd71403178ce1de7b5d16f83a33561c059"
+dependencies = [
+ "arrayref",
+ "bytemuck",
+ "num-derive 0.4.0",
+ "num-traits",
+ "num_enum 0.7.2",
+ "solana-program",
+ "solana-security-txt",
+ "solana-zk-token-sdk",
+ "spl-memo",
+ "spl-pod",
+ "spl-token 4.0.0",
+ "spl-token-group-interface",
+ "spl-token-metadata-interface",
+ "spl-transfer-hook-interface 0.4.1",
+ "spl-type-length-value",
+ "thiserror",
+]
+
+[[package]]
+name = "spl-token-group-interface"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d"
+dependencies = [
+ "bytemuck",
+ "solana-program",
+ "spl-discriminator",
+ "spl-pod",
+ "spl-program-error",
+]
+
 [[package]]
 name = "spl-token-metadata-interface"
 version = "0.2.0"
@@ -4766,7 +4907,23 @@ dependencies = [
  "spl-discriminator",
  "spl-pod",
  "spl-program-error",
- "spl-tlv-account-resolution",
+ "spl-tlv-account-resolution 0.4.0",
+ "spl-type-length-value",
+]
+
+[[package]]
+name = "spl-transfer-hook-interface"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259"
+dependencies = [
+ "arrayref",
+ "bytemuck",
+ "solana-program",
+ "spl-discriminator",
+ "spl-pod",
+ "spl-program-error",
+ "spl-tlv-account-resolution 0.5.1",
  "spl-type-length-value",
 ]
 
@@ -4833,15 +4990,33 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.37"
+version = "2.0.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
+checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "syn_derive"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.55",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
 [[package]]
 name = "synstructure"
 version = "0.12.6"
@@ -4936,22 +5111,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.49"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.49"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -5039,7 +5214,7 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.4",
+ "socket2 0.5.6",
  "tokio-macros",
  "windows-sys 0.48.0",
 ]
@@ -5052,7 +5227,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -5153,7 +5328,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.0.2",
+ "indexmap 2.2.6",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -5166,7 +5341,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
 dependencies = [
- "indexmap 2.0.2",
+ "indexmap 2.2.6",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -5179,7 +5354,7 @@ version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
 dependencies = [
- "indexmap 2.0.2",
+ "indexmap 2.2.6",
  "toml_datetime",
  "winnow",
 ]
@@ -5211,7 +5386,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -5325,9 +5500,9 @@ dependencies = [
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.9"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
 [[package]]
 name = "unsize"
@@ -5344,6 +5519,12 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
 [[package]]
 name = "uriparse"
 version = "0.6.4"
@@ -5356,9 +5537,9 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -5428,9 +5609,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.87"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -5438,16 +5619,16 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.87"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
  "wasm-bindgen-shared",
 ]
 
@@ -5465,9 +5646,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.87"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5475,22 +5656,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.87"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.87"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "web-sys"
@@ -5557,15 +5738,6 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -5576,18 +5748,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-targets"
-version = "0.42.2"
+name = "windows-sys"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -5606,10 +5772,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
+name = "windows-targets"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.4",
+ "windows_aarch64_msvc 0.52.4",
+ "windows_i686_gnu 0.52.4",
+ "windows_i686_msvc 0.52.4",
+ "windows_x86_64_gnu 0.52.4",
+ "windows_x86_64_gnullvm 0.52.4",
+ "windows_x86_64_msvc 0.52.4",
+]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
@@ -5618,10 +5793,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
+name = "windows_aarch64_gnullvm"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -5630,10 +5805,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
+name = "windows_aarch64_msvc"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -5642,10 +5817,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
+name = "windows_i686_gnu"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -5654,10 +5829,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
+name = "windows_i686_msvc"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -5666,10 +5841,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
+name = "windows_x86_64_gnu"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -5678,10 +5853,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
+name = "windows_x86_64_gnullvm"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -5689,6 +5864,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+
 [[package]]
 name = "winnow"
 version = "0.5.15"
@@ -5771,7 +5952,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -5791,7 +5972,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.55",
 ]
 
 [[package]]
diff --git a/bench/BINARY_SIZE.md b/bench/BINARY_SIZE.md
index ef3655416..2ee55511b 100644
--- a/bench/BINARY_SIZE.md
+++ b/bench/BINARY_SIZE.md
@@ -14,14 +14,16 @@ The programs and their tests are located in [/tests/bench](https://github.com/co
 
 ## [Unreleased]
 
-Solana version: 1.17.0
+Solana version: 1.18.8
 
-| Program | Binary Size | -                   |
-| ------- | ----------- | ------------------- |
-| bench   | 743,208     | 🔴 **+152 (0.02%)** |
+| Program | Binary Size | -                      |
+| ------- | ----------- | ---------------------- |
+| bench   | 791,008     | 🔴 **+47,952 (6.45%)** |
 
 ### Notable changes
 
+- Upgrade Solana to `1.18.8` ([#2867](https://github.com/coral-xyz/anchor/pull/2867)).
+
 ---
 
 ## [0.29.0]
diff --git a/bench/COMPUTE_UNITS.md b/bench/COMPUTE_UNITS.md
index 9c969678b..b6a3b6964 100644
--- a/bench/COMPUTE_UNITS.md
+++ b/bench/COMPUTE_UNITS.md
@@ -14,100 +14,102 @@ The programs and their tests are located in [/tests/bench](https://github.com/co
 
 ## [Unreleased]
 
-Solana version: 1.17.0
+Solana version: 1.18.8
 
-| Instruction                 | Compute Units | -   |
-| --------------------------- | ------------- | --- |
-| accountInfo1                | 695           | -   |
-| accountInfo2                | 1,035         | -   |
-| accountInfo4                | 1,730         | -   |
-| accountInfo8                | 3,342         | -   |
-| accountEmptyInit1           | 5,552         | -   |
-| accountEmpty1               | 819           | -   |
-| accountEmptyInit2           | 10,421        | -   |
-| accountEmpty2               | 1,275         | -   |
-| accountEmptyInit4           | 19,803        | -   |
-| accountEmpty4               | 2,177         | -   |
-| accountEmptyInit8           | 38,609        | -   |
-| accountEmpty8               | 3,990         | -   |
-| accountSizedInit1           | 5,647         | -   |
-| accountSized1               | 843           | -   |
-| accountSizedInit2           | 10,607        | -   |
-| accountSized2               | 1,317         | -   |
-| accountSizedInit4           | 20,225        | -   |
-| accountSized4               | 2,274         | -   |
-| accountSizedInit8           | 39,376        | -   |
-| accountSized8               | 4,185         | -   |
-| accountUnsizedInit1         | 5,740         | -   |
-| accountUnsized1             | 870           | -   |
-| accountUnsizedInit2         | 10,856        | -   |
-| accountUnsized2             | 1,379         | -   |
-| accountUnsizedInit4         | 20,652        | -   |
-| accountUnsized4             | 2,411         | -   |
-| accountUnsizedInit8         | 39,969        | -   |
-| accountUnsized8             | 4,478         | -   |
-| boxedAccountEmptyInit1      | 5,605         | -   |
-| boxedAccountEmpty1          | 856           | -   |
-| boxedAccountEmptyInit2      | 10,522        | -   |
-| boxedAccountEmpty2          | 1,347         | -   |
-| boxedAccountEmptyInit4      | 20,002        | -   |
-| boxedAccountEmpty4          | 2,324         | -   |
-| boxedAccountEmptyInit8      | 39,002        | -   |
-| boxedAccountEmpty8          | 4,311         | -   |
-| boxedAccountSizedInit1      | 5,686         | -   |
-| boxedAccountSized1          | 878           | -   |
-| boxedAccountSizedInit2      | 10,690        | -   |
-| boxedAccountSized2          | 1,394         | -   |
-| boxedAccountSizedInit4      | 20,338        | -   |
-| boxedAccountSized4          | 2,413         | -   |
-| boxedAccountSizedInit8      | 39,670        | -   |
-| boxedAccountSized8          | 4,493         | -   |
-| boxedAccountUnsizedInit1    | 5,774         | -   |
-| boxedAccountUnsized1        | 908           | -   |
-| boxedAccountUnsizedInit2    | 10,866        | -   |
-| boxedAccountUnsized2        | 1,457         | -   |
-| boxedAccountUnsizedInit4    | 20,688        | -   |
-| boxedAccountUnsized4        | 2,546         | -   |
-| boxedAccountUnsizedInit8    | 40,375        | -   |
-| boxedAccountUnsized8        | 4,759         | -   |
-| boxedInterfaceAccountMint1  | 2,196         | -   |
-| boxedInterfaceAccountMint2  | 3,847         | -   |
-| boxedInterfaceAccountMint4  | 7,132         | -   |
-| boxedInterfaceAccountMint8  | 13,743        | -   |
-| boxedInterfaceAccountToken1 | 2,126         | -   |
-| boxedInterfaceAccountToken2 | 3,706         | -   |
-| boxedInterfaceAccountToken4 | 6,853         | -   |
-| boxedInterfaceAccountToken8 | 13,184        | -   |
-| interfaceAccountMint1       | 2,285         | -   |
-| interfaceAccountMint2       | 4,178         | -   |
-| interfaceAccountMint4       | 7,964         | -   |
-| interfaceAccountMint8       | 15,538        | -   |
-| interfaceAccountToken1      | 2,212         | -   |
-| interfaceAccountToken2      | 4,030         | -   |
-| interfaceAccountToken4      | 7,663         | -   |
-| interface1                  | 741           | -   |
-| interface2                  | 934           | -   |
-| interface4                  | 1,315         | -   |
-| interface8                  | 2,086         | -   |
-| program1                    | 741           | -   |
-| program2                    | 934           | -   |
-| program4                    | 1,317         | -   |
-| program8                    | 2,086         | -   |
-| signer1                     | 675           | -   |
-| signer2                     | 987           | -   |
-| signer4                     | 1,606         | -   |
-| signer8                     | 2,846         | -   |
-| systemAccount1              | 729           | -   |
-| systemAccount2              | 1,093         | -   |
-| systemAccount4              | 1,817         | -   |
-| systemAccount8              | 3,271         | -   |
-| uncheckedAccount1           | 657           | -   |
-| uncheckedAccount2           | 949           | -   |
-| uncheckedAccount4           | 1,526         | -   |
-| uncheckedAccount8           | 2,688         | -   |
+| Instruction                 | Compute Units | -                      |
+| --------------------------- | ------------- | ---------------------- |
+| accountInfo1                | 601           | 🟢 **-94 (13.53%)**    |
+| accountInfo2                | 923           | 🟢 **-112 (10.82%)**   |
+| accountInfo4                | 1,583         | 🟢 **-147 (8.50%)**    |
+| accountInfo8                | 2,975         | 🟢 **-367 (10.98%)**   |
+| accountEmptyInit1           | 5,034         | 🟢 **-518 (9.33%)**    |
+| accountEmpty1               | 652           | 🟢 **-167 (20.39%)**   |
+| accountEmptyInit2           | 9,687         | 🟢 **-734 (7.04%)**    |
+| accountEmpty2               | 1,016         | 🟢 **-259 (20.31%)**   |
+| accountEmptyInit4           | 18,501        | 🟢 **-1,302 (6.57%)**  |
+| accountEmpty4               | 1,737         | 🟢 **-440 (20.21%)**   |
+| accountEmptyInit8           | 36,169        | 🟢 **-2,440 (6.32%)**  |
+| accountEmpty8               | 3,186         | 🟢 **-804 (20.15%)**   |
+| accountSizedInit1           | 5,106         | 🟢 **-541 (9.58%)**    |
+| accountSized1               | 668           | 🟢 **-175 (20.76%)**   |
+| accountSizedInit2           | 9,828         | 🟢 **-779 (7.34%)**    |
+| accountSized2               | 1,046         | 🟢 **-271 (20.58%)**   |
+| accountSizedInit4           | 18,837        | 🟢 **-1,388 (6.86%)**  |
+| accountSized4               | 1,807         | 🟢 **-467 (20.54%)**   |
+| accountSizedInit8           | 36,761        | 🟢 **-2,615 (6.64%)**  |
+| accountSized8               | 3,326         | 🟢 **-859 (20.53%)**   |
+| accountUnsizedInit1         | 5,199         | 🟢 **-541 (9.43%)**    |
+| accountUnsized1             | 702           | 🟢 **-168 (19.31%)**   |
+| accountUnsizedInit2         | 10,078        | 🟢 **-778 (7.17%)**    |
+| accountUnsized2             | 1,116         | 🟢 **-263 (19.07%)**   |
+| accountUnsizedInit4         | 19,259        | 🟢 **-1,393 (6.75%)**  |
+| accountUnsized4             | 1,953         | 🟢 **-458 (19.00%)**   |
+| accountUnsizedInit8         | 37,331        | 🟢 **-2,638 (6.60%)**  |
+| accountUnsized8             | 3,626         | 🟢 **-852 (19.03%)**   |
+| boxedAccountEmptyInit1      | 5,064         | 🟢 **-541 (9.65%)**    |
+| boxedAccountEmpty1          | 671           | 🟢 **-185 (21.61%)**   |
+| boxedAccountEmptyInit2      | 9,721         | 🟢 **-801 (7.61%)**    |
+| boxedAccountEmpty2          | 1,052         | 🟢 **-295 (21.90%)**   |
+| boxedAccountEmptyInit4      | 18,582        | 🟢 **-1,420 (7.10%)**  |
+| boxedAccountEmpty4          | 1,811         | 🟢 **-513 (22.07%)**   |
+| boxedAccountEmptyInit8      | 36,329        | 🟢 **-2,673 (6.85%)**  |
+| boxedAccountEmpty8          | 3,357         | 🟢 **-954 (22.13%)**   |
+| boxedAccountSizedInit1      | 5,119         | 🟢 **-567 (9.97%)**    |
+| boxedAccountSized1          | 686           | 🟢 **-192 (21.87%)**   |
+| boxedAccountSizedInit2      | 9,845         | 🟢 **-845 (7.90%)**    |
+| boxedAccountSized2          | 1,085         | 🟢 **-309 (22.17%)**   |
+| boxedAccountSizedInit4      | 18,825        | 🟢 **-1,513 (7.44%)**  |
+| boxedAccountSized4          | 1,874         | 🟢 **-539 (22.34%)**   |
+| boxedAccountSizedInit8      | 36,824        | 🟢 **-2,846 (7.17%)**  |
+| boxedAccountSized8          | 3,490         | 🟢 **-1,003 (22.32%)** |
+| boxedAccountUnsizedInit1    | 5,207         | 🟢 **-567 (9.82%)**    |
+| boxedAccountUnsized1        | 721           | 🟢 **-187 (20.59%)**   |
+| boxedAccountUnsizedInit2    | 10,015        | 🟢 **-851 (7.83%)**    |
+| boxedAccountUnsized2        | 1,157         | 🟢 **-300 (20.59%)**   |
+| boxedAccountUnsizedInit4    | 19,160        | 🟢 **-1,528 (7.39%)**  |
+| boxedAccountUnsized4        | 2,019         | 🟢 **-527 (20.70%)**   |
+| boxedAccountUnsizedInit8    | 37,496        | 🟢 **-2,879 (7.13%)**  |
+| boxedAccountUnsized8        | 3,776         | 🟢 **-983 (20.66%)**   |
+| boxedInterfaceAccountMint1  | 1,503         | 🟢 **-693 (31.56%)**   |
+| boxedInterfaceAccountMint2  | 2,555         | 🟢 **-1,292 (33.58%)** |
+| boxedInterfaceAccountMint4  | 4,645         | 🟢 **-2,487 (34.87%)** |
+| boxedInterfaceAccountMint8  | 8,859         | 🟢 **-4,884 (35.54%)** |
+| boxedInterfaceAccountToken1 | 2,285         | 🔴 **+159 (7.48%)**    |
+| boxedInterfaceAccountToken2 | 4,118         | 🔴 **+412 (11.12%)**   |
+| boxedInterfaceAccountToken4 | 7,774         | 🔴 **+921 (13.44%)**   |
+| boxedInterfaceAccountToken8 | 15,116        | 🔴 **+1,932 (14.65%)** |
+| interfaceAccountMint1       | 1,603         | 🟢 **-682 (29.85%)**   |
+| interfaceAccountMint2       | 2,893         | 🟢 **-1,285 (30.76%)** |
+| interfaceAccountMint4       | 5,475         | 🟢 **-2,489 (31.25%)** |
+| interfaceAccountMint8       | 10,636        | 🟢 **-4,902 (31.55%)** |
+| interfaceAccountToken1      | 2,359         | 🔴 **+147 (6.65%)**    |
+| interfaceAccountToken2      | 4,386         | 🔴 **+356 (8.83%)**    |
+| interfaceAccountToken4      | 8,437         | 🔴 **+774 (10.10%)**   |
+| interface1                  | 600           | 🟢 **-141 (19.03%)**   |
+| interface2                  | 745           | 🟢 **-189 (20.24%)**   |
+| interface4                  | 1,033         | 🟢 **-282 (21.44%)**   |
+| interface8                  | 1,616         | 🟢 **-470 (22.53%)**   |
+| program1                    | 596           | 🟢 **-145 (19.57%)**   |
+| program2                    | 737           | 🟢 **-197 (21.09%)**   |
+| program4                    | 1,019         | 🟢 **-298 (22.63%)**   |
+| program8                    | 1,584         | 🟢 **-502 (24.07%)**   |
+| signer1                     | 580           | 🟢 **-95 (14.07%)**    |
+| signer2                     | 872           | 🟢 **-115 (11.65%)**   |
+| signer4                     | 1,454         | 🟢 **-152 (9.46%)**    |
+| signer8                     | 2,618         | 🟢 **-228 (8.01%)**    |
+| systemAccount1              | 592           | 🟢 **-137 (18.79%)**   |
+| systemAccount2              | 894           | 🟢 **-199 (18.21%)**   |
+| systemAccount4              | 1,497         | 🟢 **-320 (17.61%)**   |
+| systemAccount8              | 2,707         | 🟢 **-564 (17.24%)**   |
+| uncheckedAccount1           | 563           | 🟢 **-94 (14.31%)**    |
+| uncheckedAccount2           | 836           | 🟢 **-113 (11.91%)**   |
+| uncheckedAccount4           | 1,378         | 🟢 **-148 (9.70%)**    |
+| uncheckedAccount8           | 2,468         | 🟢 **-220 (8.18%)**    |
 
 ### Notable changes
 
+- Upgrade Solana to `1.18.8` ([#2867](https://github.com/coral-xyz/anchor/pull/2867)).
+
 ---
 
 ## [0.29.0]
diff --git a/bench/STACK_MEMORY.md b/bench/STACK_MEMORY.md
index 986631d50..ec57a49ca 100644
--- a/bench/STACK_MEMORY.md
+++ b/bench/STACK_MEMORY.md
@@ -14,100 +14,102 @@ The programs and their tests are located in [/tests/bench](https://github.com/co
 
 ## [Unreleased]
 
-Solana version: 1.17.0
+Solana version: 1.18.8
 
-| Instruction                    | Stack Memory | -   |
-| ------------------------------ | ------------ | --- |
-| account_info1                  | 128          | -   |
-| account_info2                  | 128          | -   |
-| account_info4                  | 128          | -   |
-| account_info8                  | 128          | -   |
-| account_empty_init1            | 176          | -   |
-| account_empty_init2            | 208          | -   |
-| account_empty_init4            | 208          | -   |
-| account_empty_init8            | 240          | -   |
-| account_empty1                 | 128          | -   |
-| account_empty2                 | 128          | -   |
-| account_empty4                 | 128          | -   |
-| account_empty8                 | 128          | -   |
-| account_sized_init1            | 208          | -   |
-| account_sized_init2            | 256          | -   |
-| account_sized_init4            | 240          | -   |
-| account_sized_init8            | 304          | -   |
-| account_sized1                 | 128          | -   |
-| account_sized2                 | 128          | -   |
-| account_sized4                 | 128          | -   |
-| account_sized8                 | 128          | -   |
-| account_unsized_init1          | 224          | -   |
-| account_unsized_init2          | 296          | -   |
-| account_unsized_init4          | 304          | -   |
-| account_unsized_init8          | 432          | -   |
-| account_unsized1               | 128          | -   |
-| account_unsized2               | 144          | -   |
-| account_unsized4               | 128          | -   |
-| account_unsized8               | 128          | -   |
-| boxed_account_empty_init1      | 176          | -   |
-| boxed_account_empty_init2      | 208          | -   |
-| boxed_account_empty_init4      | 208          | -   |
-| boxed_account_empty_init8      | 240          | -   |
-| boxed_account_empty1           | 128          | -   |
-| boxed_account_empty2           | 128          | -   |
-| boxed_account_empty4           | 144          | -   |
-| boxed_account_empty8           | 144          | -   |
-| boxed_account_sized_init1      | 176          | -   |
-| boxed_account_sized_init2      | 208          | -   |
-| boxed_account_sized_init4      | 208          | -   |
-| boxed_account_sized_init8      | 240          | -   |
-| boxed_account_sized1           | 128          | -   |
-| boxed_account_sized2           | 128          | -   |
-| boxed_account_sized4           | 144          | -   |
-| boxed_account_sized8           | 144          | -   |
-| boxed_account_unsized_init1    | 176          | -   |
-| boxed_account_unsized_init2    | 208          | -   |
-| boxed_account_unsized_init4    | 208          | -   |
-| boxed_account_unsized_init8    | 240          | -   |
-| boxed_account_unsized1         | 128          | -   |
-| boxed_account_unsized2         | 144          | -   |
-| boxed_account_unsized4         | 128          | -   |
-| boxed_account_unsized8         | 128          | -   |
-| boxed_interface_account_mint1  | 128          | -   |
-| boxed_interface_account_mint2  | 128          | -   |
-| boxed_interface_account_mint4  | 144          | -   |
-| boxed_interface_account_mint8  | 144          | -   |
-| boxed_interface_account_token1 | 128          | -   |
-| boxed_interface_account_token2 | 128          | -   |
-| boxed_interface_account_token4 | 144          | -   |
-| boxed_interface_account_token8 | 144          | -   |
-| interface_account_mint1        | 128          | -   |
-| interface_account_mint2        | 128          | -   |
-| interface_account_mint4        | 128          | -   |
-| interface_account_mint8        | 128          | -   |
-| interface_account_token1       | 128          | -   |
-| interface_account_token2       | 128          | -   |
-| interface_account_token4       | 128          | -   |
-| interface1                     | 128          | -   |
-| interface2                     | 128          | -   |
-| interface4                     | 128          | -   |
-| interface8                     | 128          | -   |
-| program1                       | 128          | -   |
-| program2                       | 128          | -   |
-| program4                       | 128          | -   |
-| program8                       | 128          | -   |
-| signer1                        | 128          | -   |
-| signer2                        | 128          | -   |
-| signer4                        | 128          | -   |
-| signer8                        | 128          | -   |
-| system_account1                | 128          | -   |
-| system_account2                | 128          | -   |
-| system_account4                | 128          | -   |
-| system_account8                | 128          | -   |
-| unchecked_account1             | 128          | -   |
-| unchecked_account2             | 128          | -   |
-| unchecked_account4             | 128          | -   |
-| unchecked_account8             | 128          | -   |
+| Instruction                    | Stack Memory | -                   |
+| ------------------------------ | ------------ | ------------------- |
+| account_info1                  | 144          | 🔴 **+16 (12.50%)** |
+| account_info2                  | 144          | 🔴 **+16 (12.50%)** |
+| account_info4                  | 144          | 🔴 **+16 (12.50%)** |
+| account_info8                  | 144          | 🔴 **+16 (12.50%)** |
+| account_empty_init1            | 144          | 🟢 **-32 (18.18%)** |
+| account_empty_init2            | 144          | 🟢 **-64 (30.77%)** |
+| account_empty_init4            | 192          | 🟢 **-16 (7.69%)**  |
+| account_empty_init8            | 224          | 🟢 **-16 (6.67%)**  |
+| account_empty1                 | 144          | 🔴 **+16 (12.50%)** |
+| account_empty2                 | 144          | 🔴 **+16 (12.50%)** |
+| account_empty4                 | 144          | 🔴 **+16 (12.50%)** |
+| account_empty8                 | 144          | 🔴 **+16 (12.50%)** |
+| account_sized_init1            | 176          | 🟢 **-32 (15.38%)** |
+| account_sized_init2            | 192          | 🟢 **-64 (25.00%)** |
+| account_sized_init4            | 224          | 🟢 **-16 (6.67%)**  |
+| account_sized_init8            | 288          | 🟢 **-16 (5.26%)**  |
+| account_sized1                 | 144          | 🔴 **+16 (12.50%)** |
+| account_sized2                 | 144          | 🔴 **+16 (12.50%)** |
+| account_sized4                 | 144          | 🔴 **+16 (12.50%)** |
+| account_sized8                 | 144          | 🔴 **+16 (12.50%)** |
+| account_unsized_init1          | 192          | 🟢 **-32 (14.29%)** |
+| account_unsized_init2          | 224          | 🟢 **-72 (24.32%)** |
+| account_unsized_init4          | 288          | 🟢 **-16 (5.26%)**  |
+| account_unsized_init8          | 416          | 🟢 **-16 (3.70%)**  |
+| account_unsized1               | 144          | 🔴 **+16 (12.50%)** |
+| account_unsized2               | 144          | -                   |
+| account_unsized4               | 144          | 🔴 **+16 (12.50%)** |
+| account_unsized8               | 144          | 🔴 **+16 (12.50%)** |
+| boxed_account_empty_init1      | 144          | 🟢 **-32 (18.18%)** |
+| boxed_account_empty_init2      | 144          | 🟢 **-64 (30.77%)** |
+| boxed_account_empty_init4      | 192          | 🟢 **-16 (7.69%)**  |
+| boxed_account_empty_init8      | 224          | 🟢 **-16 (6.67%)**  |
+| boxed_account_empty1           | 144          | 🔴 **+16 (12.50%)** |
+| boxed_account_empty2           | 144          | 🔴 **+16 (12.50%)** |
+| boxed_account_empty4           | 144          | -                   |
+| boxed_account_empty8           | 144          | -                   |
+| boxed_account_sized_init1      | 144          | 🟢 **-32 (18.18%)** |
+| boxed_account_sized_init2      | 144          | 🟢 **-64 (30.77%)** |
+| boxed_account_sized_init4      | 192          | 🟢 **-16 (7.69%)**  |
+| boxed_account_sized_init8      | 224          | 🟢 **-16 (6.67%)**  |
+| boxed_account_sized1           | 144          | 🔴 **+16 (12.50%)** |
+| boxed_account_sized2           | 144          | 🔴 **+16 (12.50%)** |
+| boxed_account_sized4           | 144          | -                   |
+| boxed_account_sized8           | 144          | -                   |
+| boxed_account_unsized_init1    | 144          | 🟢 **-32 (18.18%)** |
+| boxed_account_unsized_init2    | 144          | 🟢 **-64 (30.77%)** |
+| boxed_account_unsized_init4    | 192          | 🟢 **-16 (7.69%)**  |
+| boxed_account_unsized_init8    | 224          | 🟢 **-16 (6.67%)**  |
+| boxed_account_unsized1         | 144          | 🔴 **+16 (12.50%)** |
+| boxed_account_unsized2         | 144          | -                   |
+| boxed_account_unsized4         | 144          | 🔴 **+16 (12.50%)** |
+| boxed_account_unsized8         | 144          | 🔴 **+16 (12.50%)** |
+| boxed_interface_account_mint1  | 144          | 🔴 **+16 (12.50%)** |
+| boxed_interface_account_mint2  | 144          | 🔴 **+16 (12.50%)** |
+| boxed_interface_account_mint4  | 144          | -                   |
+| boxed_interface_account_mint8  | 144          | -                   |
+| boxed_interface_account_token1 | 144          | 🔴 **+16 (12.50%)** |
+| boxed_interface_account_token2 | 144          | 🔴 **+16 (12.50%)** |
+| boxed_interface_account_token4 | 144          | -                   |
+| boxed_interface_account_token8 | 144          | -                   |
+| interface_account_mint1        | 144          | 🔴 **+16 (12.50%)** |
+| interface_account_mint2        | 144          | 🔴 **+16 (12.50%)** |
+| interface_account_mint4        | 144          | 🔴 **+16 (12.50%)** |
+| interface_account_mint8        | 144          | 🔴 **+16 (12.50%)** |
+| interface_account_token1       | 144          | 🔴 **+16 (12.50%)** |
+| interface_account_token2       | 144          | 🔴 **+16 (12.50%)** |
+| interface_account_token4       | 144          | 🔴 **+16 (12.50%)** |
+| interface1                     | 144          | 🔴 **+16 (12.50%)** |
+| interface2                     | 144          | 🔴 **+16 (12.50%)** |
+| interface4                     | 144          | 🔴 **+16 (12.50%)** |
+| interface8                     | 144          | 🔴 **+16 (12.50%)** |
+| program1                       | 144          | 🔴 **+16 (12.50%)** |
+| program2                       | 144          | 🔴 **+16 (12.50%)** |
+| program4                       | 144          | 🔴 **+16 (12.50%)** |
+| program8                       | 144          | 🔴 **+16 (12.50%)** |
+| signer1                        | 144          | 🔴 **+16 (12.50%)** |
+| signer2                        | 144          | 🔴 **+16 (12.50%)** |
+| signer4                        | 144          | 🔴 **+16 (12.50%)** |
+| signer8                        | 144          | 🔴 **+16 (12.50%)** |
+| system_account1                | 144          | 🔴 **+16 (12.50%)** |
+| system_account2                | 144          | 🔴 **+16 (12.50%)** |
+| system_account4                | 144          | 🔴 **+16 (12.50%)** |
+| system_account8                | 144          | 🔴 **+16 (12.50%)** |
+| unchecked_account1             | 144          | 🔴 **+16 (12.50%)** |
+| unchecked_account2             | 144          | 🔴 **+16 (12.50%)** |
+| unchecked_account4             | 144          | 🔴 **+16 (12.50%)** |
+| unchecked_account8             | 144          | 🔴 **+16 (12.50%)** |
 
 ### Notable changes
 
+- Upgrade Solana to `1.18.8` ([#2867](https://github.com/coral-xyz/anchor/pull/2867)).
+
 ---
 
 ## [0.29.0]
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 9bf437bbc..9acc0d672 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -36,11 +36,11 @@ semver = "1.0.4"
 serde = { version = "1.0.122", features = ["derive"] }
 serde_json = "1.0"
 shellexpand = "2.1.0"
-solana-client = ">=1.16, <1.18"
-solana-cli-config = ">=1.16, <1.18"
-solana-faucet = ">=1.16, <1.18"
-solana-program = ">=1.16, <1.18"
-solana-sdk = ">=1.16, <1.18"
+solana-client = "1.16"
+solana-cli-config = "1.16"
+solana-faucet = "1.16"
+solana-program = "1.16"
+solana-sdk = "1.16"
 # Pin solang-parser because it may break in a backwards incompatible way in minor versions
 solang-parser = "=0.3.3"
 syn = { version = "1.0.60", features = ["full", "extra-traits"] }
diff --git a/client/Cargo.toml b/client/Cargo.toml
index b92d7c641..14725665d 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -21,9 +21,9 @@ anyhow = "1"
 futures = "0.3"
 regex = "1"
 serde = { version = "1", features = ["derive"] }
-solana-account-decoder = ">=1.16, <1.18"
-solana-client = ">=1.16, <1.18"
-solana-sdk = ">=1.16, <1.18"
+solana-account-decoder = "1.16"
+solana-client = "1.16"
+solana-sdk = "1.16"
 thiserror = "1"
 tokio = { version = "1", features = ["rt", "sync"] }
 url = "2"
diff --git a/client/example/Cargo.toml b/client/example/Cargo.toml
index 99c764952..823f5f991 100644
--- a/client/example/Cargo.toml
+++ b/client/example/Cargo.toml
@@ -20,5 +20,5 @@ events = { path = "../../tests/events/programs/events", features = ["no-entrypoi
 anyhow = "1.0.32"
 clap = { version = "4.2.4", features = ["derive"] }
 shellexpand = "2.1.0"
-solana-sdk = ">=1.16, <1.18"
+solana-sdk = "1.16"
 tokio = { version = "1", features = ["full"] }
diff --git a/docker/Makefile b/docker/Makefile
index 03b713f52..119b4804d 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -6,7 +6,7 @@ ANCHOR_CLI=v0.29.0
 #
 # Solana toolchain.
 #
-SOLANA_CLI=v1.17.0
+SOLANA_CLI=v1.18.8
 #
 # Build version should match the Anchor cli version.
 #
diff --git a/lang/Cargo.toml b/lang/Cargo.toml
index d1c96bd2a..485cb4f48 100644
--- a/lang/Cargo.toml
+++ b/lang/Cargo.toml
@@ -57,11 +57,8 @@ base64 = "0.21"
 bincode = "1"
 borsh = ">=0.9, <0.11"
 bytemuck = "1"
-solana-program = ">=1.16, <1.18"
+solana-program = "1.16"
 thiserror = "1"
 
 # TODO: Remove. This crate has been added to fix a build error with the 1.16.0 release.
 getrandom = { version = "0.2", features = ["custom"] }
-
-# TODO: Remove once https://github.com/solana-labs/solana/issues/33504 is resolved.
-ahash = "=0.8.6"
diff --git a/setup-tests.sh b/setup-tests.sh
index de485982d..eb5fe2b3f 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" != "1.17.0" ]; then
-  solana-install init 1.17.0
+if [ "$active_version" != "1.18.8" ]; then
+  solana-install init 1.18.8
 fi
 
 git submodule update --init --recursive --depth 1
diff --git a/spl/Cargo.toml b/spl/Cargo.toml
index 0e80cd645..74a129d47 100644
--- a/spl/Cargo.toml
+++ b/spl/Cargo.toml
@@ -30,7 +30,7 @@ anchor-lang = { path = "../lang", version = "0.29.0", features = ["derive"] }
 borsh = { version = ">=0.9, <0.11", optional = true }
 mpl-token-metadata = { version = "3.1.0", optional = true }
 serum_dex = { git = "https://github.com/openbook-dex/program/", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true }
-solana-program = ">=1.16, <1.18"
+solana-program = "1.16"
 spl-associated-token-account = { version = "2.2", features = ["no-entrypoint"], optional = true }
 spl-memo = { version = "4", features = ["no-entrypoint"], optional = true }
 spl-token = { version = "4", features = ["no-entrypoint"], optional = true }
diff --git a/tests/bench/bench.json b/tests/bench/bench.json
index 0636ac40c..a96ce8d55 100644
--- a/tests/bench/bench.json
+++ b/tests/bench/bench.json
@@ -558,188 +558,188 @@
     }
   },
   "unreleased": {
-    "solanaVersion": "1.17.0",
+    "solanaVersion": "1.18.8",
     "result": {
       "binarySize": {
-        "bench": 743208
+        "bench": 791008
       },
       "computeUnits": {
-        "accountInfo1": 695,
-        "accountInfo2": 1035,
-        "accountInfo4": 1730,
-        "accountInfo8": 3342,
-        "accountEmptyInit1": 5552,
-        "accountEmpty1": 819,
-        "accountEmptyInit2": 10421,
-        "accountEmpty2": 1275,
-        "accountEmptyInit4": 19803,
-        "accountEmpty4": 2177,
-        "accountEmptyInit8": 38609,
-        "accountEmpty8": 3990,
-        "accountSizedInit1": 5647,
-        "accountSized1": 843,
-        "accountSizedInit2": 10607,
-        "accountSized2": 1317,
-        "accountSizedInit4": 20225,
-        "accountSized4": 2274,
-        "accountSizedInit8": 39376,
-        "accountSized8": 4185,
-        "accountUnsizedInit1": 5740,
-        "accountUnsized1": 870,
-        "accountUnsizedInit2": 10856,
-        "accountUnsized2": 1379,
-        "accountUnsizedInit4": 20652,
-        "accountUnsized4": 2411,
-        "accountUnsizedInit8": 39969,
-        "accountUnsized8": 4478,
-        "boxedAccountEmptyInit1": 5605,
-        "boxedAccountEmpty1": 856,
-        "boxedAccountEmptyInit2": 10522,
-        "boxedAccountEmpty2": 1347,
-        "boxedAccountEmptyInit4": 20002,
-        "boxedAccountEmpty4": 2324,
-        "boxedAccountEmptyInit8": 39002,
-        "boxedAccountEmpty8": 4311,
-        "boxedAccountSizedInit1": 5686,
-        "boxedAccountSized1": 878,
-        "boxedAccountSizedInit2": 10690,
-        "boxedAccountSized2": 1394,
-        "boxedAccountSizedInit4": 20338,
-        "boxedAccountSized4": 2413,
-        "boxedAccountSizedInit8": 39670,
-        "boxedAccountSized8": 4493,
-        "boxedAccountUnsizedInit1": 5774,
-        "boxedAccountUnsized1": 908,
-        "boxedAccountUnsizedInit2": 10866,
-        "boxedAccountUnsized2": 1457,
-        "boxedAccountUnsizedInit4": 20688,
-        "boxedAccountUnsized4": 2546,
-        "boxedAccountUnsizedInit8": 40375,
-        "boxedAccountUnsized8": 4759,
-        "boxedInterfaceAccountMint1": 2196,
-        "boxedInterfaceAccountMint2": 3847,
-        "boxedInterfaceAccountMint4": 7132,
-        "boxedInterfaceAccountMint8": 13743,
-        "boxedInterfaceAccountToken1": 2126,
-        "boxedInterfaceAccountToken2": 3706,
-        "boxedInterfaceAccountToken4": 6853,
-        "boxedInterfaceAccountToken8": 13184,
-        "interfaceAccountMint1": 2285,
-        "interfaceAccountMint2": 4178,
-        "interfaceAccountMint4": 7964,
-        "interfaceAccountMint8": 15538,
-        "interfaceAccountToken1": 2212,
-        "interfaceAccountToken2": 4030,
-        "interfaceAccountToken4": 7663,
-        "interface1": 741,
-        "interface2": 934,
-        "interface4": 1315,
-        "interface8": 2086,
-        "program1": 741,
-        "program2": 934,
-        "program4": 1317,
-        "program8": 2086,
-        "signer1": 675,
-        "signer2": 987,
-        "signer4": 1606,
-        "signer8": 2846,
-        "systemAccount1": 729,
-        "systemAccount2": 1093,
-        "systemAccount4": 1817,
-        "systemAccount8": 3271,
-        "uncheckedAccount1": 657,
-        "uncheckedAccount2": 949,
-        "uncheckedAccount4": 1526,
-        "uncheckedAccount8": 2688
+        "accountInfo1": 601,
+        "accountInfo2": 923,
+        "accountInfo4": 1583,
+        "accountInfo8": 2975,
+        "accountEmptyInit1": 5034,
+        "accountEmpty1": 652,
+        "accountEmptyInit2": 9687,
+        "accountEmpty2": 1016,
+        "accountEmptyInit4": 18501,
+        "accountEmpty4": 1737,
+        "accountEmptyInit8": 36169,
+        "accountEmpty8": 3186,
+        "accountSizedInit1": 5106,
+        "accountSized1": 668,
+        "accountSizedInit2": 9828,
+        "accountSized2": 1046,
+        "accountSizedInit4": 18837,
+        "accountSized4": 1807,
+        "accountSizedInit8": 36761,
+        "accountSized8": 3326,
+        "accountUnsizedInit1": 5199,
+        "accountUnsized1": 702,
+        "accountUnsizedInit2": 10078,
+        "accountUnsized2": 1116,
+        "accountUnsizedInit4": 19259,
+        "accountUnsized4": 1953,
+        "accountUnsizedInit8": 37331,
+        "accountUnsized8": 3626,
+        "boxedAccountEmptyInit1": 5064,
+        "boxedAccountEmpty1": 671,
+        "boxedAccountEmptyInit2": 9721,
+        "boxedAccountEmpty2": 1052,
+        "boxedAccountEmptyInit4": 18582,
+        "boxedAccountEmpty4": 1811,
+        "boxedAccountEmptyInit8": 36329,
+        "boxedAccountEmpty8": 3357,
+        "boxedAccountSizedInit1": 5119,
+        "boxedAccountSized1": 686,
+        "boxedAccountSizedInit2": 9845,
+        "boxedAccountSized2": 1085,
+        "boxedAccountSizedInit4": 18825,
+        "boxedAccountSized4": 1874,
+        "boxedAccountSizedInit8": 36824,
+        "boxedAccountSized8": 3490,
+        "boxedAccountUnsizedInit1": 5207,
+        "boxedAccountUnsized1": 721,
+        "boxedAccountUnsizedInit2": 10015,
+        "boxedAccountUnsized2": 1157,
+        "boxedAccountUnsizedInit4": 19160,
+        "boxedAccountUnsized4": 2019,
+        "boxedAccountUnsizedInit8": 37496,
+        "boxedAccountUnsized8": 3776,
+        "boxedInterfaceAccountMint1": 1503,
+        "boxedInterfaceAccountMint2": 2555,
+        "boxedInterfaceAccountMint4": 4645,
+        "boxedInterfaceAccountMint8": 8859,
+        "boxedInterfaceAccountToken1": 2285,
+        "boxedInterfaceAccountToken2": 4118,
+        "boxedInterfaceAccountToken4": 7774,
+        "boxedInterfaceAccountToken8": 15116,
+        "interfaceAccountMint1": 1603,
+        "interfaceAccountMint2": 2893,
+        "interfaceAccountMint4": 5475,
+        "interfaceAccountMint8": 10636,
+        "interfaceAccountToken1": 2359,
+        "interfaceAccountToken2": 4386,
+        "interfaceAccountToken4": 8437,
+        "interface1": 600,
+        "interface2": 745,
+        "interface4": 1033,
+        "interface8": 1616,
+        "program1": 596,
+        "program2": 737,
+        "program4": 1019,
+        "program8": 1584,
+        "signer1": 580,
+        "signer2": 872,
+        "signer4": 1454,
+        "signer8": 2618,
+        "systemAccount1": 592,
+        "systemAccount2": 894,
+        "systemAccount4": 1497,
+        "systemAccount8": 2707,
+        "uncheckedAccount1": 563,
+        "uncheckedAccount2": 836,
+        "uncheckedAccount4": 1378,
+        "uncheckedAccount8": 2468
       },
       "stackMemory": {
-        "account_info1": 128,
-        "account_info2": 128,
-        "account_info4": 128,
-        "account_info8": 128,
-        "account_empty_init1": 176,
-        "account_empty_init2": 208,
-        "account_empty_init4": 208,
-        "account_empty_init8": 240,
-        "account_empty1": 128,
-        "account_empty2": 128,
-        "account_empty4": 128,
-        "account_empty8": 128,
-        "account_sized_init1": 208,
-        "account_sized_init2": 256,
-        "account_sized_init4": 240,
-        "account_sized_init8": 304,
-        "account_sized1": 128,
-        "account_sized2": 128,
-        "account_sized4": 128,
-        "account_sized8": 128,
-        "account_unsized_init1": 224,
-        "account_unsized_init2": 296,
-        "account_unsized_init4": 304,
-        "account_unsized_init8": 432,
-        "account_unsized1": 128,
+        "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": 128,
-        "account_unsized8": 128,
-        "boxed_account_empty_init1": 176,
-        "boxed_account_empty_init2": 208,
-        "boxed_account_empty_init4": 208,
-        "boxed_account_empty_init8": 240,
-        "boxed_account_empty1": 128,
-        "boxed_account_empty2": 128,
+        "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": 176,
-        "boxed_account_sized_init2": 208,
-        "boxed_account_sized_init4": 208,
-        "boxed_account_sized_init8": 240,
-        "boxed_account_sized1": 128,
-        "boxed_account_sized2": 128,
+        "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": 176,
-        "boxed_account_unsized_init2": 208,
-        "boxed_account_unsized_init4": 208,
-        "boxed_account_unsized_init8": 240,
-        "boxed_account_unsized1": 128,
+        "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": 128,
-        "boxed_account_unsized8": 128,
-        "boxed_interface_account_mint1": 128,
-        "boxed_interface_account_mint2": 128,
+        "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": 128,
-        "boxed_interface_account_token2": 128,
+        "boxed_interface_account_token1": 144,
+        "boxed_interface_account_token2": 144,
         "boxed_interface_account_token4": 144,
         "boxed_interface_account_token8": 144,
-        "interface_account_mint1": 128,
-        "interface_account_mint2": 128,
-        "interface_account_mint4": 128,
-        "interface_account_mint8": 128,
-        "interface_account_token1": 128,
-        "interface_account_token2": 128,
-        "interface_account_token4": 128,
-        "interface1": 128,
-        "interface2": 128,
-        "interface4": 128,
-        "interface8": 128,
-        "program1": 128,
-        "program2": 128,
-        "program4": 128,
-        "program8": 128,
-        "signer1": 128,
-        "signer2": 128,
-        "signer4": 128,
-        "signer8": 128,
-        "system_account1": 128,
-        "system_account2": 128,
-        "system_account4": 128,
-        "system_account8": 128,
-        "unchecked_account1": 128,
-        "unchecked_account2": 128,
-        "unchecked_account4": 128,
-        "unchecked_account8": 128
+        "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
       }
     }
   }
diff --git a/tests/bench/tests/stack-memory.ts b/tests/bench/tests/stack-memory.ts
index 9605540fb..33e19c733 100644
--- a/tests/bench/tests/stack-memory.ts
+++ b/tests/bench/tests/stack-memory.ts
@@ -11,7 +11,7 @@ describe("Stack memory", () => {
   const STACK_CONTENT = [
     "",
     `let stack_limit: [u16; 2048] = [1; 2048];`,
-    `msg!("{}", stack_limit.len());`,
+    `msg!("{}", stack_limit[2047]);`,
     "",
   ].join("\n\t\t");
 
diff --git a/tests/escrow/Anchor.toml b/tests/escrow/Anchor.toml
index 494e0f3c5..6639e2a57 100644
--- a/tests/escrow/Anchor.toml
+++ b/tests/escrow/Anchor.toml
@@ -7,11 +7,3 @@ escrow = "Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS"
 
 [scripts]
 test = "yarn run ts-mocha -t 1000000 tests/*.ts"
-
-[features]
-
-[test.validator]
-url = "https://api.mainnet-beta.solana.com"
-
-[[test.validator.clone]]
-address = "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
diff --git a/tests/spl/token-proxy/Anchor.toml b/tests/spl/token-proxy/Anchor.toml
index 46bef61d2..5c5f27845 100644
--- a/tests/spl/token-proxy/Anchor.toml
+++ b/tests/spl/token-proxy/Anchor.toml
@@ -7,11 +7,3 @@ token_proxy = "Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS"
 
 [scripts]
 test = "yarn run mocha -t 1000000 tests/"
-
-[features]
-
-[test.validator]
-url = "https://api.mainnet-beta.solana.com"
-
-[[test.validator.clone]]
-address = "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
diff --git a/tests/spl/token-wrapper/Anchor.toml b/tests/spl/token-wrapper/Anchor.toml
index 0ad934e07..bc8910bfa 100644
--- a/tests/spl/token-wrapper/Anchor.toml
+++ b/tests/spl/token-wrapper/Anchor.toml
@@ -7,11 +7,3 @@ token_wrapper = "4ZPcGU8MX8oL2u1EtErHzixAbgNBNeE9yoYq3kKMqnAy"
 
 [scripts]
 test = "yarn run ts-mocha -t 1000000 tests/*.ts"
-
-[features]
-
-[test.validator]
-url = "https://api.mainnet-beta.solana.com"
-
-[[test.validator.clone]]
-address = "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
diff --git a/tests/spl/transfer-hook/Anchor.toml b/tests/spl/transfer-hook/Anchor.toml
index fe0caa8f5..b57671cfb 100644
--- a/tests/spl/transfer-hook/Anchor.toml
+++ b/tests/spl/transfer-hook/Anchor.toml
@@ -7,11 +7,3 @@ transfer_hook = "9vaEfNU4HquQJuNQ6HYrpJW518a3n4wNUt5mAMY2UUHW"
 
 [scripts]
 test = "yarn run ts-mocha -t 1000000 tests/*.ts"
-
-[features]
-
-[test.validator]
-url = "https://api.mainnet-beta.solana.com"
-
-[[test.validator.clone]]
-address = "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
diff --git a/tests/zero-copy/programs/zero-copy/Cargo.toml b/tests/zero-copy/programs/zero-copy/Cargo.toml
index f83168914..1fcdb10c8 100644
--- a/tests/zero-copy/programs/zero-copy/Cargo.toml
+++ b/tests/zero-copy/programs/zero-copy/Cargo.toml
@@ -23,4 +23,4 @@ bytemuck = {version = "1.4.0", features = ["derive", "min_const_generics"]}
 
 [dev-dependencies]
 anchor-client = { path = "../../../../client", features = ["debug", "async"] }
-solana-program-test = ">=1.16, <1.18"
+solana-program-test = "1.16"