diff --git a/Anchor.toml b/Anchor.toml
index 841e85f7475..6057f46880d 100644
--- a/Anchor.toml
+++ b/Anchor.toml
@@ -1,6 +1,6 @@
 [toolchain]
 anchor_version = "0.29.0"
-solana_version = "1.18.11"
+solana_version = "1.18.21"
 
 [workspace]
 members = [
@@ -11,9 +11,7 @@ members = [
   "token/program",
   "token/program-2022",
 ]
-exclude = [
-  "account-compression/"
-]
+exclude = ["account-compression/"]
 
 [provider]
 cluster = "mainnet"
diff --git a/Cargo.lock b/Cargo.lock
index b2c05533693..52487661d1a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -65,9 +65,9 @@ dependencies = [
 
 [[package]]
 name = "agave-geyser-plugin-interface"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92179e90ad74e3f881c954a2cdbcc4ff4ec29382c7eb4f110e35a0a12a5ba8c7"
+checksum = "dbfd55ce60820a51cee37bb75d429d3378b59c2c75ad4cc01124689131287bc6"
 dependencies = [
  "log",
  "solana-sdk",
@@ -373,9 +373,9 @@ dependencies = [
 
 [[package]]
 name = "arrayref"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
 
 [[package]]
 name = "arrayvec"
@@ -5082,9 +5082,9 @@ dependencies = [
 
 [[package]]
 name = "solana-account-decoder"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff098f24024f1046d9ba778c48b9a68c590c15cf5c42af67e2578a240fb141a4"
+checksum = "f3d8168d37b0e66b06d6da63e7256f28d94b16b37a2ae91d07cd2aaa5149ecf6"
 dependencies = [
  "Inflector",
  "base64 0.21.7",
@@ -5107,9 +5107,9 @@ dependencies = [
 
 [[package]]
 name = "solana-accounts-db"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b18106c7a95d34a30030d00100ed2c212ece3ec166bc65ae9f4f6906ddf01e"
+checksum = "b4e2d6c949031c4c37829c6181234cc4205ed73d8a2b35f86081cbecc1f4818c"
 dependencies = [
  "arrayref",
  "bincode",
@@ -5168,9 +5168,9 @@ dependencies = [
 
 [[package]]
 name = "solana-address-lookup-table-program"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20d61283a078fbcac0690852434fb848e0cbf1a62e6c7b3472a8656459933134"
+checksum = "4798fdfd80df46251475a6d12d83d258edabf55a27c9dbb8428fb642c687425d"
 dependencies = [
  "bincode",
  "bytemuck",
@@ -5189,9 +5189,9 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-client"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1630817c0df2ca64afd07e850b2a439f55dab75850008c1f3d6378d55f43a43"
+checksum = "1ec9773c8c81ca1eefccf786f0a979663f850d2f7201b903acbd643070b705f2"
 dependencies = [
  "borsh 1.4.0",
  "futures 0.3.30",
@@ -5206,9 +5206,9 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-interface"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c6eef1d6b792eb16b3a214916736f5e211ef7b2c3f6344ef753f5054d6b648d"
+checksum = "9fd5c7a728d99bd0c1ff497f95e0c5396141ac43041d580c727bec96987e47db"
 dependencies = [
  "serde",
  "solana-sdk",
@@ -5217,9 +5217,9 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-server"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbc2173ccec80fa07f075d054461e678397fa7fd7c16d18fae16b2e9d3c57320"
+checksum = "74f9eda7bb67c127595211e0ff46812272ff704cf19b4d4c906038d47603dba3"
 dependencies = [
  "bincode",
  "crossbeam-channel",
@@ -5237,9 +5237,9 @@ dependencies = [
 
 [[package]]
 name = "solana-bloom"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5860ef8eec7296e4a28c155214103499e8065fdce878f96849c4594ce2f31dba"
+checksum = "ff6c22781a57839c02acdcabf63b8d3df0cb158bcc1f350cbf60673e56889015"
 dependencies = [
  "bv",
  "fnv",
@@ -5256,9 +5256,9 @@ dependencies = [
 
 [[package]]
 name = "solana-bpf-loader-program"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55a1f4be18656ddeeb9b722b3553eb4d47cf8fa356552c0002f6e7f63c457319"
+checksum = "a73b513098afa5147efe88cdc76d390f40893ae6c147a3e5edace85b8db6fb80"
 dependencies = [
  "bincode",
  "byteorder",
@@ -5275,9 +5275,9 @@ dependencies = [
 
 [[package]]
 name = "solana-bucket-map"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "461c725c2a6db405355e35bdaa2077673059b95b9859ed3d2a1ebc4e05ffd746"
+checksum = "31ea40f10bac047063dc25208e0fdda37fc4a6ae7519d805ead2fc4da5c6466a"
 dependencies = [
  "bv",
  "bytemuck",
@@ -5293,9 +5293,9 @@ dependencies = [
 
 [[package]]
 name = "solana-clap-utils"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "751789b7c7a3d78afe7f1ddbf48942463253167e67e85034a9695e0a05fba63e"
+checksum = "9942a743ee81e21899497a9a337b9800e27b119f3cb5281edd39a022ecebac26"
 dependencies = [
  "chrono",
  "clap 2.34.0",
@@ -5310,9 +5310,9 @@ dependencies = [
 
 [[package]]
 name = "solana-clap-v3-utils"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c562ed7985ebe389e0a145e3ed2d7b640196ad967313a0d0b497e8d005080bc5"
+checksum = "c8c07bd2817cd92369135ce1c9f6e8bf51fea5ccf34d30a523e14767abf8d6d7"
 dependencies = [
  "chrono",
  "clap 3.2.25",
@@ -5328,9 +5328,9 @@ dependencies = [
 
 [[package]]
 name = "solana-cli-config"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9247f845e3c9fb302087e71ca3626930699a03b575c2d21dbc07e19f4f0bb8e8"
+checksum = "d1856cefd8d05fe9fd5632ebab2736953325d97dd389090164c40034bb21768b"
 dependencies = [
  "dirs-next",
  "lazy_static",
@@ -5344,9 +5344,9 @@ dependencies = [
 
 [[package]]
 name = "solana-cli-output"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a86aef37f8ea82c6fad2efb23f5bcb366fd2303c34829d0f488f162f4ca03e77"
+checksum = "7e0e1dea0996efb8baaf25a900a36a0122369418afce05be380c137c20844ea7"
 dependencies = [
  "Inflector",
  "base64 0.21.7",
@@ -5371,9 +5371,9 @@ dependencies = [
 
 [[package]]
 name = "solana-client"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae5a780ff360acc9794d6e7fae8cd449c0b01bb5f0cec9c4bd8b0e6c6d111487"
+checksum = "124e1491fe6272625b749cdae6711e2d2de56debf0f146e69f0741d01e17d670"
 dependencies = [
  "async-trait",
  "bincode",
@@ -5404,9 +5404,9 @@ dependencies = [
 
 [[package]]
 name = "solana-compute-budget-program"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b5d5f91e6e16026679364f001e2ce9231bdc83752888a84a911e3aa81fa160"
+checksum = "d04bbdb54fdf0f52816c0a46f083be0d9fd024638baf81934140a3470066c424"
 dependencies = [
  "solana-program-runtime",
  "solana-sdk",
@@ -5414,9 +5414,9 @@ dependencies = [
 
 [[package]]
 name = "solana-config-program"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fd4f18daab90c2f703da8dc094b1dc80721178977302d66d21df43e61b4a97b"
+checksum = "43a011aa77b8c0d86478e62139a04e1d82d867c675f4ce367885ff1adc8e2830"
 dependencies = [
  "bincode",
  "chrono",
@@ -5428,9 +5428,9 @@ dependencies = [
 
 [[package]]
 name = "solana-connection-cache"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a7b949fb3d3abc092b0c1dfb437a63d3cb7968f92d74820ef46732093517083"
+checksum = "974b0429f0d9685396ec7303c67aa1595a8a985707c2cc37a48cc0067538ea8e"
 dependencies = [
  "async-trait",
  "bincode",
@@ -5450,9 +5450,9 @@ dependencies = [
 
 [[package]]
 name = "solana-core"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be0c86a816e33dc0c26656da74273a23f7519a7ccaf4969c2c66ddb358dcdb22"
+checksum = "2821c3c84013de4a12c7452a275b8066650aa1297c34dd4ccdf827a9ff7bce9f"
 dependencies = [
  "base64 0.21.7",
  "bincode",
@@ -5527,9 +5527,9 @@ dependencies = [
 
 [[package]]
 name = "solana-cost-model"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50ae48bd5f95036552951e76780021cead2cdea26aedab3c2e3617c2c3bacb32"
+checksum = "679800c745db86bdd2e68fdbe90836385ab19f9b19f9962c467793df77798e96"
 dependencies = [
  "lazy_static",
  "log",
@@ -5551,9 +5551,9 @@ dependencies = [
 
 [[package]]
 name = "solana-entry"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a40a0d0c05bca1218b875270fb92433ba732c19d5afa7da3c99c453ba4aed5cf"
+checksum = "3726d7c1824bd86c83911f8745fd29247ce2c19d8055402448f03f8c103ac7db"
 dependencies = [
  "bincode",
  "crossbeam-channel",
@@ -5573,9 +5573,9 @@ dependencies = [
 
 [[package]]
 name = "solana-faucet"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f435797ec23f5aa8f1dd7c90ae34b5e44c80ad165c218fabfe2add6790696a"
+checksum = "bae428e7b3b1b9560927c660310bfadbe84fec58cbcf9b4251c39fc038d5b30e"
 dependencies = [
  "bincode",
  "byteorder",
@@ -5597,9 +5597,9 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b8177685ab2bc8cc8b3bf63aa1eaa0580d5af850ecefac323ca1c2473085d77"
+checksum = "9aa49cd7eef8103e5f06e5ef3da844fef2e01290897814b1495dda2be63bfcde"
 dependencies = [
  "block-buffer 0.10.4",
  "bs58",
@@ -5622,9 +5622,9 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi-macro"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a68241cad17b74c6034a68ba4890632d409a2c886e7bead9c1e1432befdb7c9"
+checksum = "3aeb9e6679ac24dc9087f8bcc31c4912cb729a41897278a1fefe5b0a14636f6c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5634,9 +5634,9 @@ dependencies = [
 
 [[package]]
 name = "solana-geyser-plugin-manager"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38a9972a34d9480e40a2d34bf8f6e638fdd680950e9d6136ce37449a1ce2a880"
+checksum = "ba87dfe334f0acc63ab305450d13268ffa99d3416ecf00302f0e2f651995632d"
 dependencies = [
  "agave-geyser-plugin-interface",
  "bs58",
@@ -5661,9 +5661,9 @@ dependencies = [
 
 [[package]]
 name = "solana-gossip"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d58c7700a66ba13a20b935a706906257cb95193de315db854c58c1bbe450e46a"
+checksum = "7e7fb481b4c37c92d59532d101665067bf70411474c8958a2dd30e90a2860db0"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -5711,9 +5711,9 @@ dependencies = [
 
 [[package]]
 name = "solana-ledger"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3047298d664542d444837d8f75e7fb05b133a3ec93a27d377c6d7fa375ca6616"
+checksum = "8150517bc34391716ebf4a0635c2196a239658c2f9dc07618e7456a53b9e526d"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -5778,9 +5778,9 @@ dependencies = [
 
 [[package]]
 name = "solana-loader-v4-program"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd77e6da2cc1ba4742dcef6f3e4c7025dc9bf5e36ebba681c53531fef9148b5d"
+checksum = "ed605943e33ea71faf25c0e76d15c945b13f08ee704a8e7fbcbff40b79dff302"
 dependencies = [
  "log",
  "solana-measure",
@@ -5791,9 +5791,9 @@ dependencies = [
 
 [[package]]
 name = "solana-logger"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea560989ef67ba4a1a0fd62a248721f1aa5bac8fa5ede9ccf4fe9ee484ccadf"
+checksum = "141e96bc474ec11533eeddcd597097308e42965d05601ea1f3c321b879f91534"
 dependencies = [
  "env_logger",
  "lazy_static",
@@ -5802,9 +5802,9 @@ dependencies = [
 
 [[package]]
 name = "solana-measure"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2abdc65120ba03eac69a668c0085166e969ea6717aee1f5b0a2ffbdd07afe7a6"
+checksum = "2ca65f25bae6a8dfe6ce344ff2cc5cd9ee6dc30b38c992b5927ec153ea1c6f18"
 dependencies = [
  "log",
  "solana-sdk",
@@ -5812,9 +5812,9 @@ dependencies = [
 
 [[package]]
 name = "solana-merkle-tree"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350d93058a08b7a7ac36283cbbbce951da5e6d3d65c42dddd40c5a58fb4ad20d"
+checksum = "2b1207a3116b1b40c638c3927263d51befd1f14561895d47958d9a28efcd0061"
 dependencies = [
  "fast-math",
  "solana-program",
@@ -5822,9 +5822,9 @@ dependencies = [
 
 [[package]]
 name = "solana-metrics"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4874fea432f89b6ef0902fdada2cbca715b094419897dcfc7ef82d88b0a308"
+checksum = "c79f5a044af88d36ba9d29134d898478b007e7605a1a8ae1012cbf33af8839c7"
 dependencies = [
  "crossbeam-channel",
  "gethostname",
@@ -5837,9 +5837,9 @@ dependencies = [
 
 [[package]]
 name = "solana-net-utils"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05afd6080d20db4dc862603178535c7d648cba7462ca23241ff5670fb0026d38"
+checksum = "ecdf376b0bdf2f049b55d531159a0978b541c095dde1677a4359145a44882e3d"
 dependencies = [
  "bincode",
  "clap 3.2.25",
@@ -5865,9 +5865,9 @@ checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e"
 
 [[package]]
 name = "solana-perf"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff0f2ea9735a5452a3fe837c61f30231c8f5b455a2b12665d3bb6e0c56e49c8"
+checksum = "680be85877792dc79e198fd4c52df0a05cd4c59aad9cc3a23c6de43a826e83be"
 dependencies = [
  "ahash 0.8.9",
  "bincode",
@@ -5894,9 +5894,9 @@ dependencies = [
 
 [[package]]
 name = "solana-poh"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6cbd0d4aa51a73d5907be007ed083b8da1c4ac45c627f3bdd795530a556e6e6"
+checksum = "dfab7e018b9aa585a0df8882bbd5201dd4615839ca79d7f63c240818575b4f92"
 dependencies = [
  "core_affinity",
  "crossbeam-channel",
@@ -5912,9 +5912,9 @@ dependencies = [
 
 [[package]]
 name = "solana-program"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bddf573103c890b4ab8f9a6641d4f969d4148bce9a451c263f4a62afa949fae"
+checksum = "11e245fdb69973415d6d1f08c4ea2c82cce16c1100c800fc4dae396eac9c3305"
 dependencies = [
  "ark-bn254",
  "ark-ec",
@@ -5967,9 +5967,9 @@ dependencies = [
 
 [[package]]
 name = "solana-program-runtime"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e22d035b370d65bff46c7d7582a1619c4edac8e8059e2dec0e151df09882c7b3"
+checksum = "68fbfdc6bc45d40c45e85fc9d3fc70c555f0657ffe9f5d7463885b1bf9db0c60"
 dependencies = [
  "base64 0.21.7",
  "bincode",
@@ -5995,9 +5995,9 @@ dependencies = [
 
 [[package]]
 name = "solana-program-test"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b6ea8515eb200c6ba4841f99e17bc3498ae7bc6e95ebb3aff8ffa73bac482c7"
+checksum = "ef6ceda700f2c9c54308cf0035a6d6f859f6ed4b3c69b04e75bb2cddc59e00fc"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -6025,9 +6025,9 @@ dependencies = [
 
 [[package]]
 name = "solana-pubsub-client"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1b3aaa906f6b222be23423a0dd5deed254f092d27ad3bc05371acd9685d2db0"
+checksum = "84fa3d885969a622ecf12d93fce41012d0c697b7572f5e1cf3db50cf0fa48ff7"
 dependencies = [
  "crossbeam-channel",
  "futures-util",
@@ -6050,9 +6050,9 @@ dependencies = [
 
 [[package]]
 name = "solana-quic-client"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e75ba7e460865a7f556d7b7bc59e70c049eab4448bf2528bed1c5e5a1b672d"
+checksum = "122040ced5a4755c3f26a7ef17aa4bf46bf78405b99187457bb6bfd5eef8f308"
 dependencies = [
  "async-mutex",
  "async-trait",
@@ -6077,9 +6077,9 @@ dependencies = [
 
 [[package]]
 name = "solana-rayon-threadlimit"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a6ccb1910cc9efd4bae450d18a57c387e51ebebade1bd9bdf006ae539dd012f"
+checksum = "b165a28814de4ddf435c36ece935acd0c75947f1659b28e9227a13afe3495332"
 dependencies = [
  "lazy_static",
  "num_cpus",
@@ -6087,9 +6087,9 @@ dependencies = [
 
 [[package]]
 name = "solana-remote-wallet"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24cda66f8ed8860870cd4bf26235fb7fd08d8e5a75a4fce26b279c8d5c9db81f"
+checksum = "e790eab46252b3d3ef10f7d75588ca74a9a17b02be2f642ac57d938a744772f0"
 dependencies = [
  "console",
  "dialoguer",
@@ -6107,9 +6107,9 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c567b10f1c0dfd8861670eb93b68df9ae5ffb015cb8f53737bb04e54c7cb2bfb"
+checksum = "97b9025995fa6c61655d014cbc2bc16718ab0a6fd705b713cd312b3f2499cebc"
 dependencies = [
  "base64 0.21.7",
  "bincode",
@@ -6164,9 +6164,9 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-client"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efae5c8740d8eb49e504e728de10aed0a5ddc53af3004b32ecdea2f7ca12c97b"
+checksum = "0a7b4103449add6d6afe0c2eaa2a3e4479466d952446045059f99f9ec3b49c50"
 dependencies = [
  "async-trait",
  "base64 0.21.7",
@@ -6190,9 +6190,9 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-client-api"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdd1597ebe177b6fd68a9b33b682a5f0c9445c02be3783e7f51e570cbbbb3aa4"
+checksum = "45d3ed6a78686055bfa7769b35640f86d71f86328be06dd9551a84be37b12f40"
 dependencies = [
  "base64 0.21.7",
  "bs58",
@@ -6212,9 +6212,9 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-client-nonce-utils"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ae385b37c59a8507b9871d5162ea7709206360a55cf2859adb4274be4a870e1"
+checksum = "615b3c0da68a23dd98058883e9186128468a367edc56b27d3f9a22b262878f53"
 dependencies = [
  "clap 2.34.0",
  "solana-clap-utils",
@@ -6225,9 +6225,9 @@ dependencies = [
 
 [[package]]
 name = "solana-runtime"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ebeeadbb2c6bab05e248493bb170e9e1429f180559df7f0027c71a9d486df84"
+checksum = "5b6aafb546ccabcc0c3f3784edc77c3a34c6a5168d3a32ee4b86e2a1f47fdf30"
 dependencies = [
  "aquamarine",
  "arrayref",
@@ -6302,9 +6302,9 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08b24b06fa176209ddb2a2f8172a00b07e8a3b18229fbfc49f1eb3ce6ad11ff1"
+checksum = "92947ea7072e0dfadc53d79e570c1d13e830b74047ca8b938c3fa799707ebd34"
 dependencies = [
  "assert_matches",
  "base64 0.21.7",
@@ -6357,9 +6357,9 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk-macro"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "869483c05f18d37d4d95a08d9e05e00a4f76a8c8349aeedeee9ba2d013cbacde"
+checksum = "6548235a0d4babb0f410f0a41b05425013f1168a739bfc447860d5eb2d82f849"
 dependencies = [
  "bs58",
  "proc-macro2",
@@ -6376,9 +6376,9 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183"
 
 [[package]]
 name = "solana-send-transaction-service"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86bad64f4584997089757bf463d7c21099789a4fc8e9e412988b192f7d501a6"
+checksum = "27fbdc158d23d3db3d70a5ec2083c0c63bb1b9fe30104b0d7ba5220489c18361"
 dependencies = [
  "crossbeam-channel",
  "log",
@@ -6392,9 +6392,9 @@ dependencies = [
 
 [[package]]
 name = "solana-stake-program"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce34cbcfddcddf8316af363e7457b2420ee0507bc8ff3a16980d38c71af0e04e"
+checksum = "c3601a5c71787be08838085ea057261e61474abd72560e27b1bd1364d34daeb3"
 dependencies = [
  "bincode",
  "log",
@@ -6407,9 +6407,9 @@ dependencies = [
 
 [[package]]
 name = "solana-storage-bigtable"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74e38acc6570c6f211ef18adfedc6fcaa7097c505e4c315e7553f1130e7ef6e0"
+checksum = "8dc054b66a1f527bc25444268c0de100428e374507667e67168533e4f622e300"
 dependencies = [
  "backoff",
  "bincode",
@@ -6441,9 +6441,9 @@ dependencies = [
 
 [[package]]
 name = "solana-storage-proto"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "651c9d7457c394f0d002ef95acfd8bb8e9e6bb501d65cbfceb3f3eff3aa75b90"
+checksum = "08db88f451abd4dd1267b2e9449a5455fc7a0c53239b2f452eac27c51e6bead0"
 dependencies = [
  "bincode",
  "bs58",
@@ -6458,9 +6458,9 @@ dependencies = [
 
 [[package]]
 name = "solana-streamer"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b76711141dd5b052e29e4825b33cf09ca9cf3987b8ac0c703d36e3d80ad5dc91"
+checksum = "b8ae3a138900a027e80141e6b7ace032446c96842af43b5d6f2d19a3b626d60f"
 dependencies = [
  "async-channel",
  "bytes",
@@ -6491,9 +6491,9 @@ dependencies = [
 
 [[package]]
 name = "solana-system-program"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d55e3fb09b181f6b4040fc6e5038d35aa9a0c95eb182b7702b8318bf2ff0cb"
+checksum = "7914514d000d9f3f6bb87a6d08a2b97db643b88d3d8c4236ed24e714777f3cd9"
 dependencies = [
  "bincode",
  "log",
@@ -6505,9 +6505,9 @@ dependencies = [
 
 [[package]]
 name = "solana-test-validator"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14f8bda185f131c559e5b7161cc6045792fb35893d058089f5ae499bddcf1ca3"
+checksum = "196f514793c2b6c4badfc514e5ce5cc1b9dbcb3c5f324b5ff1ead2cf362172ff"
 dependencies = [
  "base64 0.21.7",
  "bincode",
@@ -6537,9 +6537,9 @@ dependencies = [
 
 [[package]]
 name = "solana-thin-client"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b6b476b4572453f93a9827fa9312537b8a8ed253006919ab17d921b271b125"
+checksum = "351970dd51b57c0677b71d302d594ff3117f9c0ce7737024265a41aa6a9f38d7"
 dependencies = [
  "bincode",
  "log",
@@ -6552,9 +6552,9 @@ dependencies = [
 
 [[package]]
 name = "solana-tpu-client"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cfa13af3f54db31bde6f2d5462588f03be95f7cf66610d5942e7b52e556d1d9"
+checksum = "88461a3829db961ba8d301e9c05c6fff6cf2d167b8252e4b925ba093ba68fd69"
 dependencies = [
  "async-trait",
  "bincode",
@@ -6576,9 +6576,9 @@ dependencies = [
 
 [[package]]
 name = "solana-transaction-status"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b5614e42e4d5a8b15e4553b68008788fae3a0dbc1a3672b62e9574252579536"
+checksum = "5da7ad143a9cea370e981c807d4e1f8f674eb446cf4b14eadfc2c96047984e81"
 dependencies = [
  "Inflector",
  "base64 0.21.7",
@@ -6601,9 +6601,9 @@ dependencies = [
 
 [[package]]
 name = "solana-turbine"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1ea00874e1b70347d54e54b9788cdbba5509de2119f702603776067db759628"
+checksum = "f48deb073af1654b54dd5874ed4cb59748d51a4cc800f52ede3248366d927dd2"
 dependencies = [
  "bincode",
  "bytes",
@@ -6638,9 +6638,9 @@ dependencies = [
 
 [[package]]
 name = "solana-udp-client"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22a37626fc851db74838725fc1034a71f2b2445149d93e45884ae366c6d85d61"
+checksum = "5cbc4e3f3848844d81e5e256b4da1766ab0dd277339d715982f8994d0d508b7c"
 dependencies = [
  "async-trait",
  "solana-connection-cache",
@@ -6653,15 +6653,15 @@ dependencies = [
 
 [[package]]
 name = "solana-unified-scheduler-logic"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd361d0e29b165135b2947e5f0738996c42c54073ddda3009802e4cfe2c8510"
+checksum = "10b73b70f53836d14c4e48ddf37de6cc950ff869a707157197ae6f81f7cee74e"
 
 [[package]]
 name = "solana-unified-scheduler-pool"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1158e7ad20e98044d416b7111736481c590f7b49d66cae917c5c092ff373d979"
+checksum = "5f181f27e15b6b80600e5fe6ab839af5fa8eef41ec98b34fd07f5c59c2233765"
 dependencies = [
  "solana-ledger",
  "solana-program-runtime",
@@ -6673,9 +6673,9 @@ dependencies = [
 
 [[package]]
 name = "solana-version"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c23651369dd7278308c988078adeb593a37560abd0f728f70e768e12fa4b507"
+checksum = "6d22ff1045286d1ac620827df97990138be51c10f75c0cedab3687e4fdf090df"
 dependencies = [
  "log",
  "rustc_version",
@@ -6689,9 +6689,9 @@ dependencies = [
 
 [[package]]
 name = "solana-vote"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cc7a6e32de8a455bf85090a2a7bf4c298fc4ca02279f2829896ee0a28a94272"
+checksum = "f1bfffbf5d984061df85b87678cfef5f216f33e37ee92614170a22d1bd0bfdd0"
 dependencies = [
  "crossbeam-channel",
  "itertools",
@@ -6708,9 +6708,9 @@ dependencies = [
 
 [[package]]
 name = "solana-vote-program"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0bab220b03482b90aa1781f7c4d4f073c7c9e7eafe6759d07a1b3efee6e315"
+checksum = "61f6423d2ea6c05c74d84ff346306e3dc0783765181eb531bb5e1bc5b49fa441"
 dependencies = [
  "bincode",
  "log",
@@ -6730,9 +6730,9 @@ dependencies = [
 
 [[package]]
 name = "solana-wen-restart"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5cde23559cd4a574023d9f39e5edea86ae927829c31dee058b7b49441ce7e71"
+checksum = "818da8aa6516bb7444235729ba3df2deb88500c14dca88286465e2826c19aec6"
 dependencies = [
  "log",
  "prost",
@@ -6751,9 +6751,9 @@ dependencies = [
 
 [[package]]
 name = "solana-zk-token-proof-program"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f77771c8c8d2f8f645a0626e57f72f6c6a83beb5bebb6fd4d7662f7bcc98deea"
+checksum = "a0bd41d030758c95cc887ae7ee38af136b79f46d373d23868348ffe0c6cf2302"
 dependencies = [
  "bytemuck",
  "num-derive 0.4.2",
@@ -6765,9 +6765,9 @@ dependencies = [
 
 [[package]]
 name = "solana-zk-token-sdk"
-version = "1.18.11"
+version = "1.18.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "459c27f7b954798677d8243aa53b8080cfb314ecfecbf8889a5a65c91ad11fee"
+checksum = "43318fb5bd649bc57711188908b561f70ee3e506d26300018af7fd36585fdf90"
 dependencies = [
  "aes-gcm-siv",
  "base64 0.21.7",
diff --git a/governance/addin-api/Cargo.toml b/governance/addin-api/Cargo.toml
index c1fffa20ca9..91622117c4d 100644
--- a/governance/addin-api/Cargo.toml
+++ b/governance/addin-api/Cargo.toml
@@ -10,4 +10,4 @@ edition = "2021"
 [dependencies]
 borsh = "1.4.0"
 spl-governance-tools = { version = "0.1.4", path = "../tools" }
-solana-program = ">=1.18.11,<=2"
+solana-program = "=1.18.21"
diff --git a/governance/addin-mock/program/Cargo.toml b/governance/addin-mock/program/Cargo.toml
index 2140115592d..8e85bd85fee 100644
--- a/governance/addin-mock/program/Cargo.toml
+++ b/governance/addin-mock/program/Cargo.toml
@@ -19,7 +19,7 @@ num-derive = "0.4"
 num-traits = "0.2"
 serde = "1.0.198"
 serde_derive = "1.0.103"
-solana-program = ">=1.18.11,<=2"
+solana-program = "=1.18.21"
 spl-token = { version = "4.0", path = "../../../token/program", features = [
   "no-entrypoint",
 ] }
@@ -31,8 +31,8 @@ thiserror = "1.0"
 [dev-dependencies]
 assert_matches = "1.5.0"
 proptest = "1.4"
-solana-program-test = ">=1.18.11,<=2"
-solana-sdk = ">=1.18.11,<=2"
+solana-program-test = "=1.18.21"
+solana-sdk = "=1.18.21"
 spl-governance-test-sdk = { version = "0.1.4", path = "../../test-sdk" }
 
 
diff --git a/governance/chat/program/Cargo.toml b/governance/chat/program/Cargo.toml
index 551318daea3..12fa3bac89c 100644
--- a/governance/chat/program/Cargo.toml
+++ b/governance/chat/program/Cargo.toml
@@ -19,7 +19,7 @@ num-derive = "0.4"
 num-traits = "0.2"
 serde = "1.0.198"
 serde_derive = "1.0.103"
-solana-program = ">=1.18.11,<=2"
+solana-program = "=1.18.21"
 spl-token = { version = "4.0", path = "../../../token/program", features = [
   "no-entrypoint",
 ] }
@@ -34,8 +34,8 @@ thiserror = "1.0"
 [dev-dependencies]
 assert_matches = "1.5.0"
 proptest = "1.4"
-solana-program-test = ">=1.18.11,<=2"
-solana-sdk = ">=1.18.11,<=2"
+solana-program-test = "=1.18.21"
+solana-sdk = "=1.18.21"
 spl-governance-test-sdk = { version = "0.1.4", path = "../../test-sdk" }
 spl-governance-addin-mock = { version = "0.1.4", path = "../../addin-mock/program" }
 
diff --git a/governance/program/Cargo.toml b/governance/program/Cargo.toml
index 353aba420e7..bde584219fa 100644
--- a/governance/program/Cargo.toml
+++ b/governance/program/Cargo.toml
@@ -12,14 +12,14 @@ no-entrypoint = []
 test-sbf = []
 
 [dependencies]
-arrayref = "0.3.7"
+arrayref = "0.3.8"
 bincode = "1.3.2"
 borsh = "1.4.0"
 num-derive = "0.4"
 num-traits = "0.2"
 serde = "1.0.198"
 serde_derive = "1.0.103"
-solana-program = ">=1.18.11,<=2"
+solana-program = "=1.18.21"
 spl-token = { version = "4.0", path = "../../token/program", features = [
   "no-entrypoint",
 ] }
@@ -31,8 +31,8 @@ thiserror = "1.0"
 assert_matches = "1.5.0"
 base64 = "0.22"
 proptest = "1.4"
-solana-program-test = ">=1.18.11,<=2"
-solana-sdk = ">=1.18.11,<=2"
+solana-program-test = "=1.18.21"
+solana-sdk = "=1.18.21"
 spl-governance-test-sdk = { version = "0.1.4", path = "../test-sdk" }
 spl-governance-addin-mock = { version = "0.1.4", path = "../addin-mock/program" }
 
diff --git a/governance/test-sdk/Cargo.toml b/governance/test-sdk/Cargo.toml
index 8928cf9d796..f573506c2b9 100644
--- a/governance/test-sdk/Cargo.toml
+++ b/governance/test-sdk/Cargo.toml
@@ -16,9 +16,9 @@ num-derive = "0.4"
 num-traits = "0.2"
 serde = "1.0.198"
 serde_derive = "1.0.103"
-solana-program = ">=1.18.11,<=2"
-solana-program-test = ">=1.18.11,<=2"
-solana-sdk = ">=1.18.11,<=2"
+solana-program = "=1.18.21"
+solana-program-test = "=1.18.21"
+solana-sdk = "=1.18.21"
 spl-token = { version = "4.0", path = "../../token/program", features = [
   "no-entrypoint",
 ] }
diff --git a/governance/tools/Cargo.toml b/governance/tools/Cargo.toml
index 1421fecff00..63477a29dea 100644
--- a/governance/tools/Cargo.toml
+++ b/governance/tools/Cargo.toml
@@ -15,7 +15,7 @@ num-derive = "0.4"
 num-traits = "0.2"
 serde = "1.0.198"
 serde_derive = "1.0.103"
-solana-program = ">=1.18.11,<=2"
+solana-program = "=1.18.21"
 spl-token = { version = "4.0", path = "../../token/program", features = [
   "no-entrypoint",
 ] }