diff --git a/Cargo.lock b/Cargo.lock
index cbba36ccc8fff9..26e449a45aea0e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2162,7 +2162,7 @@ dependencies = [
 
 [[package]]
 name = "gen-headers"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "log",
  "regex",
@@ -2170,7 +2170,7 @@ dependencies = [
 
 [[package]]
 name = "gen-syscall-list"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "regex",
 ]
@@ -3365,17 +3365,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "num-derive"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "num-derive"
 version = "0.4.2"
@@ -3440,55 +3429,13 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "num_enum"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
-dependencies = [
- "num_enum_derive 0.5.11",
-]
-
-[[package]]
-name = "num_enum"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
-dependencies = [
- "num_enum_derive 0.6.1",
-]
-
 [[package]]
 name = "num_enum"
 version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
 dependencies = [
- "num_enum_derive 0.7.2",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
-dependencies = [
- "proc-macro-crate 1.1.0",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
-dependencies = [
- "proc-macro-crate 1.1.0",
- "proc-macro2",
- "quote",
- "syn 2.0.48",
+ "num_enum_derive",
 ]
 
 [[package]]
@@ -4014,16 +3961,6 @@ dependencies = [
  "toml 0.5.8",
 ]
 
-[[package]]
-name = "proc-macro-crate"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83"
-dependencies = [
- "thiserror",
- "toml 0.5.8",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "2.0.0"
@@ -4142,7 +4079,7 @@ dependencies = [
 
 [[package]]
 name = "proto"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "protobuf-src",
  "tonic-build",
@@ -4385,7 +4322,7 @@ dependencies = [
 
 [[package]]
 name = "rbpf-cli"
-version = "1.18.0"
+version = "2.0.0"
 
 [[package]]
 name = "rdrand"
@@ -5189,7 +5126,7 @@ dependencies = [
 
 [[package]]
 name = "solana-account-decoder"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "Inflector",
  "assert_matches",
@@ -5214,7 +5151,7 @@ dependencies = [
 
 [[package]]
 name = "solana-accounts-bench"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "clap 2.33.3",
  "log",
@@ -5228,7 +5165,7 @@ dependencies = [
 
 [[package]]
 name = "solana-accounts-cluster-bench"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "clap 2.33.3",
  "log",
@@ -5258,7 +5195,7 @@ dependencies = [
 
 [[package]]
 name = "solana-accounts-db"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "arrayref",
  "assert_matches",
@@ -5284,10 +5221,10 @@ dependencies = [
  "memmap2",
  "memoffset 0.9.0",
  "modular-bitfield",
- "num-derive 0.4.2",
+ "num-derive",
  "num-traits",
  "num_cpus",
- "num_enum 0.7.2",
+ "num_enum",
  "ouroboros",
  "percentage",
  "qualifier_attr",
@@ -5326,12 +5263,12 @@ dependencies = [
 
 [[package]]
 name = "solana-address-lookup-table-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "bytemuck",
  "log",
- "num-derive 0.4.2",
+ "num-derive",
  "num-traits",
  "rustc_version 0.4.0",
  "serde",
@@ -5345,7 +5282,7 @@ dependencies = [
 
 [[package]]
 name = "solana-address-lookup-table-program-tests"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -5356,7 +5293,7 @@ dependencies = [
 
 [[package]]
 name = "solana-banking-bench"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "clap 3.2.23",
  "crossbeam-channel",
@@ -5380,7 +5317,7 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-client"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "borsh 1.2.1",
  "futures 0.3.30",
@@ -5397,7 +5334,7 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-interface"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "serde",
  "solana-sdk",
@@ -5406,7 +5343,7 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-server"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "crossbeam-channel",
@@ -5424,7 +5361,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bench-streamer"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "clap 3.2.23",
  "crossbeam-channel",
@@ -5435,7 +5372,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bench-tps"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "clap 2.33.3",
  "crossbeam-channel",
@@ -5476,7 +5413,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bloom"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bv",
  "fnv",
@@ -5493,7 +5430,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bpf-loader-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -5514,7 +5451,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bpf-loader-program-tests"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -5525,7 +5462,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bucket-map"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bv",
  "bytemuck",
@@ -5533,7 +5470,7 @@ dependencies = [
  "log",
  "memmap2",
  "modular-bitfield",
- "num_enum 0.7.2",
+ "num_enum",
  "rand 0.8.5",
  "rayon",
  "solana-logger",
@@ -5544,7 +5481,7 @@ dependencies = [
 
 [[package]]
 name = "solana-cargo-build-bpf"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "log",
  "solana-logger",
@@ -5552,7 +5489,7 @@ dependencies = [
 
 [[package]]
 name = "solana-cargo-build-sbf"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_cmd",
  "bzip2",
@@ -5573,7 +5510,7 @@ dependencies = [
 
 [[package]]
 name = "solana-cargo-registry"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "clap 2.33.3",
  "flate2",
@@ -5602,11 +5539,11 @@ dependencies = [
 
 [[package]]
 name = "solana-cargo-test-bpf"
-version = "1.18.0"
+version = "2.0.0"
 
 [[package]]
 name = "solana-cargo-test-sbf"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "cargo_metadata",
  "clap 3.2.23",
@@ -5617,7 +5554,7 @@ dependencies = [
 
 [[package]]
 name = "solana-clap-utils"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "chrono",
@@ -5634,7 +5571,7 @@ dependencies = [
 
 [[package]]
 name = "solana-clap-v3-utils"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "chrono",
@@ -5652,7 +5589,7 @@ dependencies = [
 
 [[package]]
 name = "solana-cli"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -5706,7 +5643,7 @@ dependencies = [
 
 [[package]]
 name = "solana-cli-config"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "anyhow",
  "dirs-next",
@@ -5721,7 +5658,7 @@ dependencies = [
 
 [[package]]
 name = "solana-cli-output"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "Inflector",
  "base64 0.21.7",
@@ -5747,7 +5684,7 @@ dependencies = [
 
 [[package]]
 name = "solana-client"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "async-trait",
  "bincode",
@@ -5779,7 +5716,7 @@ dependencies = [
 
 [[package]]
 name = "solana-client-test"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "futures-util",
  "rand 0.8.5",
@@ -5809,7 +5746,7 @@ dependencies = [
 
 [[package]]
 name = "solana-compute-budget-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "solana-program-runtime",
  "solana-sdk",
@@ -5817,7 +5754,7 @@ dependencies = [
 
 [[package]]
 name = "solana-config-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "chrono",
@@ -5830,7 +5767,7 @@ dependencies = [
 
 [[package]]
 name = "solana-connection-cache"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "async-trait",
  "bincode",
@@ -5853,7 +5790,7 @@ dependencies = [
 
 [[package]]
 name = "solana-core"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "base64 0.21.7",
@@ -5873,7 +5810,7 @@ dependencies = [
  "log",
  "lru",
  "min-max-heap",
- "num_enum 0.7.2",
+ "num_enum",
  "prio-graph",
  "quinn",
  "rand 0.8.5",
@@ -5939,7 +5876,7 @@ dependencies = [
 
 [[package]]
 name = "solana-cost-model"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "lazy_static",
  "log",
@@ -5964,7 +5901,7 @@ dependencies = [
 
 [[package]]
 name = "solana-dos"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "clap 3.2.23",
@@ -5994,7 +5931,7 @@ dependencies = [
 
 [[package]]
 name = "solana-download-utils"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "console",
  "indicatif",
@@ -6006,7 +5943,7 @@ dependencies = [
 
 [[package]]
 name = "solana-ed25519-program-tests"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "ed25519-dalek",
@@ -6017,7 +5954,7 @@ dependencies = [
 
 [[package]]
 name = "solana-entry"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -6039,7 +5976,7 @@ dependencies = [
 
 [[package]]
 name = "solana-faucet"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "byteorder",
@@ -6061,7 +5998,7 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bitflags 2.4.2",
  "block-buffer 0.10.4",
@@ -6086,7 +6023,7 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi-macro"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6096,7 +6033,7 @@ dependencies = [
 
 [[package]]
 name = "solana-genesis"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "base64 0.21.7",
  "bincode",
@@ -6121,7 +6058,7 @@ dependencies = [
 
 [[package]]
 name = "solana-genesis-utils"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "log",
  "solana-accounts-db",
@@ -6132,7 +6069,7 @@ dependencies = [
 
 [[package]]
 name = "solana-geyser-plugin-interface"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "log",
  "solana-sdk",
@@ -6142,7 +6079,7 @@ dependencies = [
 
 [[package]]
 name = "solana-geyser-plugin-manager"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bs58",
  "crossbeam-channel",
@@ -6167,7 +6104,7 @@ dependencies = [
 
 [[package]]
 name = "solana-gossip"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -6218,7 +6155,7 @@ dependencies = [
 
 [[package]]
 name = "solana-install"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "atty",
  "bincode",
@@ -6253,7 +6190,7 @@ dependencies = [
 
 [[package]]
 name = "solana-keygen"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bs58",
  "clap 3.2.23",
@@ -6270,7 +6207,7 @@ dependencies = [
 
 [[package]]
 name = "solana-ledger"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -6290,7 +6227,7 @@ dependencies = [
  "lru",
  "mockall",
  "num_cpus",
- "num_enum 0.7.2",
+ "num_enum",
  "prost",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
@@ -6340,7 +6277,7 @@ dependencies = [
 
 [[package]]
 name = "solana-ledger-tool"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_cmd",
  "bs58",
@@ -6392,7 +6329,7 @@ dependencies = [
 
 [[package]]
 name = "solana-loader-v4-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "log",
@@ -6404,7 +6341,7 @@ dependencies = [
 
 [[package]]
 name = "solana-local-cluster"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "crossbeam-channel",
@@ -6443,7 +6380,7 @@ dependencies = [
 
 [[package]]
 name = "solana-log-analyzer"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "byte-unit",
  "clap 3.2.23",
@@ -6455,7 +6392,7 @@ dependencies = [
 
 [[package]]
 name = "solana-logger"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "env_logger",
  "lazy_static",
@@ -6464,7 +6401,7 @@ dependencies = [
 
 [[package]]
 name = "solana-measure"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "log",
  "solana-sdk",
@@ -6472,11 +6409,11 @@ dependencies = [
 
 [[package]]
 name = "solana-memory-management"
-version = "1.18.0"
+version = "2.0.0"
 
 [[package]]
 name = "solana-merkle-root-bench"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "clap 2.33.3",
  "log",
@@ -6489,7 +6426,7 @@ dependencies = [
 
 [[package]]
 name = "solana-merkle-tree"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "fast-math",
  "hex",
@@ -6498,7 +6435,7 @@ dependencies = [
 
 [[package]]
 name = "solana-metrics"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "crossbeam-channel",
  "env_logger",
@@ -6514,7 +6451,7 @@ dependencies = [
 
 [[package]]
 name = "solana-net-shaper"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "clap 3.2.23",
  "rand 0.8.5",
@@ -6525,7 +6462,7 @@ dependencies = [
 
 [[package]]
 name = "solana-net-utils"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "clap 3.2.23",
@@ -6551,7 +6488,7 @@ checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e"
 
 [[package]]
 name = "solana-notifier"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "log",
  "reqwest",
@@ -6561,7 +6498,7 @@ dependencies = [
 
 [[package]]
 name = "solana-perf"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "ahash 0.8.7",
  "assert_matches",
@@ -6592,7 +6529,7 @@ dependencies = [
 
 [[package]]
 name = "solana-poh"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -6614,7 +6551,7 @@ dependencies = [
 
 [[package]]
 name = "solana-poh-bench"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "clap 3.2.23",
  "log",
@@ -6629,7 +6566,7 @@ dependencies = [
 
 [[package]]
 name = "solana-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "anyhow",
  "arbitrary",
@@ -6663,7 +6600,7 @@ dependencies = [
  "log",
  "memoffset 0.9.0",
  "num-bigint 0.4.4",
- "num-derive 0.4.2",
+ "num-derive",
  "num-traits",
  "parking_lot 0.12.1",
  "rand 0.8.5",
@@ -6688,7 +6625,7 @@ dependencies = [
 
 [[package]]
 name = "solana-program-runtime"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "base64 0.21.7",
@@ -6699,7 +6636,7 @@ dependencies = [
  "libc",
  "libsecp256k1",
  "log",
- "num-derive 0.4.2",
+ "num-derive",
  "num-traits",
  "percentage",
  "rand 0.8.5",
@@ -6717,7 +6654,7 @@ dependencies = [
 
 [[package]]
 name = "solana-program-test"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -6747,7 +6684,7 @@ dependencies = [
 
 [[package]]
 name = "solana-pubsub-client"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "anyhow",
  "crossbeam-channel",
@@ -6771,7 +6708,7 @@ dependencies = [
 
 [[package]]
 name = "solana-quic-client"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "async-mutex",
  "async-trait",
@@ -6798,7 +6735,7 @@ dependencies = [
 
 [[package]]
 name = "solana-rayon-threadlimit"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "lazy_static",
  "num_cpus",
@@ -6806,14 +6743,14 @@ dependencies = [
 
 [[package]]
 name = "solana-remote-wallet"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "console",
  "dialoguer",
  "hidapi",
  "log",
- "num-derive 0.4.2",
+ "num-derive",
  "num-traits",
  "parking_lot 0.12.1",
  "qstring",
@@ -6825,7 +6762,7 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "base64 0.21.7",
  "bincode",
@@ -6884,7 +6821,7 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-client"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -6913,7 +6850,7 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-client-api"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "base64 0.21.7",
  "bs58",
@@ -6933,7 +6870,7 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-client-nonce-utils"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "anyhow",
  "clap 2.33.3",
@@ -6950,7 +6887,7 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-test"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "bs58",
@@ -6977,7 +6914,7 @@ dependencies = [
 
 [[package]]
 name = "solana-runtime"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "aquamarine",
  "arrayref",
@@ -7007,10 +6944,10 @@ dependencies = [
  "memoffset 0.9.0",
  "mockall",
  "modular-bitfield",
- "num-derive 0.4.2",
+ "num-derive",
  "num-traits",
  "num_cpus",
- "num_enum 0.7.2",
+ "num_enum",
  "ouroboros",
  "percentage",
  "qualifier_attr",
@@ -7061,7 +6998,7 @@ dependencies = [
 
 [[package]]
 name = "solana-runtime-transaction"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "log",
@@ -7075,7 +7012,7 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "anyhow",
  "assert_matches",
@@ -7101,9 +7038,9 @@ dependencies = [
  "libsecp256k1",
  "log",
  "memmap2",
- "num-derive 0.4.2",
+ "num-derive",
  "num-traits",
- "num_enum 0.7.2",
+ "num_enum",
  "pbkdf2 0.11.0",
  "qstring",
  "qualifier_attr",
@@ -7134,7 +7071,7 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk-macro"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bs58",
  "proc-macro2",
@@ -7151,7 +7088,7 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183"
 
 [[package]]
 name = "solana-send-transaction-service"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "crossbeam-channel",
  "log",
@@ -7166,7 +7103,7 @@ dependencies = [
 
 [[package]]
 name = "solana-stake-accounts"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "clap 2.33.3",
  "solana-clap-utils",
@@ -7182,7 +7119,7 @@ dependencies = [
 
 [[package]]
 name = "solana-stake-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -7199,7 +7136,7 @@ dependencies = [
 
 [[package]]
 name = "solana-storage-bigtable"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "backoff",
  "bincode",
@@ -7231,7 +7168,7 @@ dependencies = [
 
 [[package]]
 name = "solana-storage-proto"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "bs58",
@@ -7247,7 +7184,7 @@ dependencies = [
 
 [[package]]
 name = "solana-store-tool"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "clap 2.33.3",
  "log",
@@ -7259,7 +7196,7 @@ dependencies = [
 
 [[package]]
 name = "solana-streamer"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "async-channel",
@@ -7289,7 +7226,7 @@ dependencies = [
 
 [[package]]
 name = "solana-svm"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "itertools",
  "log",
@@ -7310,7 +7247,7 @@ dependencies = [
 
 [[package]]
 name = "solana-system-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -7324,7 +7261,7 @@ dependencies = [
 
 [[package]]
 name = "solana-test-validator"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "base64 0.21.7",
  "bincode",
@@ -7355,7 +7292,7 @@ dependencies = [
 
 [[package]]
 name = "solana-thin-client"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "log",
@@ -7369,7 +7306,7 @@ dependencies = [
 
 [[package]]
 name = "solana-tokens"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -7402,7 +7339,7 @@ dependencies = [
 
 [[package]]
 name = "solana-tpu-client"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "async-trait",
  "bincode",
@@ -7424,7 +7361,7 @@ dependencies = [
 
 [[package]]
 name = "solana-transaction-dos"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "clap 2.33.3",
@@ -7451,7 +7388,7 @@ dependencies = [
 
 [[package]]
 name = "solana-transaction-status"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "Inflector",
  "base64 0.21.7",
@@ -7474,7 +7411,7 @@ dependencies = [
 
 [[package]]
 name = "solana-turbine"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -7510,7 +7447,7 @@ dependencies = [
 
 [[package]]
 name = "solana-udp-client"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "async-trait",
  "solana-connection-cache",
@@ -7523,14 +7460,14 @@ dependencies = [
 
 [[package]]
 name = "solana-unified-scheduler-logic"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "solana-sdk",
 ]
 
 [[package]]
 name = "solana-unified-scheduler-pool"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "crossbeam-channel",
@@ -7547,7 +7484,7 @@ dependencies = [
 
 [[package]]
 name = "solana-upload-perf"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "serde_json",
  "solana-metrics",
@@ -7555,7 +7492,7 @@ dependencies = [
 
 [[package]]
 name = "solana-validator"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "chrono",
  "clap 2.33.3",
@@ -7620,7 +7557,7 @@ dependencies = [
 
 [[package]]
 name = "solana-version"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "log",
  "rustc_version 0.4.0",
@@ -7634,7 +7571,7 @@ dependencies = [
 
 [[package]]
 name = "solana-vote"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "crossbeam-channel",
@@ -7653,12 +7590,12 @@ dependencies = [
 
 [[package]]
 name = "solana-vote-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "bincode",
  "log",
- "num-derive 0.4.2",
+ "num-derive",
  "num-traits",
  "rustc_version 0.4.0",
  "serde",
@@ -7676,7 +7613,7 @@ dependencies = [
 
 [[package]]
 name = "solana-watchtower"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "clap 2.33.3",
  "humantime",
@@ -7695,7 +7632,7 @@ dependencies = [
 
 [[package]]
 name = "solana-wen-restart"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "log",
  "prost",
@@ -7717,7 +7654,7 @@ dependencies = [
 
 [[package]]
 name = "solana-zk-keygen"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bs58",
  "clap 3.2.23",
@@ -7736,12 +7673,12 @@ dependencies = [
 
 [[package]]
 name = "solana-zk-token-proof-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bytemuck",
  "criterion",
  "curve25519-dalek",
- "num-derive 0.4.2",
+ "num-derive",
  "num-traits",
  "solana-program-runtime",
  "solana-sdk",
@@ -7750,7 +7687,7 @@ dependencies = [
 
 [[package]]
 name = "solana-zk-token-proof-program-tests"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bytemuck",
  "curve25519-dalek",
@@ -7762,7 +7699,7 @@ dependencies = [
 
 [[package]]
 name = "solana-zk-token-sdk"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "aes-gcm-siv",
  "base64 0.21.7",
@@ -7774,7 +7711,7 @@ dependencies = [
  "itertools",
  "lazy_static",
  "merlin",
- "num-derive 0.4.2",
+ "num-derive",
  "num-traits",
  "rand 0.7.3",
  "serde",
@@ -7822,13 +7759,13 @@ checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5"
 
 [[package]]
 name = "spl-associated-token-account"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "992d9c64c2564cc8f63a4b508bf3ebcdf2254b0429b13cd1d31adb6162432a5f"
+checksum = "4414117bead33f2a5cf059cefac0685592bdd36f31f3caac49b89bff7f6bbf32"
 dependencies = [
  "assert_matches",
  "borsh 0.10.3",
- "num-derive 0.4.2",
+ "num-derive",
  "num-traits",
  "solana-program",
  "spl-token",
@@ -7838,9 +7775,9 @@ dependencies = [
 
 [[package]]
 name = "spl-discriminator"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f"
+checksum = "daa600f2fe56f32e923261719bae640d873edadbc5237681a39b8e37bfd4d263"
 dependencies = [
  "bytemuck",
  "solana-program",
@@ -7849,9 +7786,9 @@ dependencies = [
 
 [[package]]
 name = "spl-discriminator-derive"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fadbefec4f3c678215ca72bd71862697bb06b41fd77c0088902dd3203354387b"
+checksum = "07fd7858fc4ff8fb0e34090e41d7eb06a823e1057945c26d480bfc21d2338a93"
 dependencies = [
  "quote",
  "spl-discriminator-syn",
@@ -7860,9 +7797,9 @@ dependencies = [
 
 [[package]]
 name = "spl-discriminator-syn"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e5f2044ca42c8938d54d1255ce599c79a1ffd86b677dfab695caa20f9ffc3f2"
+checksum = "18fea7be851bd98d10721782ea958097c03a0c2a07d8d4997041d0ece6319a63"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7873,28 +7810,28 @@ dependencies = [
 
 [[package]]
 name = "spl-instruction-padding"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c5557ec281a34f7f9053feb6e0d795162ba0c6a52898b21c3d1e899481191d5"
+checksum = "be3f0c53b6eb2dfccb77b5710bddb04548da338a3f56bed214177f6a577d1ca6"
 dependencies = [
- "num_enum 0.5.11",
+ "num_enum",
  "solana-program",
 ]
 
 [[package]]
 name = "spl-memo"
-version = "4.0.0"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f180b03318c3dbab3ef4e1e4d46d5211ae3c780940dd0a28695aba4b59a75a"
+checksum = "58e9bae02de3405079a057fe244c867a08f92d48327d231fc60da831f94caf0a"
 dependencies = [
  "solana-program",
 ]
 
 [[package]]
 name = "spl-pod"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079"
+checksum = "85a5db7e4efb1107b0b8e52a13f035437cdcb36ef99c58f6d467f089d9b2915a"
 dependencies = [
  "borsh 0.10.3",
  "bytemuck",
@@ -7905,11 +7842,11 @@ dependencies = [
 
 [[package]]
 name = "spl-program-error"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c"
+checksum = "7e0657b6490196971d9e729520ba934911ff41fbb2cb9004463dbe23cf8b4b4f"
 dependencies = [
- "num-derive 0.4.2",
+ "num-derive",
  "num-traits",
  "solana-program",
  "spl-program-error-derive",
@@ -7918,9 +7855,9 @@ dependencies = [
 
 [[package]]
 name = "spl-program-error-derive"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5269c8e868da17b6552ef35a51355a017bd8e0eae269c201fef830d35fa52c"
+checksum = "1845dfe71fd68f70382232742e758557afe973ae19e6c06807b2c30f5d5cb474"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7930,9 +7867,9 @@ dependencies = [
 
 [[package]]
 name = "spl-tlv-account-resolution"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f7020347c07892c08560d230fbb8a980316c9e198e22b198b7b9d951ff96047"
+checksum = "56f335787add7fa711819f9e7c573f8145a5358a709446fe2d24bf2a88117c90"
 dependencies = [
  "bytemuck",
  "solana-program",
@@ -7944,30 +7881,30 @@ dependencies = [
 
 [[package]]
 name = "spl-token"
-version = "4.0.0"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08459ba1b8f7c1020b4582c4edf0f5c7511a5e099a7a97570c9698d4f2337060"
+checksum = "95ae123223633a389f95d1da9d49c2d0a50d499e7060b9624626a69e536ad2a4"
 dependencies = [
  "arrayref",
  "bytemuck",
- "num-derive 0.3.3",
+ "num-derive",
  "num-traits",
- "num_enum 0.6.1",
+ "num_enum",
  "solana-program",
  "thiserror",
 ]
 
 [[package]]
 name = "spl-token-2022"
-version = "1.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d697fac19fd74ff472dfcc13f0b442dd71403178ce1de7b5d16f83a33561c059"
+checksum = "b9fec83597cf7be923c5c3bdfd2fcc08cdfacd2eeb6c4e413da06b6916f50827"
 dependencies = [
  "arrayref",
  "bytemuck",
- "num-derive 0.4.2",
+ "num-derive",
  "num-traits",
- "num_enum 0.7.2",
+ "num_enum",
  "solana-program",
  "solana-security-txt",
  "solana-zk-token-sdk",
@@ -7983,9 +7920,9 @@ dependencies = [
 
 [[package]]
 name = "spl-token-group-interface"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d"
+checksum = "7eb67fbacd587377a400aba81718abe4424d0e9d5ea510034d3b7f130d102153"
 dependencies = [
  "bytemuck",
  "solana-program",
@@ -7996,9 +7933,9 @@ dependencies = [
 
 [[package]]
 name = "spl-token-metadata-interface"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f"
+checksum = "e16aa8f64b6e0eaab3f5034e84d867c8435d8216497b4543a4978a31f4b6e8a8"
 dependencies = [
  "borsh 0.10.3",
  "solana-program",
@@ -8010,9 +7947,9 @@ dependencies = [
 
 [[package]]
 name = "spl-transfer-hook-interface"
-version = "0.4.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259"
+checksum = "5f6dfe329fcff44cbe2eea994bd8f737f0b0a69faed39e56f9b6ee03badf7e14"
 dependencies = [
  "arrayref",
  "bytemuck",
@@ -8026,9 +7963,9 @@ dependencies = [
 
 [[package]]
 name = "spl-type-length-value"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac"
+checksum = "8f9ebd75d29c5f48de5f6a9c114e08531030b75b8ac2c557600ac7da0b73b1e8"
 dependencies = [
  "bytemuck",
  "solana-program",
diff --git a/Cargo.toml b/Cargo.toml
index d4c48c23d59e54..37b078977b2815 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -127,7 +127,7 @@ exclude = ["programs/sbf"]
 resolver = "2"
 
 [workspace.package]
-version = "1.18.0"
+version = "2.0.0"
 authors = ["Solana Labs Maintainers <maintainers@solanalabs.com>"]
 repository = "https://github.com/solana-labs/solana"
 homepage = "https://solanalabs.com/"
@@ -308,96 +308,96 @@ smallvec = "1.13.1"
 smpl_jwt = "0.7.1"
 socket2 = "0.5.5"
 soketto = "0.7"
-solana-account-decoder = { path = "account-decoder", version = "=1.18.0" }
-solana-accounts-db = { path = "accounts-db", version = "=1.18.0" }
-solana-address-lookup-table-program = { path = "programs/address-lookup-table", version = "=1.18.0" }
-solana-banks-client = { path = "banks-client", version = "=1.18.0" }
-solana-banks-interface = { path = "banks-interface", version = "=1.18.0" }
-solana-banks-server = { path = "banks-server", version = "=1.18.0" }
-solana-bench-tps = { path = "bench-tps", version = "=1.18.0" }
-solana-bloom = { path = "bloom", version = "=1.18.0" }
-solana-bpf-loader-program = { path = "programs/bpf_loader", version = "=1.18.0" }
-solana-bucket-map = { path = "bucket_map", version = "=1.18.0" }
-solana-cargo-registry = { path = "cargo-registry", version = "=1.18.0" }
-solana-clap-utils = { path = "clap-utils", version = "=1.18.0" }
-solana-clap-v3-utils = { path = "clap-v3-utils", version = "=1.18.0" }
-solana-cli = { path = "cli", version = "=1.18.0" }
-solana-cli-config = { path = "cli-config", version = "=1.18.0" }
-solana-cli-output = { path = "cli-output", version = "=1.18.0" }
-solana-client = { path = "client", version = "=1.18.0" }
-solana-compute-budget-program = { path = "programs/compute-budget", version = "=1.18.0" }
-solana-config-program = { path = "programs/config", version = "=1.18.0" }
-solana-connection-cache = { path = "connection-cache", version = "=1.18.0", default-features = false }
-solana-core = { path = "core", version = "=1.18.0" }
-solana-cost-model = { path = "cost-model", version = "=1.18.0" }
-solana-download-utils = { path = "download-utils", version = "=1.18.0" }
-solana-entry = { path = "entry", version = "=1.18.0" }
-solana-faucet = { path = "faucet", version = "=1.18.0" }
-solana-frozen-abi = { path = "frozen-abi", version = "=1.18.0" }
-solana-frozen-abi-macro = { path = "frozen-abi/macro", version = "=1.18.0" }
-solana-genesis = { path = "genesis", version = "=1.18.0" }
-solana-genesis-utils = { path = "genesis-utils", version = "=1.18.0" }
-solana-geyser-plugin-interface = { path = "geyser-plugin-interface", version = "=1.18.0" }
-solana-geyser-plugin-manager = { path = "geyser-plugin-manager", version = "=1.18.0" }
-solana-gossip = { path = "gossip", version = "=1.18.0" }
-solana-ledger = { path = "ledger", version = "=1.18.0" }
-solana-loader-v4-program = { path = "programs/loader-v4", version = "=1.18.0" }
-solana-local-cluster = { path = "local-cluster", version = "=1.18.0" }
-solana-logger = { path = "logger", version = "=1.18.0" }
-solana-measure = { path = "measure", version = "=1.18.0" }
-solana-merkle-tree = { path = "merkle-tree", version = "=1.18.0" }
-solana-metrics = { path = "metrics", version = "=1.18.0" }
-solana-net-utils = { path = "net-utils", version = "=1.18.0" }
+solana-account-decoder = { path = "account-decoder", version = "=2.0.0" }
+solana-accounts-db = { path = "accounts-db", version = "=2.0.0" }
+solana-address-lookup-table-program = { path = "programs/address-lookup-table", version = "=2.0.0" }
+solana-banks-client = { path = "banks-client", version = "=2.0.0" }
+solana-banks-interface = { path = "banks-interface", version = "=2.0.0" }
+solana-banks-server = { path = "banks-server", version = "=2.0.0" }
+solana-bench-tps = { path = "bench-tps", version = "=2.0.0" }
+solana-bloom = { path = "bloom", version = "=2.0.0" }
+solana-bpf-loader-program = { path = "programs/bpf_loader", version = "=2.0.0" }
+solana-bucket-map = { path = "bucket_map", version = "=2.0.0" }
+solana-cargo-registry = { path = "cargo-registry", version = "=2.0.0" }
+solana-clap-utils = { path = "clap-utils", version = "=2.0.0" }
+solana-clap-v3-utils = { path = "clap-v3-utils", version = "=2.0.0" }
+solana-cli = { path = "cli", version = "=2.0.0" }
+solana-cli-config = { path = "cli-config", version = "=2.0.0" }
+solana-cli-output = { path = "cli-output", version = "=2.0.0" }
+solana-client = { path = "client", version = "=2.0.0" }
+solana-compute-budget-program = { path = "programs/compute-budget", version = "=2.0.0" }
+solana-config-program = { path = "programs/config", version = "=2.0.0" }
+solana-connection-cache = { path = "connection-cache", version = "=2.0.0", default-features = false }
+solana-core = { path = "core", version = "=2.0.0" }
+solana-cost-model = { path = "cost-model", version = "=2.0.0" }
+solana-download-utils = { path = "download-utils", version = "=2.0.0" }
+solana-entry = { path = "entry", version = "=2.0.0" }
+solana-faucet = { path = "faucet", version = "=2.0.0" }
+solana-frozen-abi = { path = "frozen-abi", version = "=2.0.0" }
+solana-frozen-abi-macro = { path = "frozen-abi/macro", version = "=2.0.0" }
+solana-genesis = { path = "genesis", version = "=2.0.0" }
+solana-genesis-utils = { path = "genesis-utils", version = "=2.0.0" }
+solana-geyser-plugin-interface = { path = "geyser-plugin-interface", version = "=2.0.0" }
+solana-geyser-plugin-manager = { path = "geyser-plugin-manager", version = "=2.0.0" }
+solana-gossip = { path = "gossip", version = "=2.0.0" }
+solana-ledger = { path = "ledger", version = "=2.0.0" }
+solana-loader-v4-program = { path = "programs/loader-v4", version = "=2.0.0" }
+solana-local-cluster = { path = "local-cluster", version = "=2.0.0" }
+solana-logger = { path = "logger", version = "=2.0.0" }
+solana-measure = { path = "measure", version = "=2.0.0" }
+solana-merkle-tree = { path = "merkle-tree", version = "=2.0.0" }
+solana-metrics = { path = "metrics", version = "=2.0.0" }
+solana-net-utils = { path = "net-utils", version = "=2.0.0" }
 solana-nohash-hasher = "0.2.1"
-solana-notifier = { path = "notifier", version = "=1.18.0" }
-solana-perf = { path = "perf", version = "=1.18.0" }
-solana-poh = { path = "poh", version = "=1.18.0" }
-solana-program = { path = "sdk/program", version = "=1.18.0" }
-solana-program-runtime = { path = "program-runtime", version = "=1.18.0" }
-solana-program-test = { path = "program-test", version = "=1.18.0" }
-solana-pubsub-client = { path = "pubsub-client", version = "=1.18.0" }
-solana-quic-client = { path = "quic-client", version = "=1.18.0" }
-solana-rayon-threadlimit = { path = "rayon-threadlimit", version = "=1.18.0" }
-solana-remote-wallet = { path = "remote-wallet", version = "=1.18.0", default-features = false }
-solana-unified-scheduler-logic = { path = "unified-scheduler-logic", version = "=1.18.0" }
-solana-unified-scheduler-pool = { path = "unified-scheduler-pool", version = "=1.18.0" }
-solana-rpc = { path = "rpc", version = "=1.18.0" }
-solana-rpc-client = { path = "rpc-client", version = "=1.18.0", default-features = false }
-solana-rpc-client-api = { path = "rpc-client-api", version = "=1.18.0" }
-solana-rpc-client-nonce-utils = { path = "rpc-client-nonce-utils", version = "=1.18.0" }
-solana-runtime = { path = "runtime", version = "=1.18.0" }
-solana-runtime-transaction = { path = "runtime-transaction", version = "=1.18.0" }
-solana-sdk = { path = "sdk", version = "=1.18.0" }
-solana-sdk-macro = { path = "sdk/macro", version = "=1.18.0" }
-solana-send-transaction-service = { path = "send-transaction-service", version = "=1.18.0" }
-solana-stake-program = { path = "programs/stake", version = "=1.18.0" }
-solana-storage-bigtable = { path = "storage-bigtable", version = "=1.18.0" }
-solana-storage-proto = { path = "storage-proto", version = "=1.18.0" }
-solana-streamer = { path = "streamer", version = "=1.18.0" }
-solana-svm = { path = "svm", version = "=1.18.0" }
-solana-system-program = { path = "programs/system", version = "=1.18.0" }
-solana-test-validator = { path = "test-validator", version = "=1.18.0" }
-solana-thin-client = { path = "thin-client", version = "=1.18.0" }
-solana-tpu-client = { path = "tpu-client", version = "=1.18.0", default-features = false }
-solana-transaction-status = { path = "transaction-status", version = "=1.18.0" }
-solana-turbine = { path = "turbine", version = "=1.18.0" }
-solana-udp-client = { path = "udp-client", version = "=1.18.0" }
-solana-version = { path = "version", version = "=1.18.0" }
-solana-vote = { path = "vote", version = "=1.18.0" }
-solana-vote-program = { path = "programs/vote", version = "=1.18.0" }
-solana-wen-restart = { path = "wen-restart", version = "=1.18.0" }
-solana-zk-keygen = { path = "zk-keygen", version = "=1.18.0" }
-solana-zk-token-proof-program = { path = "programs/zk-token-proof", version = "=1.18.0" }
-solana-zk-token-sdk = { path = "zk-token-sdk", version = "=1.18.0" }
+solana-notifier = { path = "notifier", version = "=2.0.0" }
+solana-perf = { path = "perf", version = "=2.0.0" }
+solana-poh = { path = "poh", version = "=2.0.0" }
+solana-program = { path = "sdk/program", version = "=2.0.0" }
+solana-program-runtime = { path = "program-runtime", version = "=2.0.0" }
+solana-program-test = { path = "program-test", version = "=2.0.0" }
+solana-pubsub-client = { path = "pubsub-client", version = "=2.0.0" }
+solana-quic-client = { path = "quic-client", version = "=2.0.0" }
+solana-rayon-threadlimit = { path = "rayon-threadlimit", version = "=2.0.0" }
+solana-remote-wallet = { path = "remote-wallet", version = "=2.0.0", default-features = false }
+solana-unified-scheduler-logic = { path = "unified-scheduler-logic", version = "=2.0.0" }
+solana-unified-scheduler-pool = { path = "unified-scheduler-pool", version = "=2.0.0" }
+solana-rpc = { path = "rpc", version = "=2.0.0" }
+solana-rpc-client = { path = "rpc-client", version = "=2.0.0", default-features = false }
+solana-rpc-client-api = { path = "rpc-client-api", version = "=2.0.0" }
+solana-rpc-client-nonce-utils = { path = "rpc-client-nonce-utils", version = "=2.0.0" }
+solana-runtime = { path = "runtime", version = "=2.0.0" }
+solana-runtime-transaction = { path = "runtime-transaction", version = "=2.0.0" }
+solana-sdk = { path = "sdk", version = "=2.0.0" }
+solana-sdk-macro = { path = "sdk/macro", version = "=2.0.0" }
+solana-send-transaction-service = { path = "send-transaction-service", version = "=2.0.0" }
+solana-stake-program = { path = "programs/stake", version = "=2.0.0" }
+solana-storage-bigtable = { path = "storage-bigtable", version = "=2.0.0" }
+solana-storage-proto = { path = "storage-proto", version = "=2.0.0" }
+solana-streamer = { path = "streamer", version = "=2.0.0" }
+solana-svm = { path = "svm", version = "=2.0.0" }
+solana-system-program = { path = "programs/system", version = "=2.0.0" }
+solana-test-validator = { path = "test-validator", version = "=2.0.0" }
+solana-thin-client = { path = "thin-client", version = "=2.0.0" }
+solana-tpu-client = { path = "tpu-client", version = "=2.0.0", default-features = false }
+solana-transaction-status = { path = "transaction-status", version = "=2.0.0" }
+solana-turbine = { path = "turbine", version = "=2.0.0" }
+solana-udp-client = { path = "udp-client", version = "=2.0.0" }
+solana-version = { path = "version", version = "=2.0.0" }
+solana-vote = { path = "vote", version = "=2.0.0" }
+solana-vote-program = { path = "programs/vote", version = "=2.0.0" }
+solana-wen-restart = { path = "wen-restart", version = "=2.0.0" }
+solana-zk-keygen = { path = "zk-keygen", version = "=2.0.0" }
+solana-zk-token-proof-program = { path = "programs/zk-token-proof", version = "=2.0.0" }
+solana-zk-token-sdk = { path = "zk-token-sdk", version = "=2.0.0" }
 solana_rbpf = "=0.8.0"
-spl-associated-token-account = "=2.3.0"
+spl-associated-token-account = "=2.3.1"
 spl-instruction-padding = "0.1"
-spl-memo = "=4.0.0"
-spl-pod = "=0.1.0"
-spl-token = "=4.0.0"
-spl-token-2022 = "=1.0.0"
-spl-token-group-interface = "=0.1.0"
-spl-token-metadata-interface = "=0.2.0"
+spl-memo = "=4.0.1"
+spl-pod = "=0.1.1"
+spl-token = "=4.0.1"
+spl-token-2022 = "=2.0.1"
+spl-token-group-interface = "=0.1.1"
+spl-token-metadata-interface = "=0.2.1"
 static_assertions = "1.1.0"
 stream-cancel = "0.8.2"
 strum = "0.24"
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
index 5af01021f6a1cf..3714c134374a65 100644
--- a/programs/sbf/Cargo.lock
+++ b/programs/sbf/Cargo.lock
@@ -3071,34 +3071,13 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "num_enum"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
-dependencies = [
- "num_enum_derive 0.6.1",
-]
-
 [[package]]
 name = "num_enum"
 version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
 dependencies = [
- "num_enum_derive 0.7.2",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
-dependencies = [
- "proc-macro-crate 1.1.3",
- "proc-macro2",
- "quote",
- "syn 2.0.48",
+ "num_enum_derive",
 ]
 
 [[package]]
@@ -3583,16 +3562,6 @@ dependencies = [
  "toml",
 ]
 
-[[package]]
-name = "proc-macro-crate"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
-dependencies = [
- "thiserror",
- "toml",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "2.0.1"
@@ -4581,7 +4550,7 @@ dependencies = [
 
 [[package]]
 name = "solana-account-decoder"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "Inflector",
  "base64 0.21.7",
@@ -4604,7 +4573,7 @@ dependencies = [
 
 [[package]]
 name = "solana-accounts-db"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "arrayref",
  "bincode",
@@ -4629,7 +4598,7 @@ dependencies = [
  "num-derive 0.4.2",
  "num-traits",
  "num_cpus",
- "num_enum 0.7.2",
+ "num_enum",
  "ouroboros",
  "percentage",
  "qualifier_attr",
@@ -4643,8 +4612,8 @@ dependencies = [
  "smallvec",
  "solana-bucket-map",
  "solana-config-program",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
+ "solana-frozen-abi 2.0.0",
+ "solana-frozen-abi-macro 2.0.0",
  "solana-measure",
  "solana-metrics",
  "solana-nohash-hasher",
@@ -4664,7 +4633,7 @@ dependencies = [
 
 [[package]]
 name = "solana-address-lookup-table-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "bytemuck",
@@ -4673,9 +4642,9 @@ dependencies = [
  "num-traits",
  "rustc_version",
  "serde",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
- "solana-program",
+ "solana-frozen-abi 2.0.0",
+ "solana-frozen-abi-macro 2.0.0",
+ "solana-program 2.0.0",
  "solana-program-runtime",
  "solana-sdk",
  "thiserror",
@@ -4683,12 +4652,12 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-client"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "borsh 1.2.1",
  "futures 0.3.30",
  "solana-banks-interface",
- "solana-program",
+ "solana-program 2.0.0",
  "solana-sdk",
  "tarpc",
  "thiserror",
@@ -4698,7 +4667,7 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-interface"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "serde",
  "solana-sdk",
@@ -4707,7 +4676,7 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-server"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "crossbeam-channel",
@@ -4725,7 +4694,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bloom"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bv",
  "fnv",
@@ -4735,14 +4704,14 @@ dependencies = [
  "rustc_version",
  "serde",
  "serde_derive",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
+ "solana-frozen-abi 2.0.0",
+ "solana-frozen-abi-macro 2.0.0",
  "solana-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-loader-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "byteorder 1.5.0",
@@ -4759,24 +4728,24 @@ dependencies = [
 
 [[package]]
 name = "solana-bpf-rust-big-mod-exp"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "array-bytes",
  "serde",
  "serde_json",
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-bucket-map"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bv",
  "bytemuck",
  "log",
  "memmap2",
  "modular-bitfield",
- "num_enum 0.7.2",
+ "num_enum",
  "rand 0.8.5",
  "solana-measure",
  "solana-sdk",
@@ -4785,7 +4754,7 @@ dependencies = [
 
 [[package]]
 name = "solana-clap-utils"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "chrono",
  "clap 2.33.3",
@@ -4800,7 +4769,7 @@ dependencies = [
 
 [[package]]
 name = "solana-cli-config"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "dirs-next",
  "lazy_static",
@@ -4814,7 +4783,7 @@ dependencies = [
 
 [[package]]
 name = "solana-cli-output"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "Inflector",
  "base64 0.21.7",
@@ -4839,7 +4808,7 @@ dependencies = [
 
 [[package]]
 name = "solana-client"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "async-trait",
  "bincode",
@@ -4870,7 +4839,7 @@ dependencies = [
 
 [[package]]
 name = "solana-compute-budget-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "solana-program-runtime",
  "solana-sdk",
@@ -4878,7 +4847,7 @@ dependencies = [
 
 [[package]]
 name = "solana-config-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "chrono",
@@ -4890,7 +4859,7 @@ dependencies = [
 
 [[package]]
 name = "solana-connection-cache"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "async-trait",
  "bincode",
@@ -4909,7 +4878,7 @@ dependencies = [
 
 [[package]]
 name = "solana-core"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "base64 0.21.7",
  "bincode",
@@ -4927,7 +4896,7 @@ dependencies = [
  "log",
  "lru",
  "min-max-heap",
- "num_enum 0.7.2",
+ "num_enum",
  "prio-graph",
  "quinn",
  "rand 0.8.5",
@@ -4944,8 +4913,8 @@ dependencies = [
  "solana-client",
  "solana-cost-model",
  "solana-entry",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
+ "solana-frozen-abi 2.0.0",
+ "solana-frozen-abi-macro 2.0.0",
  "solana-geyser-plugin-manager",
  "solana-gossip",
  "solana-ledger",
@@ -4984,7 +4953,7 @@ dependencies = [
 
 [[package]]
 name = "solana-cost-model"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "lazy_static",
  "log",
@@ -4993,8 +4962,8 @@ dependencies = [
  "solana-bpf-loader-program",
  "solana-compute-budget-program",
  "solana-config-program",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
+ "solana-frozen-abi 2.0.0",
+ "solana-frozen-abi-macro 2.0.0",
  "solana-loader-v4-program",
  "solana-metrics",
  "solana-program-runtime",
@@ -5006,7 +4975,7 @@ dependencies = [
 
 [[package]]
 name = "solana-download-utils"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "console",
  "indicatif",
@@ -5018,7 +4987,7 @@ dependencies = [
 
 [[package]]
 name = "solana-entry"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "crossbeam-channel",
@@ -5038,7 +5007,7 @@ dependencies = [
 
 [[package]]
 name = "solana-faucet"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "byteorder 1.5.0",
@@ -5060,7 +5029,9 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi"
-version = "1.18.0"
+version = "1.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b24a0e5179387f145afba79d72b27db817cecf1b9494f7cd55d42aa986ed3141"
 dependencies = [
  "block-buffer 0.10.4",
  "bs58",
@@ -5076,14 +5047,49 @@ dependencies = [
  "serde_bytes",
  "serde_derive",
  "sha2 0.10.8",
- "solana-frozen-abi-macro",
+ "solana-frozen-abi-macro 1.18.1",
+ "subtle",
+ "thiserror",
+]
+
+[[package]]
+name = "solana-frozen-abi"
+version = "2.0.0"
+dependencies = [
+ "block-buffer 0.10.4",
+ "bs58",
+ "bv",
+ "either",
+ "generic-array 0.14.7",
+ "im",
+ "lazy_static",
+ "log",
+ "memmap2",
+ "rustc_version",
+ "serde",
+ "serde_bytes",
+ "serde_derive",
+ "sha2 0.10.8",
+ "solana-frozen-abi-macro 2.0.0",
  "subtle",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-frozen-abi-macro"
-version = "1.18.0"
+version = "1.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92970a9898903eb1433d42f53ca4e8f497bc05382b7bc170ea81d4d3c6ff5d58"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "solana-frozen-abi-macro"
+version = "2.0.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5093,7 +5099,7 @@ dependencies = [
 
 [[package]]
 name = "solana-genesis-utils"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "log",
  "solana-accounts-db",
@@ -5104,7 +5110,7 @@ dependencies = [
 
 [[package]]
 name = "solana-geyser-plugin-interface"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "log",
  "solana-sdk",
@@ -5114,7 +5120,7 @@ dependencies = [
 
 [[package]]
 name = "solana-geyser-plugin-manager"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bs58",
  "crossbeam-channel",
@@ -5139,7 +5145,7 @@ dependencies = [
 
 [[package]]
 name = "solana-gossip"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -5164,8 +5170,8 @@ dependencies = [
  "solana-clap-utils",
  "solana-client",
  "solana-entry",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
+ "solana-frozen-abi 2.0.0",
+ "solana-frozen-abi-macro 2.0.0",
  "solana-ledger",
  "solana-logger",
  "solana-measure",
@@ -5187,7 +5193,7 @@ dependencies = [
 
 [[package]]
 name = "solana-ledger"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -5206,7 +5212,7 @@ dependencies = [
  "lru",
  "mockall",
  "num_cpus",
- "num_enum 0.7.2",
+ "num_enum",
  "prost",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
@@ -5223,8 +5229,8 @@ dependencies = [
  "solana-bpf-loader-program",
  "solana-cost-model",
  "solana-entry",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
+ "solana-frozen-abi 2.0.0",
+ "solana-frozen-abi-macro 2.0.0",
  "solana-measure",
  "solana-metrics",
  "solana-perf",
@@ -5253,7 +5259,7 @@ dependencies = [
 
 [[package]]
 name = "solana-loader-v4-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "log",
  "solana-measure",
@@ -5264,7 +5270,7 @@ dependencies = [
 
 [[package]]
 name = "solana-logger"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "env_logger",
  "lazy_static",
@@ -5273,7 +5279,7 @@ dependencies = [
 
 [[package]]
 name = "solana-measure"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "log",
  "solana-sdk",
@@ -5281,15 +5287,15 @@ dependencies = [
 
 [[package]]
 name = "solana-merkle-tree"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "fast-math",
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-metrics"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "crossbeam-channel",
  "gethostname",
@@ -5302,7 +5308,7 @@ dependencies = [
 
 [[package]]
 name = "solana-net-utils"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "clap 3.1.6",
@@ -5328,7 +5334,7 @@ checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e"
 
 [[package]]
 name = "solana-perf"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "ahash 0.8.7",
  "bincode",
@@ -5345,8 +5351,8 @@ dependencies = [
  "rayon",
  "rustc_version",
  "serde",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
+ "solana-frozen-abi 2.0.0",
+ "solana-frozen-abi-macro 2.0.0",
  "solana-metrics",
  "solana-rayon-threadlimit",
  "solana-sdk",
@@ -5355,7 +5361,7 @@ dependencies = [
 
 [[package]]
 name = "solana-poh"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "core_affinity",
  "crossbeam-channel",
@@ -5371,7 +5377,9 @@ dependencies = [
 
 [[package]]
 name = "solana-program"
-version = "1.18.0"
+version = "1.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0ce0a1f4487b0b9e5e53610e8c17e558d17069145281aaae9f825bfef84b16e"
 dependencies = [
  "ark-bn254",
  "ark-ec",
@@ -5413,9 +5421,62 @@ dependencies = [
  "serde_json",
  "sha2 0.10.8",
  "sha3 0.10.4",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
- "solana-sdk-macro",
+ "solana-frozen-abi 1.18.1",
+ "solana-frozen-abi-macro 1.18.1",
+ "solana-sdk-macro 1.18.1",
+ "thiserror",
+ "tiny-bip39",
+ "wasm-bindgen",
+ "zeroize",
+]
+
+[[package]]
+name = "solana-program"
+version = "2.0.0"
+dependencies = [
+ "ark-bn254",
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "base64 0.21.7",
+ "bincode",
+ "bitflags 2.4.2",
+ "blake3",
+ "borsh 0.10.3",
+ "borsh 0.9.3",
+ "borsh 1.2.1",
+ "bs58",
+ "bv",
+ "bytemuck",
+ "cc",
+ "console_error_panic_hook",
+ "console_log",
+ "curve25519-dalek",
+ "getrandom 0.2.10",
+ "itertools",
+ "js-sys",
+ "lazy_static",
+ "libc",
+ "libsecp256k1 0.6.0",
+ "light-poseidon",
+ "log",
+ "memoffset 0.9.0",
+ "num-bigint 0.4.4",
+ "num-derive 0.4.2",
+ "num-traits",
+ "parking_lot 0.12.1",
+ "rand 0.8.5",
+ "rustc_version",
+ "rustversion",
+ "serde",
+ "serde_bytes",
+ "serde_derive",
+ "serde_json",
+ "sha2 0.10.8",
+ "sha3 0.10.4",
+ "solana-frozen-abi 2.0.0",
+ "solana-frozen-abi-macro 2.0.0",
+ "solana-sdk-macro 2.0.0",
  "thiserror",
  "tiny-bip39",
  "wasm-bindgen",
@@ -5424,7 +5485,7 @@ dependencies = [
 
 [[package]]
 name = "solana-program-runtime"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "base64 0.21.7",
  "bincode",
@@ -5439,8 +5500,8 @@ dependencies = [
  "rand 0.8.5",
  "rustc_version",
  "serde",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
+ "solana-frozen-abi 2.0.0",
+ "solana-frozen-abi-macro 2.0.0",
  "solana-measure",
  "solana-metrics",
  "solana-sdk",
@@ -5450,7 +5511,7 @@ dependencies = [
 
 [[package]]
 name = "solana-program-test"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -5479,7 +5540,7 @@ dependencies = [
 
 [[package]]
 name = "solana-pubsub-client"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "crossbeam-channel",
  "futures-util",
@@ -5502,7 +5563,7 @@ dependencies = [
 
 [[package]]
 name = "solana-quic-client"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "async-mutex",
  "async-trait",
@@ -5526,7 +5587,7 @@ dependencies = [
 
 [[package]]
 name = "solana-rayon-threadlimit"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "lazy_static",
  "num_cpus",
@@ -5534,7 +5595,7 @@ dependencies = [
 
 [[package]]
 name = "solana-remote-wallet"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "console",
  "dialoguer",
@@ -5551,7 +5612,7 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "base64 0.21.7",
  "bincode",
@@ -5606,7 +5667,7 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-client"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "async-trait",
  "base64 0.21.7",
@@ -5630,7 +5691,7 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-client-api"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "base64 0.21.7",
  "bs58",
@@ -5650,7 +5711,7 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc-client-nonce-utils"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "clap 2.33.3",
  "solana-clap-utils",
@@ -5661,7 +5722,7 @@ dependencies = [
 
 [[package]]
 name = "solana-runtime"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "aquamarine",
  "arrayref",
@@ -5690,7 +5751,7 @@ dependencies = [
  "num-derive 0.4.2",
  "num-traits",
  "num_cpus",
- "num_enum 0.7.2",
+ "num_enum",
  "ouroboros",
  "percentage",
  "qualifier_attr",
@@ -5708,8 +5769,8 @@ dependencies = [
  "solana-compute-budget-program",
  "solana-config-program",
  "solana-cost-model",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
+ "solana-frozen-abi 2.0.0",
+ "solana-frozen-abi-macro 2.0.0",
  "solana-loader-v4-program",
  "solana-measure",
  "solana-metrics",
@@ -5737,7 +5798,7 @@ dependencies = [
 
 [[package]]
 name = "solana-sbf-programs"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "byteorder 1.5.0",
@@ -5766,210 +5827,210 @@ dependencies = [
 
 [[package]]
 name = "solana-sbf-rust-128bit"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
  "solana-sbf-rust-128bit-dep",
 ]
 
 [[package]]
 name = "solana-sbf-rust-128bit-dep"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-alloc"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-alt-bn128"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "array-bytes",
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-alt-bn128-compression"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "array-bytes",
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-call-depth"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-caller-access"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-curve25519"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
  "solana-zk-token-sdk",
 ]
 
 [[package]]
 name = "solana-sbf-rust-custom-heap"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-dep-crate"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "byteorder 1.5.0",
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-deprecated-loader"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-dup-accounts"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-error-handling"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "num-derive 0.3.0",
  "num-traits",
- "solana-program",
+ "solana-program 2.0.0",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-sbf-rust-external-spend"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-finalize"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-get-minimum-delegation"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-inner_instruction_alignment_check"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-instruction-introspection"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-invoke"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "rustversion",
- "solana-program",
+ "solana-program 2.0.0",
  "solana-sbf-rust-invoked",
  "solana-sbf-rust-realloc",
 ]
 
 [[package]]
 name = "solana-sbf-rust-invoke-and-error"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-invoke-and-ok"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-invoke-and-return"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-invoked"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-iter"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-log-data"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-many-args"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
  "solana-sbf-rust-many-args-dep",
 ]
 
 [[package]]
 name = "solana-sbf-rust-many-args-dep"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-mem"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
  "solana-program-runtime",
  "solana-program-test",
  "solana-sdk",
@@ -5977,78 +6038,78 @@ dependencies = [
 
 [[package]]
 name = "solana-sbf-rust-membuiltins"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
  "solana-sbf-rust-mem",
 ]
 
 [[package]]
 name = "solana-sbf-rust-noop"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-panic"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-param-passing"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
  "solana-sbf-rust-param-passing-dep",
 ]
 
 [[package]]
 name = "solana-sbf-rust-param-passing-dep"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-poseidon"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "array-bytes",
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-rand"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "getrandom 0.2.10",
  "rand 0.8.5",
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-realloc"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-realloc-invoke"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
  "solana-sbf-rust-realloc",
 ]
 
 [[package]]
 name = "solana-sbf-rust-remaining-compute-units"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
  "solana-program-runtime",
  "solana-program-test",
  "solana-sdk",
@@ -6056,23 +6117,23 @@ dependencies = [
 
 [[package]]
 name = "solana-sbf-rust-ro-account_modify"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-ro-modify"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-sanity"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
  "solana-program-runtime",
  "solana-program-test",
  "solana-sdk",
@@ -6080,40 +6141,40 @@ dependencies = [
 
 [[package]]
 name = "solana-sbf-rust-secp256k1-recover"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "libsecp256k1 0.7.0",
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-sha"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "blake3",
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-sibling-instructions"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-sibling_inner-instructions"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-simulation"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "solana-logger",
- "solana-program",
+ "solana-program 2.0.0",
  "solana-program-test",
  "solana-sdk",
  "solana-validator",
@@ -6121,23 +6182,23 @@ dependencies = [
 
 [[package]]
 name = "solana-sbf-rust-spoof1"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-spoof1-system"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-sysvar"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
  "solana-program-runtime",
  "solana-program-test",
  "solana-sdk",
@@ -6145,21 +6206,21 @@ dependencies = [
 
 [[package]]
 name = "solana-sbf-rust-upgradeable"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sbf-rust-upgraded"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "solana-sdk"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "base64 0.21.7",
@@ -6184,7 +6245,7 @@ dependencies = [
  "memmap2",
  "num-derive 0.4.2",
  "num-traits",
- "num_enum 0.7.2",
+ "num_enum",
  "pbkdf2 0.11.0",
  "qstring",
  "qualifier_attr",
@@ -6200,11 +6261,11 @@ dependencies = [
  "sha2 0.10.8",
  "sha3 0.10.4",
  "siphasher",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
+ "solana-frozen-abi 2.0.0",
+ "solana-frozen-abi-macro 2.0.0",
  "solana-logger",
- "solana-program",
- "solana-sdk-macro",
+ "solana-program 2.0.0",
+ "solana-sdk-macro 2.0.0",
  "thiserror",
  "uriparse",
  "wasm-bindgen",
@@ -6212,7 +6273,20 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk-macro"
-version = "1.18.0"
+version = "1.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e3cdf8616a66e99343c3f99c39f311b4dc3e13977a4c96d7bbaa82dffd2fc5"
+dependencies = [
+ "bs58",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "solana-sdk-macro"
+version = "2.0.0"
 dependencies = [
  "bs58",
  "proc-macro2",
@@ -6229,7 +6303,7 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183"
 
 [[package]]
 name = "solana-send-transaction-service"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "crossbeam-channel",
  "log",
@@ -6243,7 +6317,7 @@ dependencies = [
 
 [[package]]
 name = "solana-stake-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "log",
@@ -6256,7 +6330,7 @@ dependencies = [
 
 [[package]]
 name = "solana-storage-bigtable"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "backoff",
  "bincode",
@@ -6288,7 +6362,7 @@ dependencies = [
 
 [[package]]
 name = "solana-storage-proto"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "bs58",
@@ -6303,7 +6377,7 @@ dependencies = [
 
 [[package]]
 name = "solana-streamer"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "async-channel",
  "bytes",
@@ -6331,7 +6405,7 @@ dependencies = [
 
 [[package]]
 name = "solana-svm"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "itertools",
  "log",
@@ -6339,8 +6413,8 @@ dependencies = [
  "rustc_version",
  "solana-accounts-db",
  "solana-bpf-loader-program",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
+ "solana-frozen-abi 2.0.0",
+ "solana-frozen-abi-macro 2.0.0",
  "solana-loader-v4-program",
  "solana-measure",
  "solana-metrics",
@@ -6351,7 +6425,7 @@ dependencies = [
 
 [[package]]
 name = "solana-system-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "log",
@@ -6363,7 +6437,7 @@ dependencies = [
 
 [[package]]
 name = "solana-test-validator"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "base64 0.21.7",
  "bincode",
@@ -6394,7 +6468,7 @@ dependencies = [
 
 [[package]]
 name = "solana-thin-client"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "log",
@@ -6407,7 +6481,7 @@ dependencies = [
 
 [[package]]
 name = "solana-tpu-client"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "async-trait",
  "bincode",
@@ -6429,7 +6503,7 @@ dependencies = [
 
 [[package]]
 name = "solana-transaction-status"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "Inflector",
  "base64 0.21.7",
@@ -6452,7 +6526,7 @@ dependencies = [
 
 [[package]]
 name = "solana-turbine"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "bytes",
@@ -6486,7 +6560,7 @@ dependencies = [
 
 [[package]]
 name = "solana-udp-client"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "async-trait",
  "solana-connection-cache",
@@ -6499,14 +6573,14 @@ dependencies = [
 
 [[package]]
 name = "solana-unified-scheduler-logic"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "solana-sdk",
 ]
 
 [[package]]
 name = "solana-unified-scheduler-pool"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "assert_matches",
  "crossbeam-channel",
@@ -6522,7 +6596,7 @@ dependencies = [
 
 [[package]]
 name = "solana-validator"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "chrono",
  "clap 2.33.3",
@@ -6585,21 +6659,21 @@ dependencies = [
 
 [[package]]
 name = "solana-version"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "log",
  "rustc_version",
  "semver",
  "serde",
  "serde_derive",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
+ "solana-frozen-abi 2.0.0",
+ "solana-frozen-abi-macro 2.0.0",
  "solana-sdk",
 ]
 
 [[package]]
 name = "solana-vote"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "crossbeam-channel",
  "itertools",
@@ -6607,8 +6681,8 @@ dependencies = [
  "rustc_version",
  "serde",
  "serde_derive",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
+ "solana-frozen-abi 2.0.0",
+ "solana-frozen-abi-macro 2.0.0",
  "solana-sdk",
  "solana-vote-program",
  "thiserror",
@@ -6616,7 +6690,7 @@ dependencies = [
 
 [[package]]
 name = "solana-vote-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bincode",
  "log",
@@ -6625,10 +6699,10 @@ dependencies = [
  "rustc_version",
  "serde",
  "serde_derive",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
+ "solana-frozen-abi 2.0.0",
+ "solana-frozen-abi-macro 2.0.0",
  "solana-metrics",
- "solana-program",
+ "solana-program 2.0.0",
  "solana-program-runtime",
  "solana-sdk",
  "thiserror",
@@ -6636,7 +6710,7 @@ dependencies = [
 
 [[package]]
 name = "solana-wen-restart"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "log",
  "prost",
@@ -6647,7 +6721,7 @@ dependencies = [
  "solana-gossip",
  "solana-ledger",
  "solana-logger",
- "solana-program",
+ "solana-program 2.0.0",
  "solana-runtime",
  "solana-sdk",
  "solana-vote-program",
@@ -6655,7 +6729,7 @@ dependencies = [
 
 [[package]]
 name = "solana-zk-token-proof-program"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "bytemuck",
  "num-derive 0.4.2",
@@ -6667,7 +6741,7 @@ dependencies = [
 
 [[package]]
 name = "solana-zk-token-sdk"
-version = "1.18.0"
+version = "2.0.0"
 dependencies = [
  "aes-gcm-siv",
  "base64 0.21.7",
@@ -6685,7 +6759,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha3 0.9.1",
- "solana-program",
+ "solana-program 2.0.0",
  "solana-sdk",
  "subtle",
  "thiserror",
@@ -6725,15 +6799,15 @@ checksum = "c530c2b0d0bf8b69304b39fe2001993e267461948b890cd037d8ad4293fa1a0d"
 
 [[package]]
 name = "spl-associated-token-account"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "992d9c64c2564cc8f63a4b508bf3ebcdf2254b0429b13cd1d31adb6162432a5f"
+checksum = "4414117bead33f2a5cf059cefac0685592bdd36f31f3caac49b89bff7f6bbf32"
 dependencies = [
  "assert_matches",
  "borsh 0.10.3",
  "num-derive 0.4.2",
  "num-traits",
- "solana-program",
+ "solana-program 2.0.0",
  "spl-token",
  "spl-token-2022",
  "thiserror",
@@ -6741,20 +6815,20 @@ dependencies = [
 
 [[package]]
 name = "spl-discriminator"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f"
+checksum = "daa600f2fe56f32e923261719bae640d873edadbc5237681a39b8e37bfd4d263"
 dependencies = [
  "bytemuck",
- "solana-program",
+ "solana-program 2.0.0",
  "spl-discriminator-derive",
 ]
 
 [[package]]
 name = "spl-discriminator-derive"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fadbefec4f3c678215ca72bd71862697bb06b41fd77c0088902dd3203354387b"
+checksum = "07fd7858fc4ff8fb0e34090e41d7eb06a823e1057945c26d480bfc21d2338a93"
 dependencies = [
  "quote",
  "spl-discriminator-syn",
@@ -6763,9 +6837,9 @@ dependencies = [
 
 [[package]]
 name = "spl-discriminator-syn"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e5f2044ca42c8938d54d1255ce599c79a1ffd86b677dfab695caa20f9ffc3f2"
+checksum = "18fea7be851bd98d10721782ea958097c03a0c2a07d8d4997041d0ece6319a63"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6776,44 +6850,44 @@ dependencies = [
 
 [[package]]
 name = "spl-memo"
-version = "4.0.0"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f180b03318c3dbab3ef4e1e4d46d5211ae3c780940dd0a28695aba4b59a75a"
+checksum = "58e9bae02de3405079a057fe244c867a08f92d48327d231fc60da831f94caf0a"
 dependencies = [
- "solana-program",
+ "solana-program 2.0.0",
 ]
 
 [[package]]
 name = "spl-pod"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079"
+checksum = "85a5db7e4efb1107b0b8e52a13f035437cdcb36ef99c58f6d467f089d9b2915a"
 dependencies = [
  "borsh 0.10.3",
  "bytemuck",
- "solana-program",
+ "solana-program 2.0.0",
  "solana-zk-token-sdk",
  "spl-program-error",
 ]
 
 [[package]]
 name = "spl-program-error"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c"
+checksum = "7e0657b6490196971d9e729520ba934911ff41fbb2cb9004463dbe23cf8b4b4f"
 dependencies = [
  "num-derive 0.4.2",
  "num-traits",
- "solana-program",
+ "solana-program 2.0.0",
  "spl-program-error-derive",
  "thiserror",
 ]
 
 [[package]]
 name = "spl-program-error-derive"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5269c8e868da17b6552ef35a51355a017bd8e0eae269c201fef830d35fa52c"
+checksum = "1845dfe71fd68f70382232742e758557afe973ae19e6c06807b2c30f5d5cb474"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6828,7 +6902,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f7020347c07892c08560d230fbb8a980316c9e198e22b198b7b9d951ff96047"
 dependencies = [
  "bytemuck",
- "solana-program",
+ "solana-program 1.18.1",
  "spl-discriminator",
  "spl-pod",
  "spl-program-error",
@@ -6837,31 +6911,31 @@ dependencies = [
 
 [[package]]
 name = "spl-token"
-version = "4.0.0"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08459ba1b8f7c1020b4582c4edf0f5c7511a5e099a7a97570c9698d4f2337060"
+checksum = "95ae123223633a389f95d1da9d49c2d0a50d499e7060b9624626a69e536ad2a4"
 dependencies = [
  "arrayref",
  "bytemuck",
- "num-derive 0.3.0",
+ "num-derive 0.4.2",
  "num-traits",
- "num_enum 0.6.1",
- "solana-program",
+ "num_enum",
+ "solana-program 2.0.0",
  "thiserror",
 ]
 
 [[package]]
 name = "spl-token-2022"
-version = "1.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d697fac19fd74ff472dfcc13f0b442dd71403178ce1de7b5d16f83a33561c059"
+checksum = "b9fec83597cf7be923c5c3bdfd2fcc08cdfacd2eeb6c4e413da06b6916f50827"
 dependencies = [
  "arrayref",
  "bytemuck",
  "num-derive 0.4.2",
  "num-traits",
- "num_enum 0.7.2",
- "solana-program",
+ "num_enum",
+ "solana-program 2.0.0",
  "solana-security-txt",
  "solana-zk-token-sdk",
  "spl-memo",
@@ -6876,12 +6950,12 @@ dependencies = [
 
 [[package]]
 name = "spl-token-group-interface"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d"
+checksum = "7eb67fbacd587377a400aba81718abe4424d0e9d5ea510034d3b7f130d102153"
 dependencies = [
  "bytemuck",
- "solana-program",
+ "solana-program 2.0.0",
  "spl-discriminator",
  "spl-pod",
  "spl-program-error",
@@ -6889,12 +6963,12 @@ dependencies = [
 
 [[package]]
 name = "spl-token-metadata-interface"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f"
+checksum = "e16aa8f64b6e0eaab3f5034e84d867c8435d8216497b4543a4978a31f4b6e8a8"
 dependencies = [
  "borsh 0.10.3",
- "solana-program",
+ "solana-program 2.0.0",
  "spl-discriminator",
  "spl-pod",
  "spl-program-error",
@@ -6903,13 +6977,13 @@ dependencies = [
 
 [[package]]
 name = "spl-transfer-hook-interface"
-version = "0.4.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259"
+checksum = "5f6dfe329fcff44cbe2eea994bd8f737f0b0a69faed39e56f9b6ee03badf7e14"
 dependencies = [
  "arrayref",
  "bytemuck",
- "solana-program",
+ "solana-program 2.0.0",
  "spl-discriminator",
  "spl-pod",
  "spl-program-error",
@@ -6919,12 +6993,12 @@ dependencies = [
 
 [[package]]
 name = "spl-type-length-value"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac"
+checksum = "8f9ebd75d29c5f48de5f6a9c114e08531030b75b8ac2c557600ac7da0b73b1e8"
 dependencies = [
  "bytemuck",
- "solana-program",
+ "solana-program 2.0.0",
  "spl-discriminator",
  "spl-pod",
  "spl-program-error",
diff --git a/programs/sbf/Cargo.toml b/programs/sbf/Cargo.toml
index e61ad6e1aaf724..022ab0ed3498c5 100644
--- a/programs/sbf/Cargo.toml
+++ b/programs/sbf/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace.package]
-version = "1.18.0"
+version = "2.0.0"
 description = "Solana SBF test program written in Rust"
 authors = ["Solana Labs Maintainers <maintainers@solanalabs.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -25,29 +25,29 @@ rand = "0.8"
 rustversion = "1.0.14"
 serde = "1.0.112"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../../account-decoder", version = "=1.18.0" }
-solana-accounts-db = { path = "../../accounts-db", version = "=1.18.0" }
-solana-bpf-loader-program = { path = "../bpf_loader", version = "=1.18.0" }
-solana-cli-output = { path = "../../cli-output", version = "=1.18.0" }
-solana-ledger = { path = "../../ledger", version = "=1.18.0" }
-solana-logger = { path = "../../logger", version = "=1.18.0" }
-solana-measure = { path = "../../measure", version = "=1.18.0" }
-solana-program = { path = "../../sdk/program", version = "=1.18.0" }
-solana-program-runtime = { path = "../../program-runtime", version = "=1.18.0" }
-solana-program-test = { path = "../../program-test", version = "=1.18.0" }
-solana-runtime = { path = "../../runtime", version = "=1.18.0" }
-solana-sbf-rust-128bit-dep = { path = "rust/128bit_dep", version = "=1.18.0" }
-solana-sbf-rust-invoke = { path = "rust/invoke", version = "=1.18.0" }
-solana-sbf-rust-invoked = { path = "rust/invoked", version = "=1.18.0", default-features = false }
-solana-sbf-rust-many-args-dep = { path = "rust/many_args_dep", version = "=1.18.0" }
-solana-sbf-rust-mem = { path = "rust/mem", version = "=1.18.0" }
-solana-sbf-rust-param-passing-dep = { path = "rust/param_passing_dep", version = "=1.18.0" }
-solana-sbf-rust-realloc = { path = "rust/realloc", version = "=1.18.0", default-features = false }
-solana-sbf-rust-realloc-invoke = { path = "rust/realloc_invoke", version = "=1.18.0" }
-solana-sdk = { path = "../../sdk", version = "=1.18.0" }
-solana-transaction-status = { path = "../../transaction-status", version = "=1.18.0" }
-solana-validator = { path = "../../validator", version = "=1.18.0" }
-solana-zk-token-sdk = { path = "../../zk-token-sdk", version = "=1.18.0" }
+solana-account-decoder = { path = "../../account-decoder", version = "=2.0.0" }
+solana-accounts-db = { path = "../../accounts-db", version = "=2.0.0" }
+solana-bpf-loader-program = { path = "../bpf_loader", version = "=2.0.0" }
+solana-cli-output = { path = "../../cli-output", version = "=2.0.0" }
+solana-ledger = { path = "../../ledger", version = "=2.0.0" }
+solana-logger = { path = "../../logger", version = "=2.0.0" }
+solana-measure = { path = "../../measure", version = "=2.0.0" }
+solana-program = { path = "../../sdk/program", version = "=2.0.0" }
+solana-program-runtime = { path = "../../program-runtime", version = "=2.0.0" }
+solana-program-test = { path = "../../program-test", version = "=2.0.0" }
+solana-runtime = { path = "../../runtime", version = "=2.0.0" }
+solana-sbf-rust-128bit-dep = { path = "rust/128bit_dep", version = "=2.0.0" }
+solana-sbf-rust-invoke = { path = "rust/invoke", version = "=2.0.0" }
+solana-sbf-rust-invoked = { path = "rust/invoked", version = "=2.0.0", default-features = false }
+solana-sbf-rust-many-args-dep = { path = "rust/many_args_dep", version = "=2.0.0" }
+solana-sbf-rust-mem = { path = "rust/mem", version = "=2.0.0" }
+solana-sbf-rust-param-passing-dep = { path = "rust/param_passing_dep", version = "=2.0.0" }
+solana-sbf-rust-realloc = { path = "rust/realloc", version = "=2.0.0", default-features = false }
+solana-sbf-rust-realloc-invoke = { path = "rust/realloc_invoke", version = "=2.0.0" }
+solana-sdk = { path = "../../sdk", version = "=2.0.0" }
+solana-transaction-status = { path = "../../transaction-status", version = "=2.0.0" }
+solana-validator = { path = "../../validator", version = "=2.0.0" }
+solana-zk-token-sdk = { path = "../../zk-token-sdk", version = "=2.0.0" }
 solana_rbpf = "=0.8.0"
 static_assertions = "1.1.0"
 thiserror = "1.0"
diff --git a/sdk/cargo-build-sbf/tests/crates/fail/Cargo.toml b/sdk/cargo-build-sbf/tests/crates/fail/Cargo.toml
index 00fdb7e5330ea7..7dc085d721af50 100644
--- a/sdk/cargo-build-sbf/tests/crates/fail/Cargo.toml
+++ b/sdk/cargo-build-sbf/tests/crates/fail/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fail"
-version = "1.18.0"
+version = "2.0.0"
 description = "Solana SBF test program written in Rust"
 authors = ["Solana Labs Maintainers <maintainers@solanalabs.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-solana-program = { path = "../../../../program", version = "=1.18.0" }
+solana-program = { path = "../../../../program", version = "=2.0.0" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/sdk/cargo-build-sbf/tests/crates/noop/Cargo.toml b/sdk/cargo-build-sbf/tests/crates/noop/Cargo.toml
index c4fb1364393d35..3d3946decdb6ab 100644
--- a/sdk/cargo-build-sbf/tests/crates/noop/Cargo.toml
+++ b/sdk/cargo-build-sbf/tests/crates/noop/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "noop"
-version = "1.18.0"
+version = "2.0.0"
 description = "Solana SBF test program written in Rust"
 authors = ["Solana Labs Maintainers <maintainers@solanalabs.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-solana-program = { path = "../../../../program", version = "=1.18.0" }
+solana-program = { path = "../../../../program", version = "=2.0.0" }
 
 [lib]
 crate-type = ["cdylib"]