diff --git a/Cargo.lock b/Cargo.lock
index 0aaac540b..766597ab8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2003,6 +2003,15 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "five8"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23f76610e969fa1784327ded240f1e28a3fd9520c9cec93b636fcf62dd37f772"
+dependencies = [
+ "five8_core",
+]
+
 [[package]]
 name = "five8_const"
 version = "0.1.3"
@@ -2012,6 +2021,15 @@ dependencies = [
  "five8_core",
 ]
 
+[[package]]
+name = "five8_const"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a0f1728185f277989ca573a402716ae0beaaea3f76a8ff87ef9dd8fb19436c5"
+dependencies = [
+ "five8_core",
+]
+
 [[package]]
 name = "five8_core"
 version = "0.1.1"
@@ -5280,11 +5298,22 @@ checksum = "6abe81cfc4a75f71a510c6856b03a7d8525e416af3c69d55daef62e6078b8d40"
 dependencies = [
  "bincode",
  "serde",
- "solana-program-error",
- "solana-program-memory",
+ "solana-program-error 2.1.0",
+ "solana-program-memory 2.1.0",
  "solana-pubkey",
 ]
 
+[[package]]
+name = "solana-account-info"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc3397241392f5756925029acaa8515dc70fcbe3d8059d4885d7d6533baf64fd"
+dependencies = [
+ "solana-address",
+ "solana-program-error 3.0.0",
+ "solana-program-memory 3.1.0",
+]
+
 [[package]]
 name = "solana-accounts-db"
 version = "2.1.0"
@@ -5331,6 +5360,17 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
+[[package]]
+name = "solana-address"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e37320fd2945c5d654b2c6210624a52d66c3f1f73b653ed211ab91a703b35bdd"
+dependencies = [
+ "five8",
+ "five8_const 1.0.0",
+ "solana-program-error 3.0.0",
+]
+
 [[package]]
 name = "solana-address-lookup-table-program"
 version = "2.1.0"
