diff --git a/Cargo.lock b/Cargo.lock
index b1a57d9b..859a55c8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -94,7 +94,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d6fdfd3a221921780d57ed69e2959dc2d2d9ae342815ac663870f336e25eee4"
 dependencies = [
  "log",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-signature 2.3.0",
  "solana-transaction",
  "solana-transaction-status",
@@ -5563,13 +5563,26 @@ dependencies = [
  "serde_bytes",
  "serde_derive",
  "solana-account-info 2.3.0",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-instruction 2.3.0",
  "solana-pubkey 2.4.0",
  "solana-sdk-ids 2.2.1",
  "solana-sysvar",
 ]
 
+[[package]]
+name = "solana-account"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f885ce7f937871ecb56aadbeaaec963b234a580b7d6ebbdb8fa4249a36f92433"
+dependencies = [
+ "solana-account-info 3.0.0",
+ "solana-clock 3.0.0",
+ "solana-instruction-error",
+ "solana-pubkey 3.0.0",
+ "solana-sdk-ids 3.0.0",
+]
+
 [[package]]
 name = "solana-account-decoder"
 version = "2.3.4"
@@ -5584,10 +5597,10 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-account-decoder-client-types",
  "solana-address-lookup-table-interface",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-config-program-client",
  "solana-epoch-schedule",
  "solana-fee-calculator",
@@ -5624,7 +5637,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-pubkey 2.4.0",
  "zstd",
 ]
@@ -5685,10 +5698,10 @@ dependencies = [
  "serde_derive",
  "slab",
  "smallvec",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-address-lookup-table-interface",
  "solana-bucket-map",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-epoch-schedule",
  "solana-fee-calculator",
  "solana-genesis-config",
@@ -5749,7 +5762,7 @@ dependencies = [
  "bytemuck",
  "serde",
  "serde_derive",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-instruction 2.3.0",
  "solana-pubkey 2.4.0",
  "solana-sdk-ids 2.2.1",
@@ -5782,9 +5795,9 @@ checksum = "70bdbf1c4bd667bae0cbb0ba2cbfd809ac89838e697215a6d21b4ee866aa0143"
 dependencies = [
  "borsh 1.5.7",
  "futures 0.3.31",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-banks-interface",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-commitment-config",
  "solana-hash 2.3.0",
  "solana-message",
@@ -5810,8 +5823,8 @@ checksum = "f92736b0f47f43386f50e168d229935d5e1dd0b4e1d49be468f0ca3d2d52df6d"
 dependencies = [
  "serde",
  "serde_derive",
- "solana-account",
- "solana-clock",
+ "solana-account 2.2.1",
+ "solana-clock 2.2.2",
  "solana-commitment-config",
  "solana-hash 2.3.0",
  "solana-message",
@@ -5833,10 +5846,10 @@ dependencies = [
  "bincode",
  "crossbeam-channel",
  "futures 0.3.31",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-banks-interface",
  "solana-client",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-commitment-config",
  "solana-hash 2.3.0",
  "solana-message",
@@ -5947,13 +5960,13 @@ dependencies = [
  "num-traits",
  "qualifier_attr",
  "scopeguard",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-account-info 2.3.0",
  "solana-big-mod-exp",
  "solana-bincode",
  "solana-blake3-hasher",
  "solana-bn254",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-cpi",
  "solana-curve25519",
  "solana-hash 2.3.0",
@@ -5996,7 +6009,7 @@ dependencies = [
  "modular-bitfield",
  "num_enum",
  "rand 0.8.5",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-measure",
  "solana-pubkey 2.4.0",
  "tempfile",
@@ -6051,7 +6064,7 @@ dependencies = [
  "chrono",
  "clap 2.34.0",
  "rpassword",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-cluster-type",
  "solana-commitment-config",
  "solana-derivation-path 2.2.1",
@@ -6080,7 +6093,7 @@ dependencies = [
  "chrono",
  "clap 3.2.25",
  "rpassword",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-cluster-type",
  "solana-commitment-config",
  "solana-derivation-path 2.2.1",
@@ -6135,12 +6148,12 @@ dependencies = [
  "semver",
  "serde",
  "serde_json",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-account-decoder",
  "solana-bincode",
  "solana-clap-utils",
  "solana-cli-config",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-epoch-info",
  "solana-hash 2.3.0",
  "solana-message",
@@ -6176,7 +6189,7 @@ dependencies = [
  "log",
  "quinn",
  "rayon",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-client-traits",
  "solana-commitment-config",
  "solana-connection-cache",
@@ -6212,7 +6225,7 @@ version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83f0071874e629f29e0eb3dab8a863e98502ac7aba55b7e0df1803fc5cac72a7"
 dependencies = [
- "solana-account",
+ "solana-account 2.2.1",
  "solana-commitment-config",
  "solana-epoch-info",
  "solana-hash 2.3.0",
@@ -6236,10 +6249,19 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-sdk-ids 2.2.1",
- "solana-sdk-macro",
+ "solana-sdk-macro 2.2.1",
  "solana-sysvar-id 2.2.1",
 ]
 
+[[package]]
+name = "solana-clock"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb62e9381182459a4520b5fe7fb22d423cae736239a6427fc398a88743d0ed59"
+dependencies = [
+ "solana-sdk-macro 3.0.0",
+]
+
 [[package]]
 name = "solana-cluster-type"
 version = "2.2.1"
@@ -6393,14 +6415,14 @@ dependencies = [
  "serde_bytes",
  "serde_derive",
  "slab",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-accounts-db",
  "solana-address-lookup-table-interface",
  "solana-bincode",
  "solana-bloom",
  "solana-builtins-default-costs",
  "solana-client",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-compute-budget",
  "solana-compute-budget-instruction",
  "solana-compute-budget-interface",
@@ -6496,7 +6518,7 @@ dependencies = [
  "solana-bincode",
  "solana-borsh 2.2.1",
  "solana-builtins-default-costs",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-compute-budget",
  "solana-compute-budget-instruction",
  "solana-compute-budget-interface",
@@ -6644,7 +6666,7 @@ dependencies = [
  "serde_derive",
  "solana-hash 2.3.0",
  "solana-sdk-ids 2.2.1",
- "solana-sdk-macro",
+ "solana-sdk-macro 2.2.1",
  "solana-sysvar-id 2.2.1",
 ]
 
@@ -6668,7 +6690,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-sdk-ids 2.2.1",
- "solana-sdk-macro",
+ "solana-sdk-macro 2.2.1",
  "solana-sysvar-id 2.2.1",
 ]
 
@@ -6681,7 +6703,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-address-lookup-table-interface",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-hash 2.3.0",
  "solana-instruction 2.3.0",
  "solana-keccak-hasher",
@@ -6735,7 +6757,7 @@ dependencies = [
  "bincode",
  "serde",
  "serde_derive",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-account-info 2.3.0",
  "solana-instruction 2.3.0",
  "solana-program-error 2.2.1",
@@ -6804,8 +6826,8 @@ dependencies = [
  "memmap2 0.5.10",
  "serde",
  "serde_derive",
- "solana-account",
- "solana-clock",
+ "solana-account 2.2.1",
+ "solana-clock 2.2.2",
  "solana-cluster-type",
  "solana-epoch-schedule",
  "solana-fee-calculator",
@@ -6838,9 +6860,9 @@ dependencies = [
  "libloading",
  "log",
  "serde_json",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-accounts-db",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-entry",
  "solana-ledger",
  "solana-measure",
@@ -6885,7 +6907,7 @@ dependencies = [
  "solana-bloom",
  "solana-clap-utils",
  "solana-client",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-connection-cache",
  "solana-entry",
  "solana-epoch-schedule",
@@ -7084,7 +7106,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-sdk-ids 2.2.1",
- "solana-sdk-macro",
+ "solana-sdk-macro 2.2.1",
  "solana-sysvar-id 2.2.1",
 ]
 
@@ -7139,12 +7161,12 @@ dependencies = [
  "serde",
  "serde_bytes",
  "sha2 0.10.9",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-account-decoder",
  "solana-accounts-db",
  "solana-address-lookup-table-interface",
  "solana-bpf-loader-program",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-cost-model",
  "solana-entry",
  "solana-epoch-schedule",
@@ -7249,7 +7271,7 @@ checksum = "9aa980c021f655b702c4282c10422ea0f7d10ee00347be45ad329d317a0af6f3"
 dependencies = [
  "log",
  "qualifier_attr",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-bincode",
  "solana-bpf-loader-program",
  "solana-instruction 2.3.0",
@@ -7428,7 +7450,7 @@ version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cde971a20b8dbf60144d6a84439dda86b5466e00e2843091fe731083cda614da"
 dependencies = [
- "solana-account",
+ "solana-account 2.2.1",
  "solana-hash 2.3.0",
  "solana-nonce",
  "solana-sdk-ids 2.2.1",
@@ -7506,7 +7528,7 @@ dependencies = [
  "crossbeam-channel",
  "log",
  "qualifier_attr",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-entry",
  "solana-hash 2.3.0",
  "solana-ledger",
@@ -7612,7 +7634,7 @@ dependencies = [
  "solana-bincode",
  "solana-blake3-hasher",
  "solana-borsh 2.2.1",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-cpi",
  "solana-decode-error",
  "solana-define-syscall 2.3.0",
@@ -7642,7 +7664,7 @@ dependencies = [
  "solana-rent",
  "solana-sanitize 2.2.1",
  "solana-sdk-ids 2.2.1",
- "solana-sdk-macro",
+ "solana-sdk-macro 2.2.1",
  "solana-secp256k1-recover",
  "solana-serde-varint",
  "solana-serialize-utils 2.2.1",
@@ -7759,8 +7781,8 @@ dependencies = [
  "percentage",
  "rand 0.8.5",
  "serde",
- "solana-account",
- "solana-clock",
+ "solana-account 2.2.1",
+ "solana-clock 2.2.2",
  "solana-epoch-rewards",
  "solana-epoch-schedule",
  "solana-fee-structure",
@@ -7803,13 +7825,13 @@ dependencies = [
  "crossbeam-channel",
  "log",
  "serde",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-account-info 2.3.0",
  "solana-accounts-db",
  "solana-banks-client",
  "solana-banks-interface",
  "solana-banks-server",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-commitment-config",
  "solana-compute-budget",
  "solana-epoch-rewards",
@@ -7902,7 +7924,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "solana-account-decoder-client-types",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-pubkey 2.4.0",
  "solana-rpc-client-types",
  "solana-signature 2.3.0",
@@ -7995,7 +8017,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-sdk-ids 2.2.1",
- "solana-sdk-macro",
+ "solana-sdk-macro 2.2.1",
  "solana-sysvar-id 2.2.1",
 ]
 
@@ -8007,8 +8029,8 @@ checksum = "7c1e19f5d5108b0d824244425e43bc78bbb9476e2199e979b0230c9f632d3bf4"
 dependencies = [
  "serde",
  "serde_derive",
- "solana-account",
- "solana-clock",
+ "solana-account 2.2.1",
+ "solana-clock 2.2.2",
  "solana-epoch-schedule",
  "solana-genesis-config",
  "solana-pubkey 2.4.0",
@@ -8074,11 +8096,11 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "soketto",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-account-decoder",
  "solana-accounts-db",
  "solana-client",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-commitment-config",
  "solana-entry",
  "solana-epoch-info",
@@ -8153,9 +8175,9 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-account-decoder-client-types",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-commitment-config",
  "solana-epoch-info",
  "solana-epoch-schedule",
@@ -8188,7 +8210,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "solana-account-decoder-client-types",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-rpc-client-types",
  "solana-signer 2.2.1",
  "solana-transaction-error 2.2.1",
@@ -8202,7 +8224,7 @@ version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "582f8b6b0404d6dca8064ebfefd310c1d183d33a018a89844e82ef0c28824671"
 dependencies = [
- "solana-account",
+ "solana-account 2.2.1",
  "solana-commitment-config",
  "solana-hash 2.3.0",
  "solana-message",
@@ -8225,9 +8247,9 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-account-decoder-client-types",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-commitment-config",
  "solana-fee-calculator",
  "solana-inflation",
@@ -8284,7 +8306,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "serde_with",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-account-info 2.3.0",
  "solana-accounts-db",
  "solana-address-lookup-table-interface",
@@ -8292,7 +8314,7 @@ dependencies = [
  "solana-bucket-map",
  "solana-builtins",
  "solana-client-traits",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-commitment-config",
  "solana-compute-budget",
  "solana-compute-budget-instruction",
@@ -8438,7 +8460,7 @@ dependencies = [
  "js-sys",
  "serde",
  "serde_json",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-bn254",
  "solana-client-traits",
  "solana-cluster-type",
@@ -8475,7 +8497,7 @@ dependencies = [
  "solana-reward-info",
  "solana-sanitize 2.2.1",
  "solana-sdk-ids 2.2.1",
- "solana-sdk-macro",
+ "solana-sdk-macro 2.2.1",
  "solana-secp256k1-program",
  "solana-secp256k1-recover",
  "solana-secp256r1-program",
@@ -8527,6 +8549,18 @@ dependencies = [
  "syn 2.0.99",
 ]
 
+[[package]]
+name = "solana-sdk-macro"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6430000e97083460b71d9fbadc52a2ab2f88f53b3a4c5e58c5ae3640a0e8c00"
+dependencies = [
+ "bs58",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
 [[package]]
 name = "solana-secp256k1-program"
 version = "2.2.1"
@@ -8628,7 +8662,7 @@ dependencies = [
  "itertools 0.12.1",
  "log",
  "solana-client",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-connection-cache",
  "solana-hash 2.3.0",
  "solana-keypair",
@@ -8821,7 +8855,7 @@ dependencies = [
  "num-traits",
  "serde",
  "serde_derive",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-cpi",
  "solana-decode-error",
  "solana-instruction 2.3.0",
@@ -8840,9 +8874,9 @@ dependencies = [
  "agave-feature-set",
  "bincode",
  "log",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-bincode",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-config-program-client",
  "solana-genesis-config",
  "solana-instruction 2.3.0",
@@ -8885,7 +8919,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "smpl_jwt",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-message",
  "solana-metrics",
  "solana-pubkey 2.4.0",
@@ -8986,8 +9020,8 @@ dependencies = [
  "percentage",
  "serde",
  "serde_derive",
- "solana-account",
- "solana-clock",
+ "solana-account 2.2.1",
+ "solana-clock 2.2.2",
  "solana-fee-structure",
  "solana-hash 2.3.0",
  "solana-instruction 2.3.0",
@@ -9029,7 +9063,7 @@ version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4aa58b3b9410f377b572cb2e7fd1910900295bce47b9dcdbcbc42569a2b192c9"
 dependencies = [
- "solana-account",
+ "solana-account 2.2.1",
  "solana-precompile-error",
  "solana-pubkey 2.4.0",
 ]
@@ -9046,8 +9080,8 @@ version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0012625e8569e94c044bed0c466ee6dab9af5a821d279933fbc343e38b842cc9"
 dependencies = [
- "solana-account",
- "solana-clock",
+ "solana-account 2.2.1",
+ "solana-clock 2.2.2",
  "solana-pubkey 2.4.0",
  "solana-rent",
  "solana-rent-collector",
@@ -9096,7 +9130,7 @@ dependencies = [
  "log",
  "serde",
  "serde_derive",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-bincode",
  "solana-fee-calculator",
  "solana-instruction 2.3.0",
@@ -9142,7 +9176,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-account-info 2.3.0",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-define-syscall 2.3.0",
  "solana-epoch-rewards",
  "solana-epoch-schedule",
@@ -9158,7 +9192,7 @@ dependencies = [
  "solana-rent",
  "solana-sanitize 2.2.1",
  "solana-sdk-ids 2.2.1",
- "solana-sdk-macro",
+ "solana-sdk-macro 2.2.1",
  "solana-slot-hashes",
  "solana-slot-history",
  "solana-stake-interface",
@@ -9198,10 +9232,10 @@ dependencies = [
  "log",
  "serde_derive",
  "serde_json",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-accounts-db",
  "solana-cli-output",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-cluster-type",
  "solana-commitment-config",
  "solana-compute-budget",
@@ -9243,9 +9277,9 @@ dependencies = [
  "bincode",
  "log",
  "rayon",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-client-traits",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-commitment-config",
  "solana-connection-cache",
  "solana-epoch-info",
@@ -9307,7 +9341,7 @@ dependencies = [
  "log",
  "rayon",
  "solana-client-traits",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-commitment-config",
  "solana-connection-cache",
  "solana-epoch-schedule",
@@ -9338,7 +9372,7 @@ dependencies = [
  "lru",
  "quinn",
  "rustls 0.23.29",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-connection-cache",
  "solana-keypair",
  "solana-measure",
@@ -9390,7 +9424,7 @@ dependencies = [
  "bincode",
  "serde",
  "serde_derive",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-instruction 2.3.0",
  "solana-instructions-sysvar 2.2.2",
  "solana-pubkey 2.4.0",
@@ -9454,7 +9488,7 @@ dependencies = [
  "serde_json",
  "solana-account-decoder",
  "solana-address-lookup-table-interface",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-hash 2.3.0",
  "solana-instruction 2.3.0",
  "solana-loader-v2-interface",
@@ -9525,7 +9559,7 @@ dependencies = [
  "rand_chacha 0.3.1",
  "rayon",
  "rustls 0.23.29",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-cluster-type",
  "solana-entry",
  "solana-gossip",
@@ -9612,7 +9646,7 @@ dependencies = [
  "log",
  "qualifier_attr",
  "scopeguard",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-cost-model",
  "solana-ledger",
  "solana-poh",
@@ -9661,9 +9695,9 @@ dependencies = [
  "log",
  "serde",
  "serde_derive",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-bincode",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-hash 2.3.0",
  "solana-instruction 2.3.0",
  "solana-keypair",
@@ -9690,7 +9724,7 @@ dependencies = [
  "num-traits",
  "serde",
  "serde_derive",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-decode-error",
  "solana-hash 2.3.0",
  "solana-instruction 2.3.0",
@@ -9716,9 +9750,9 @@ dependencies = [
  "num-traits",
  "serde",
  "serde_derive",
- "solana-account",
+ "solana-account 2.2.1",
  "solana-bincode",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-epoch-schedule",
  "solana-hash 2.3.0",
  "solana-instruction 2.3.0",
@@ -9749,7 +9783,7 @@ dependencies = [
  "prost-types",
  "protobuf-src",
  "rayon",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-entry",
  "solana-gossip",
  "solana-hash 2.3.0",
@@ -10230,7 +10264,7 @@ dependencies = [
  "num-traits",
  "num_enum",
  "solana-account-info 2.3.0",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-cpi",
  "solana-decode-error",
  "solana-instruction 2.3.0",
@@ -10278,9 +10312,9 @@ dependencies = [
  "serde_json",
  "serde_with",
  "serial_test",
- "solana-account",
+ "solana-account 3.0.0",
  "solana-account-info 2.3.0",
- "solana-clock",
+ "solana-clock 2.2.2",
  "solana-cpi",
  "solana-hash 2.3.0",
  "solana-instruction 2.3.0",
@@ -10434,7 +10468,7 @@ dependencies = [
  "bytemuck",
  "futures 0.3.31",
  "futures-util",
- "solana-account",
+ "solana-account 3.0.0",
  "solana-banks-client",
  "solana-banks-interface",
  "solana-cli-output",
diff --git a/clients/rust-legacy/Cargo.toml b/clients/rust-legacy/Cargo.toml
index 419ee8c1..6ee9fb15 100644
--- a/clients/rust-legacy/Cargo.toml
+++ b/clients/rust-legacy/Cargo.toml
@@ -25,7 +25,7 @@ bincode = "1.3.2"
 bytemuck = "1.23.1"
 futures = "0.3.31"
 futures-util = "0.3"
-solana-account = "2.2.1"
+solana-account = "3.0.0"
 solana-banks-client = { version = "2.3.4", optional = true }
 solana-banks-interface = { version = "2.3.4", optional = true }
 solana-compute-budget-interface = "2.2.1"
diff --git a/program/Cargo.toml b/program/Cargo.toml
index 0229ba11..846940c2 100644
--- a/program/Cargo.toml
+++ b/program/Cargo.toml
@@ -62,7 +62,7 @@ spl-token-confidential-transfer-proof-generation = { version = "0.4.1" }
 lazy_static = "1.5.0"
 proptest = "1.7"
 serial_test = "3.2.0"
-solana-account = "2.2.1"
+solana-account = "3.0.0"
 solana-hash = "2.2.1"
 solana-keypair = "2.2.1"
 solana-program-test = "2.3.4"