@@ -5479,7 +5519,7 @@ dependencies = [
  "solana-log-collector",
  "solana-measure",
  "solana-poseidon",
- "solana-program-memory",
+ "solana-program-memory 2.1.0",
  "solana-program-runtime",
  "solana-sdk",
  "solana-timings",
@@ -5817,10 +5857,10 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25c536ad0ce25d84a64f48dedcb773e764827e0ef781eda41fa1fa35f5d64b38"
 dependencies = [
- "solana-account-info",
- "solana-define-syscall",
+ "solana-account-info 2.1.0",
+ "solana-define-syscall 2.1.0",
  "solana-instruction",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-pubkey",
  "solana-stable-layout",
 ]
@@ -5853,6 +5893,12 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7062ae1de58e294d3bee5fd2c89efc155b7f7383ddce4cb88345dfafaaabc5bd"
 
+[[package]]
+name = "solana-define-syscall"
+version = "4.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57e5b1c0bc1d4a4d10c88a4100499d954c09d3fecfae4912c1a074dff68b1738"
+
 [[package]]
 name = "solana-derivation-path"
 version = "2.1.0"
@@ -6085,7 +6131,7 @@ dependencies = [
  "num-traits",
  "serde",
  "serde_derive",
- "solana-define-syscall",
+ "solana-define-syscall 2.1.0",
  "solana-pubkey",
  "wasm-bindgen",
 ]
@@ -6261,7 +6307,7 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f7551f85064bc7299d56dbd7126258b084a2d78d0325b1579324f818b405123"
 dependencies = [
- "solana-define-syscall",
+ "solana-define-syscall 2.1.0",
 ]
 
 [[package]]
@@ -6362,7 +6408,7 @@ checksum = "f193a65f0db7fe5615c76c2814d6450a2e4cda61f786d5bf7a6b1ad0c179b947"
 dependencies = [
  "ark-bn254",
  "light-poseidon",
- "solana-define-syscall",
+ "solana-define-syscall 2.1.0",
  "thiserror 1.0.69",
 ]
 
@@ -6395,7 +6441,7 @@ dependencies = [
  "console_error_panic_hook",
  "console_log",
  "curve25519-dalek 4.1.3",
- "five8_const",
+ "five8_const 0.1.3",
  "getrandom 0.2.10",
  "js-sys",
  "lazy_static",
@@ -6411,14 +6457,14 @@ dependencies = [
  "serde_derive",
  "sha2 0.10.8",
  "sha3",
- "solana-account-info",
+ "solana-account-info 2.1.0",
  "solana-atomic-u64",
  "solana-bincode",
  "solana-borsh",
  "solana-clock",
  "solana-cpi",
  "solana-decode-error",
- "solana-define-syscall",
+ "solana-define-syscall 2.1.0",
  "solana-epoch-schedule",
  "solana-fee-calculator",
  "solana-hash",
@@ -6427,8 +6473,8 @@ dependencies = [
  "solana-msg",
  "solana-native-token",
  "solana-program-entrypoint",
- "solana-program-error",
- "solana-program-memory",
+ "solana-program-error 2.1.0",
+ "solana-program-memory 2.1.0",
  "solana-program-option",
  "solana-program-pack",
  "solana-pubkey",
@@ -6454,9 +6500,9 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eb90f3fa3e979b912451a404508f1f90bb6e5c1d7767625f622b20016fb9fde"
 dependencies = [
- "solana-account-info",
+ "solana-account-info 2.1.0",
  "solana-msg",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-pubkey",
 ]
 
@@ -6476,6 +6522,12 @@ dependencies = [
  "solana-pubkey",
 ]
 
+[[package]]
+name = "solana-program-error"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1af32c995a7b692a915bb7414d5f8e838450cf7c70414e763d8abcae7b51f28"
+
 [[package]]
 name = "solana-program-memory"
 version = "2.1.0"
@@ -6483,7 +6535,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed4bc044dc2b49c323aeff04aec03c908a052e278c2edf2f7616f32fc0f1bcd9"
 dependencies = [
  "num-traits",
- "solana-define-syscall",
+ "solana-define-syscall 2.1.0",
+]
+
+[[package]]
+name = "solana-program-memory"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4068648649653c2c50546e9a7fb761791b5ab0cda054c771bb5808d3a4b9eb52"
+dependencies = [
+ "solana-define-syscall 4.0.1",
 ]
 
 [[package]]
@@ -6498,7 +6559,7 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8fb28439d23e1f505e59c7a14ed5012365ab7aa0f20dc7bda048e02ff231cf6"
 dependencies = [
- "solana-program-error",
+ "solana-program-error 2.1.0",
 ]
 
 [[package]]
@@ -6579,7 +6640,7 @@ dependencies = [
  "bytemuck",
  "bytemuck_derive",
  "curve25519-dalek 4.1.3",
- "five8_const",
+ "five8_const 0.1.3",
  "getrandom 0.2.10",
  "js-sys",
  "num-traits",
@@ -6588,7 +6649,7 @@ dependencies = [
  "serde_derive",
  "solana-atomic-u64",
  "solana-decode-error",
- "solana-define-syscall",
+ "solana-define-syscall 2.1.0",
  "solana-sanitize",
  "solana-sha256-hasher",
  "wasm-bindgen",
@@ -6970,7 +7031,7 @@ dependencies = [
  "solana-packet",
  "solana-precompile-error",
  "solana-program",
- "solana-program-memory",
+ "solana-program-memory 2.1.0",
  "solana-pubkey",
  "solana-sanitize",
  "solana-sdk-macro",
@@ -7003,7 +7064,7 @@ checksum = "f2eef5a00a75648273c3fb6e3d85b0c8c02fcc1e36c4271664dcc39b6b128d41"
 dependencies = [
  "borsh 1.5.3",
  "libsecp256k1",
- "solana-define-syscall",
+ "solana-define-syscall 2.1.0",
  "thiserror 1.0.69",
 ]
 
@@ -7057,7 +7118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd115f3a1136314b0183235080d29023530c3a0a5df60505fdb7ea620eff9fd6"
 dependencies = [
  "sha2 0.10.8",
- "solana-define-syscall",
+ "solana-define-syscall 2.1.0",
  "solana-hash",
 ]
 
@@ -7843,7 +7904,7 @@ version = "0.4.0"
 dependencies = [
  "borsh 1.5.3",
  "bytemuck",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-sha256-hasher",
  "spl-discriminator-derive 0.2.0",
 ]
@@ -8105,12 +8166,12 @@ name = "spl-instruction-padding"
 version = "0.3.0"
 dependencies = [
  "num_enum",
- "solana-account-info",
+ "solana-account-info 3.1.0",
  "solana-cpi",
  "solana-instruction",
  "solana-program",
  "solana-program-entrypoint",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-program-test",
  "solana-pubkey",
  "solana-sdk",
@@ -8171,11 +8232,11 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f09647c0974e33366efeb83b8e2daebb329f0420149e74d3a4bd2c08cf9f7cb"
 dependencies = [
- "solana-account-info",
+ "solana-account-info 2.1.0",
  "solana-instruction",
  "solana-msg",
  "solana-program-entrypoint",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-pubkey",
 ]
 
@@ -8228,7 +8289,7 @@ dependencies = [
  "serde_json",
  "solana-decode-error",
  "solana-msg",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-program-option",
  "solana-pubkey",
  "solana-zk-sdk",
@@ -8291,12 +8352,12 @@ dependencies = [
  "bytemuck",
  "num-derive",
  "num-traits",
- "solana-account-info",
+ "solana-account-info 3.1.0",
  "solana-decode-error",
  "solana-instruction",
  "solana-msg",
  "solana-program-entrypoint",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-program-pack",
  "solana-program-test",
  "solana-pubkey",
@@ -8476,12 +8537,12 @@ dependencies = [
  "num-derive",
  "num-traits",
  "serde",
- "solana-account-info",
+ "solana-account-info 3.1.0",
  "solana-client",
  "solana-decode-error",
  "solana-instruction",
  "solana-msg",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-program-test",
  "solana-pubkey",
  "solana-sdk",
@@ -8784,7 +8845,7 @@ dependencies = [
  "solana-decode-error",
  "solana-instruction",
  "solana-msg",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-pubkey",
  "solana-sha256-hasher",
  "spl-discriminator 0.4.0",
@@ -8868,7 +8929,7 @@ dependencies = [
  "solana-decode-error",
  "solana-instruction",
  "solana-msg",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-pubkey",
  "solana-sha256-hasher",
  "spl-discriminator 0.4.0",
@@ -9005,9 +9066,9 @@ dependencies = [
 name = "spl-transfer-hook-example-downgrade"
 version = "1.0.0"
 dependencies = [
- "solana-account-info",
+ "solana-account-info 3.1.0",
  "solana-program-entrypoint",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-pubkey",
 ]
 
@@ -9015,9 +9076,9 @@ dependencies = [
 name = "spl-transfer-hook-example-fail"
 version = "1.0.0"
 dependencies = [
- "solana-account-info",
+ "solana-account-info 3.1.0",
  "solana-program-entrypoint",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-pubkey",
 ]
 
@@ -9025,9 +9086,9 @@ dependencies = [
 name = "spl-transfer-hook-example-success"
 version = "1.0.0"
 dependencies = [
- "solana-account-info",
+ "solana-account-info 3.1.0",
  "solana-program-entrypoint",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-pubkey",
 ]
 
@@ -9035,9 +9096,9 @@ dependencies = [
 name = "spl-transfer-hook-example-swap"
 version = "1.0.0"
 dependencies = [
- "solana-account-info",
+ "solana-account-info 3.1.0",
  "solana-program-entrypoint",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-pubkey",
  "spl-token-2022 6.0.0",
 ]
@@ -9046,9 +9107,9 @@ dependencies = [
 name = "spl-transfer-hook-example-swap-with-fee"
 version = "1.0.0"
 dependencies = [
- "solana-account-info",
+ "solana-account-info 3.1.0",
  "solana-program-entrypoint",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-pubkey",
  "spl-token-2022 6.0.0",
 ]
@@ -9077,13 +9138,13 @@ dependencies = [
  "bytemuck",
  "num-derive",
  "num-traits",
- "solana-account-info",
+ "solana-account-info 3.1.0",
  "solana-cpi",
  "solana-decode-error",
  "solana-instruction",
  "solana-msg",
  "solana-program",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-pubkey",
  "spl-discriminator 0.4.0",
  "spl-pod 0.5.0",
@@ -9114,10 +9175,10 @@ dependencies = [
  "bytemuck",
  "num-derive",
  "num-traits",
- "solana-account-info",
+ "solana-account-info 3.1.0",
  "solana-decode-error",
  "solana-msg",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "spl-discriminator 0.4.0",
  "spl-pod 0.5.0",
  "spl-type-length-value-derive",
diff --git a/instruction-padding/program/Cargo.toml b/instruction-padding/program/Cargo.toml
index b30412155..72d881fd0 100644
--- a/instruction-padding/program/Cargo.toml
+++ b/instruction-padding/program/Cargo.toml
@@ -14,7 +14,7 @@ test-sbf = []
 
 [dependencies]
 num_enum = "0.7.3"
-solana-account-info = "2.1.0"
+solana-account-info = "3.1.0"
 solana-cpi = "2.1.0"
 solana-instruction = { version = "2.1.0", features = ["std"] }
 solana-program-entrypoint = "2.1.0"
diff --git a/libraries/tlv-account-resolution/Cargo.toml b/libraries/tlv-account-resolution/Cargo.toml
index e95642cd4..bea0b179e 100644
--- a/libraries/tlv-account-resolution/Cargo.toml
+++ b/libraries/tlv-account-resolution/Cargo.toml
@@ -16,7 +16,7 @@ bytemuck = { version = "1.21.0", features = ["derive"] }
 num-derive = "0.4"
 num-traits = "0.2"
 serde = { version = "1.0.217", optional = true }
-solana-account-info = "2.1.0"
+solana-account-info = "3.1.0"
 solana-decode-error = "2.1.0"
 solana-instruction = { version = "2.1.0", features = ["std"] }
 solana-program-error = "2.1.0"
diff --git a/libraries/type-length-value/Cargo.toml b/libraries/type-length-value/Cargo.toml
index 0ef918ebb..df65aae35 100644
--- a/libraries/type-length-value/Cargo.toml
+++ b/libraries/type-length-value/Cargo.toml
@@ -15,7 +15,7 @@ derive = ["dep:spl-type-length-value-derive"]
 bytemuck = { version = "1.21.0", features = ["derive"] }
 num-derive = "0.4"
 num-traits = "0.2"
-solana-account-info = "2.1.0"
+solana-account-info = "3.1.0"
 solana-decode-error = "2.1.0"
 solana-msg = "2.1.0"
 solana-program-error = "2.1.0"
diff --git a/record/program/Cargo.toml b/record/program/Cargo.toml
index 5d9ebe6fc..c2172eb45 100644
--- a/record/program/Cargo.toml
+++ b/record/program/Cargo.toml
@@ -15,7 +15,7 @@ test-sbf = []
 bytemuck = { version = "1.21.0", features = ["derive"] }
 num-derive = "0.4"
 num-traits = "0.2"
-solana-account-info = "2.1.0"
+solana-account-info = "3.1.0"
 solana-decode-error = "2.1.0"
 solana-instruction = { version = "2.1.0", features = ["std"] }
 solana-msg = "2.1.0"
diff --git a/token/program-2022-test/transfer-hook-test-programs/downgrade/Cargo.toml b/token/program-2022-test/transfer-hook-test-programs/downgrade/Cargo.toml
index 8434af654..bab65d19f 100644
--- a/token/program-2022-test/transfer-hook-test-programs/downgrade/Cargo.toml
+++ b/token/program-2022-test/transfer-hook-test-programs/downgrade/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-solana-account-info = "2.1.0"
+solana-account-info = "3.1.0"
 solana-program-entrypoint = "2.1.0"
 solana-program-error = "2.1.0"
 solana-pubkey = "2.1.0"
diff --git a/token/program-2022-test/transfer-hook-test-programs/fail/Cargo.toml b/token/program-2022-test/transfer-hook-test-programs/fail/Cargo.toml
index b8e6d4bfe..b05b0ede0 100644
--- a/token/program-2022-test/transfer-hook-test-programs/fail/Cargo.toml
+++ b/token/program-2022-test/transfer-hook-test-programs/fail/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-solana-account-info = "2.1.0"
+solana-account-info = "3.1.0"
 solana-program-entrypoint = "2.1.0"
 solana-program-error = "2.1.0"
 solana-pubkey = "2.1.0"
diff --git a/token/program-2022-test/transfer-hook-test-programs/success/Cargo.toml b/token/program-2022-test/transfer-hook-test-programs/success/Cargo.toml
index 26c7a507a..7557dde5d 100644
--- a/token/program-2022-test/transfer-hook-test-programs/success/Cargo.toml
+++ b/token/program-2022-test/transfer-hook-test-programs/success/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-solana-account-info = "2.1.0"
+solana-account-info = "3.1.0"
 solana-program-entrypoint = "2.1.0"
 solana-program-error = "2.1.0"
 solana-pubkey = "2.1.0"
diff --git a/token/program-2022-test/transfer-hook-test-programs/swap-with-fee/Cargo.toml b/token/program-2022-test/transfer-hook-test-programs/swap-with-fee/Cargo.toml
index 6a2634348..331644687 100644
--- a/token/program-2022-test/transfer-hook-test-programs/swap-with-fee/Cargo.toml
+++ b/token/program-2022-test/transfer-hook-test-programs/swap-with-fee/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-solana-account-info = "2.1.0"
+solana-account-info = "3.1.0"
 solana-program-entrypoint = "2.1.0"
 solana-program-error = "2.1.0"
 solana-pubkey = "2.1.0"
diff --git a/token/program-2022-test/transfer-hook-test-programs/swap/Cargo.toml b/token/program-2022-test/transfer-hook-test-programs/swap/Cargo.toml
index 05d4d40d4..675835ad5 100644
--- a/token/program-2022-test/transfer-hook-test-programs/swap/Cargo.toml
+++ b/token/program-2022-test/transfer-hook-test-programs/swap/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-solana-account-info = "2.1.0"
+solana-account-info = "3.1.0"
 solana-program-entrypoint = "2.1.0"
 solana-program-error = "2.1.0"
 solana-pubkey = "2.1.0"
diff --git a/token/transfer-hook/interface/Cargo.toml b/token/transfer-hook/interface/Cargo.toml
index c8b70cad6..95d8ed0e8 100644
--- a/token/transfer-hook/interface/Cargo.toml
+++ b/token/transfer-hook/interface/Cargo.toml
@@ -12,7 +12,7 @@ arrayref = "0.3.9"
 bytemuck = { version = "1.21.0", features = ["derive"] }
 num-derive = "0.4"
 num-traits = "0.2"
-solana-account-info = "2.1.0"
+solana-account-info = "3.1.0"
 solana-cpi = "2.1.0"
 solana-decode-error = "2.1.0"
 solana-instruction = { version = "2.1.0", features = ["std"] }