From 52543aedda9217600157b34d3af143a56e007bae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Nov 2025 09:18:54 +0000
Subject: [PATCH] build(deps): bump solana-cpi from 2.1.0 to 3.1.0

Bumps [solana-cpi](https://github.com/anza-xyz/solana-sdk) from 2.1.0 to 3.1.0.
- [Release notes](https://github.com/anza-xyz/solana-sdk/releases)
- [Commits](https://github.com/anza-xyz/solana-sdk/compare/instruction-error@v2.1.0...cpi@v3.1.0)

---
updated-dependencies:
- dependency-name: solana-cpi
  dependency-version: 3.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock                               | 521 +++++++++++++++--------
 instruction-padding/program/Cargo.toml   |   2 +-
 token/transfer-hook/interface/Cargo.toml |   2 +-
 3 files changed, 353 insertions(+), 172 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8af60989d..95ea5fd9e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -664,7 +664,7 @@ name = "binary-option"
 version = "0.1.0"
 dependencies = [
  "arrayref",
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "solana-program",
  "spl-token 7.0.0",
  "thiserror 2.0.9",
@@ -804,11 +804,11 @@ dependencies = [
 
 [[package]]
 name = "borsh"
-version = "1.5.3"
+version = "1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03"
+checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
 dependencies = [
- "borsh-derive 1.5.3",
+ "borsh-derive 1.5.7",
  "cfg_aliases",
 ]
 
@@ -827,9 +827,9 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive"
-version = "1.5.3"
+version = "1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244"
+checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3"
 dependencies = [
  "once_cell",
  "proc-macro-crate 3.1.0",
@@ -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"
@@ -4856,10 +4874,11 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
+ "serde_core",
  "serde_derive",
 ]
 
@@ -4872,11 +4891,20 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5226,7 +5254,7 @@ dependencies = [
  "serde",
  "serde_bytes",
  "serde_derive",
- "solana-instruction",
+ "solana-instruction 2.1.0",
  "solana-program",
 ]
 
@@ -5268,7 +5296,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "solana-account",
- "solana-pubkey",
+ "solana-pubkey 2.1.0",
  "zstd",
 ]
 
@@ -5280,9 +5308,20 @@ checksum = "6abe81cfc4a75f71a510c6856b03a7d8525e416af3c69d55daef62e6078b8d40"
 dependencies = [
  "bincode",
  "serde",
- "solana-program-error",
- "solana-program-memory",
- "solana-pubkey",
+ "solana-program-error 2.1.0",
+ "solana-program-memory 2.1.0",
+ "solana-pubkey 2.1.0",
+]
+
+[[package]]
+name = "solana-account-info"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc3397241392f5756925029acaa8515dc70fcbe3d8059d4885d7d6533baf64fd"
+dependencies = [
+ "solana-address 2.0.0",
+ "solana-program-error 3.0.0",
+ "solana-program-memory 3.1.0",
 ]
 
 [[package]]
@@ -5331,6 +5370,30 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
+[[package]]
+name = "solana-address"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2ecac8e1b7f74c2baa9e774c42817e3e75b20787134b76cc4d45e8a604488f5"
+dependencies = [
+ "solana-address 2.0.0",
+]
+
+[[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-atomic-u64 3.0.0",
+ "solana-define-syscall 4.0.1",
+ "solana-program-error 3.0.0",
+ "solana-sanitize 3.0.1",
+ "solana-sha256-hasher 3.1.0",
+]
+
 [[package]]
 name = "solana-address-lookup-table-program"
 version = "2.1.0"
@@ -5359,13 +5422,22 @@ dependencies = [
  "parking_lot 0.12.0",
 ]
 
+[[package]]
+name = "solana-atomic-u64"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a933ff1e50aff72d02173cfcd7511bd8540b027ee720b75f353f594f834216d0"
+dependencies = [
+ "parking_lot 0.12.0",
+]
+
 [[package]]
 name = "solana-banks-client"
 version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f857fb6590467d433f40eee507666ca496ec67907e50b7d530b6c04f6541875"
 dependencies = [
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "futures 0.3.31",
  "solana-banks-interface",
  "solana-program",
@@ -5417,7 +5489,7 @@ checksum = "9e85cb5961c356345a61378163fd9057011b35540f8bcdd8d8a09cb10117264f"
 dependencies = [
  "bincode",
  "serde",
- "solana-instruction",
+ "solana-instruction 2.1.0",
 ]
 
 [[package]]
@@ -5432,7 +5504,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_derive",
- "solana-sanitize",
+ "solana-sanitize 2.1.0",
  "solana-sdk",
 ]
 
@@ -5458,7 +5530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5d526f3525ab22a3ada3f9a1d642664dafac00dc9208326b701a2045514eb04"
 dependencies = [
  "borsh 0.10.3",
- "borsh 1.5.3",
+ "borsh 1.5.7",
 ]
 
 [[package]]
@@ -5479,7 +5551,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",
@@ -5766,7 +5838,7 @@ dependencies = [
  "solana-rpc-client-api",
  "solana-runtime",
  "solana-runtime-transaction",
- "solana-sanitize",
+ "solana-sanitize 2.1.0",
  "solana-sdk",
  "solana-send-transaction-service",
  "solana-short-vec",
@@ -5817,12 +5889,26 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25c536ad0ce25d84a64f48dedcb773e764827e0ef781eda41fa1fa35f5d64b38"
 dependencies = [
- "solana-account-info",
- "solana-define-syscall",
- "solana-instruction",
- "solana-program-error",
- "solana-pubkey",
- "solana-stable-layout",
+ "solana-account-info 2.1.0",
+ "solana-define-syscall 2.1.0",
+ "solana-instruction 2.1.0",
+ "solana-program-error 2.1.0",
+ "solana-pubkey 2.1.0",
+ "solana-stable-layout 2.1.0",
+]
+
+[[package]]
+name = "solana-cpi"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dea26709d867aada85d0d3617db0944215c8bb28d3745b912de7db13a23280c"
+dependencies = [
+ "solana-account-info 3.1.0",
+ "solana-define-syscall 4.0.1",
+ "solana-instruction 3.1.0",
+ "solana-program-error 3.0.0",
+ "solana-pubkey 4.0.0",
+ "solana-stable-layout 3.0.0",
 ]
 
 [[package]]
@@ -5853,6 +5939,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"
@@ -5930,9 +6022,9 @@ dependencies = [
  "lazy_static",
  "solana-clock",
  "solana-epoch-schedule",
- "solana-hash",
- "solana-pubkey",
- "solana-sha256-hasher",
+ "solana-hash 2.1.0",
+ "solana-pubkey 2.1.0",
+ "solana-sha256-hasher 2.1.0",
 ]
 
 [[package]]
@@ -6021,7 +6113,7 @@ dependencies = [
  "solana-rayon-threadlimit",
  "solana-rpc-client",
  "solana-runtime",
- "solana-sanitize",
+ "solana-sanitize 2.1.0",
  "solana-sdk",
  "solana-serde-varint",
  "solana-short-vec",
@@ -6040,18 +6132,24 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1807bc4e9e1d25271514167d5a1e698ce5a330bce547a368242dd63b355b5faa"
 dependencies = [
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "bs58",
  "bytemuck",
  "bytemuck_derive",
  "js-sys",
  "serde",
  "serde_derive",
- "solana-atomic-u64",
- "solana-sanitize",
+ "solana-atomic-u64 2.1.0",
+ "solana-sanitize 2.1.0",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "solana-hash"
+version = "4.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a5d48a6ee7b91fc7b998944ab026ed7b3e2fc8ee3bc58452644a86c2648152f"
+
 [[package]]
 name = "solana-inflation"
 version = "2.1.0"
@@ -6069,7 +6167,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d24c9c6590e4eaf91efa887b2689b2941fe4b324bccd9a95f77853168f3d9a88"
 dependencies = [
  "bytemuck",
- "solana-pubkey",
+ "solana-pubkey 2.1.0",
 ]
 
 [[package]]
@@ -6079,17 +6177,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfef689e06e5c7cb6206d4dc61ac77733de4f72d754e0d531393206abc27dbe4"
 dependencies = [
  "bincode",
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "getrandom 0.2.10",
  "js-sys",
  "num-traits",
  "serde",
  "serde_derive",
- "solana-define-syscall",
- "solana-pubkey",
+ "solana-define-syscall 2.1.0",
+ "solana-pubkey 2.1.0",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "solana-instruction"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee1b699a2c1518028a9982e255e0eca10c44d90006542d9d7f9f40dbce3f7c78"
+dependencies = [
+ "borsh 1.5.7",
+ "serde",
+ "solana-define-syscall 4.0.1",
+ "solana-instruction-error",
+ "solana-pubkey 4.0.0",
+]
+
+[[package]]
+name = "solana-instruction-error"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b04259e03c05faf38a8c24217b5cfe4c90572ae6184ab49cddb1584fdd756d3f"
+dependencies = [
+ "num-traits",
+ "solana-program-error 3.0.0",
+]
+
 [[package]]
 name = "solana-last-restart-slot"
 version = "2.1.0"
@@ -6236,8 +6357,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e75fa782e9cf2a846f09f96594db01e3005aeefb36ce53aebc41b050381e9989"
 dependencies = [
  "fast-math",
- "solana-hash",
- "solana-sha256-hasher",
+ "solana-hash 2.1.0",
+ "solana-sha256-hasher 2.1.0",
 ]
 
 [[package]]
@@ -6261,7 +6382,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 +6483,7 @@ checksum = "f193a65f0db7fe5615c76c2814d6450a2e4cda61f786d5bf7a6b1ad0c179b947"
 dependencies = [
  "ark-bn254",
  "light-poseidon",
- "solana-define-syscall",
+ "solana-define-syscall 2.1.0",
  "thiserror 1.0.69",
 ]
 
@@ -6387,7 +6508,7 @@ dependencies = [
  "bitflags 2.6.0",
  "blake3",
  "borsh 0.10.3",
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "bs58",
  "bv",
  "bytemuck",
@@ -6395,7 +6516,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,38 +6532,38 @@ dependencies = [
  "serde_derive",
  "sha2 0.10.8",
  "sha3",
- "solana-account-info",
- "solana-atomic-u64",
+ "solana-account-info 2.1.0",
+ "solana-atomic-u64 2.1.0",
  "solana-bincode",
  "solana-borsh",
  "solana-clock",
- "solana-cpi",
+ "solana-cpi 2.1.0",
  "solana-decode-error",
- "solana-define-syscall",
+ "solana-define-syscall 2.1.0",
  "solana-epoch-schedule",
  "solana-fee-calculator",
- "solana-hash",
- "solana-instruction",
+ "solana-hash 2.1.0",
+ "solana-instruction 2.1.0",
  "solana-last-restart-slot",
  "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",
+ "solana-pubkey 2.1.0",
  "solana-rent",
- "solana-sanitize",
+ "solana-sanitize 2.1.0",
  "solana-sdk-macro",
  "solana-secp256k1-recover",
  "solana-serde-varint",
  "solana-serialize-utils",
- "solana-sha256-hasher",
+ "solana-sha256-hasher 2.1.0",
  "solana-short-vec",
  "solana-slot-hashes",
  "solana-slot-history",
- "solana-stable-layout",
+ "solana-stable-layout 2.1.0",
  "solana-transaction-error",
  "thiserror 1.0.69",
  "wasm-bindgen",
@@ -6454,10 +6575,10 @@ 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-pubkey",
+ "solana-program-error 2.1.0",
+ "solana-pubkey 2.1.0",
 ]
 
 [[package]]
@@ -6466,16 +6587,22 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd089caeef26dd07bd12b7b67d45e92faddc2fc67a960f316df7ae4776a2f3d5"
 dependencies = [
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "num-traits",
  "serde",
  "serde_derive",
  "solana-decode-error",
- "solana-instruction",
+ "solana-instruction 2.1.0",
  "solana-msg",
- "solana-pubkey",
+ "solana-pubkey 2.1.0",
 ]
 
+[[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 +6610,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 +6634,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]]
@@ -6553,7 +6689,7 @@ dependencies = [
  "solana-compute-budget",
  "solana-feature-set",
  "solana-inline-spl",
- "solana-instruction",
+ "solana-instruction 2.1.0",
  "solana-log-collector",
  "solana-logger",
  "solana-program-runtime",
@@ -6574,26 +6710,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bea3215775fcedf200d47590c7e2ce9a3a46bc2b7d3f77d0eae9c6edf0a39aec"
 dependencies = [
  "borsh 0.10.3",
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "bs58",
  "bytemuck",
  "bytemuck_derive",
  "curve25519-dalek 4.1.3",
- "five8_const",
+ "five8_const 0.1.3",
  "getrandom 0.2.10",
  "js-sys",
  "num-traits",
  "rand 0.8.5",
  "serde",
  "serde_derive",
- "solana-atomic-u64",
+ "solana-atomic-u64 2.1.0",
  "solana-decode-error",
- "solana-define-syscall",
- "solana-sanitize",
- "solana-sha256-hasher",
+ "solana-define-syscall 2.1.0",
+ "solana-sanitize 2.1.0",
+ "solana-sha256-hasher 2.1.0",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "solana-pubkey"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8909d399deb0851aa524420beeb5646b115fd253ef446e35fe4504c904da3941"
+dependencies = [
+ "solana-address 1.1.0",
+]
+
+[[package]]
+name = "solana-pubkey"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6f7104d456b58e1418c21a8581e89810278d1190f70f27ece7fc0b2c9282a57"
+dependencies = [
+ "solana-address 2.0.0",
+]
+
 [[package]]
 name = "solana-pubsub-client"
 version = "2.1.0"
@@ -6908,7 +7062,7 @@ dependencies = [
  "log",
  "solana-builtins-default-costs",
  "solana-compute-budget",
- "solana-pubkey",
+ "solana-pubkey 2.1.0",
  "solana-sdk",
  "solana-svm-transaction",
  "thiserror 1.0.69",
@@ -6920,6 +7074,12 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "203b90994371db8cade8e885f74ec9f68ee02a32b25d514594158b2551a4e5ed"
 
+[[package]]
+name = "solana-sanitize"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcf09694a0fc14e5ffb18f9b7b7c0f15ecb6eac5b5610bf76a1853459d19daf9"
+
 [[package]]
 name = "solana-sdk"
 version = "2.1.0"
@@ -6928,7 +7088,7 @@ checksum = "524604d94185c189616296e5b7da1014cc96d1e446bd2b26f247f00708b9225a"
 dependencies = [
  "bincode",
  "bitflags 2.6.0",
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "bs58",
  "bytemuck",
  "bytemuck_derive",
@@ -6965,14 +7125,14 @@ dependencies = [
  "solana-derivation-path",
  "solana-feature-set",
  "solana-inflation",
- "solana-instruction",
+ "solana-instruction 2.1.0",
  "solana-native-token",
  "solana-packet",
  "solana-precompile-error",
  "solana-program",
- "solana-program-memory",
- "solana-pubkey",
- "solana-sanitize",
+ "solana-program-memory 2.1.0",
+ "solana-pubkey 2.1.0",
+ "solana-sanitize 2.1.0",
  "solana-sdk-macro",
  "solana-secp256k1-recover",
  "solana-serde-varint",
@@ -7001,9 +7161,9 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2eef5a00a75648273c3fb6e3d85b0c8c02fcc1e36c4271664dcc39b6b128d41"
 dependencies = [
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "libsecp256k1",
- "solana-define-syscall",
+ "solana-define-syscall 2.1.0",
  "thiserror 1.0.69",
 ]
 
@@ -7045,9 +7205,9 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cfb0b57c6a431fb15ff33053caadb6c36aed4e1ce74bea9adfc459a710b3626"
 dependencies = [
- "solana-instruction",
- "solana-pubkey",
- "solana-sanitize",
+ "solana-instruction 2.1.0",
+ "solana-pubkey 2.1.0",
+ "solana-sanitize 2.1.0",
 ]
 
 [[package]]
@@ -7057,8 +7217,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd115f3a1136314b0183235080d29023530c3a0a5df60505fdb7ea620eff9fd6"
 dependencies = [
  "sha2 0.10.8",
- "solana-define-syscall",
- "solana-hash",
+ "solana-define-syscall 2.1.0",
+ "solana-hash 2.1.0",
+]
+
+[[package]]
+name = "solana-sha256-hasher"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db7dc3011ea4c0334aaaa7e7128cb390ecf546b28d412e9bf2064680f57f588f"
+dependencies = [
+ "sha2 0.10.8",
+ "solana-define-syscall 4.0.1",
+ "solana-hash 4.0.1",
 ]
 
 [[package]]
@@ -7082,7 +7253,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_derive",
- "solana-sanitize",
+ "solana-sanitize 2.1.0",
 ]
 
 [[package]]
@@ -7093,7 +7264,7 @@ checksum = "17d216c0ebf00e95acaf2b1e227e6cc900a5ce50fb81fa0743272851e88a788d"
 dependencies = [
  "serde",
  "serde_derive",
- "solana-hash",
+ "solana-hash 2.1.0",
 ]
 
 [[package]]
@@ -7113,8 +7284,18 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a5305ca88fb5deb219cd88f04e24f3a131769417d7fcb11a8da1126a8f98d23"
 dependencies = [
- "solana-instruction",
- "solana-pubkey",
+ "solana-instruction 2.1.0",
+ "solana-pubkey 2.1.0",
+]
+
+[[package]]
+name = "solana-stable-layout"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1da74507795b6e8fb60b7c7306c0c36e2c315805d16eaaf479452661234685ac"
+dependencies = [
+ "solana-instruction 3.1.0",
+ "solana-pubkey 3.0.0",
 ]
 
 [[package]]
@@ -7377,8 +7558,8 @@ checksum = "37a4bea6d80b34fe6e785d19bf928fe103928d1f6c9935ec23bb6a9d4d7a33d2"
 dependencies = [
  "serde",
  "serde_derive",
- "solana-instruction",
- "solana-sanitize",
+ "solana-instruction 2.1.0",
+ "solana-sanitize 2.1.0",
 ]
 
 [[package]]
@@ -7406,7 +7587,7 @@ dependencies = [
  "Inflector",
  "base64 0.22.1",
  "bincode",
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "bs58",
  "lazy_static",
  "log",
@@ -7551,7 +7732,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-feature-set",
- "solana-sanitize",
+ "solana-sanitize 2.1.0",
  "solana-serde-varint",
 ]
 
@@ -7753,7 +7934,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68034596cf4804880d265f834af1ff2f821ad5293e41fa0f8f59086c181fc38e"
 dependencies = [
  "assert_matches",
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "num-derive",
  "num-traits",
  "solana-program",
@@ -7766,7 +7947,7 @@ dependencies = [
 name = "spl-associated-token-account"
 version = "6.0.0"
 dependencies = [
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "num-derive",
  "num-traits",
  "solana-program",
@@ -7780,9 +7961,9 @@ dependencies = [
 name = "spl-associated-token-account-client"
 version = "2.0.0"
 dependencies = [
- "solana-instruction",
+ "solana-instruction 2.1.0",
  "solana-program",
- "solana-pubkey",
+ "solana-pubkey 2.1.0",
 ]
 
 [[package]]
@@ -7802,7 +7983,7 @@ dependencies = [
 name = "spl-binary-oracle-pair"
 version = "0.1.0"
 dependencies = [
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "num-derive",
  "num-traits",
  "solana-program",
@@ -7841,10 +8022,10 @@ dependencies = [
 name = "spl-discriminator"
 version = "0.4.0"
 dependencies = [
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "bytemuck",
- "solana-program-error",
- "solana-sha256-hasher",
+ "solana-program-error 2.1.0",
+ "solana-sha256-hasher 2.1.0",
  "spl-discriminator-derive 0.2.0",
 ]
 
@@ -7962,7 +8143,7 @@ dependencies = [
 name = "spl-feature-proposal"
 version = "1.0.0"
 dependencies = [
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "solana-program",
  "solana-program-test",
  "solana-sdk",
@@ -7991,7 +8172,7 @@ dependencies = [
  "assert_matches",
  "base64 0.22.1",
  "bincode",
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "num-derive",
  "num-traits",
  "proptest",
@@ -8012,7 +8193,7 @@ dependencies = [
 name = "spl-governance-addin-api"
 version = "0.1.4"
 dependencies = [
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "solana-program",
  "spl-governance-tools",
 ]
@@ -8024,7 +8205,7 @@ dependencies = [
  "arrayref",
  "assert_matches",
  "bincode",
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "num-derive",
  "num-traits",
  "proptest",
@@ -8047,7 +8228,7 @@ dependencies = [
  "arrayref",
  "assert_matches",
  "bincode",
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "num-derive",
  "num-traits",
  "proptest",
@@ -8071,7 +8252,7 @@ version = "0.1.4"
 dependencies = [
  "arrayref",
  "bincode",
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "lazy_static",
  "num-derive",
  "num-traits",
@@ -8090,7 +8271,7 @@ version = "0.1.4"
 dependencies = [
  "arrayref",
  "bincode",
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "num-derive",
  "num-traits",
  "serde",
@@ -8105,14 +8286,14 @@ name = "spl-instruction-padding"
 version = "0.3.0"
 dependencies = [
  "num_enum",
- "solana-account-info",
- "solana-cpi",
- "solana-instruction",
+ "solana-account-info 2.1.0",
+ "solana-cpi 3.1.0",
+ "solana-instruction 2.1.0",
  "solana-program",
  "solana-program-entrypoint",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-program-test",
- "solana-pubkey",
+ "solana-pubkey 2.1.0",
  "solana-sdk",
  "static_assertions",
 ]
@@ -8121,7 +8302,7 @@ dependencies = [
 name = "spl-managed-token"
 version = "0.1.0"
 dependencies = [
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "shank",
  "solana-program",
  "solana-program-test",
@@ -8146,7 +8327,7 @@ dependencies = [
 name = "spl-math-example"
 version = "0.1.0"
 dependencies = [
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "num-derive",
  "num-traits",
  "solana-program",
@@ -8171,12 +8352,12 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f09647c0974e33366efeb83b8e2daebb329f0420149e74d3a4bd2c08cf9f7cb"
 dependencies = [
- "solana-account-info",
- "solana-instruction",
+ "solana-account-info 2.1.0",
+ "solana-instruction 2.1.0",
  "solana-msg",
  "solana-program-entrypoint",
- "solana-program-error",
- "solana-pubkey",
+ "solana-program-error 2.1.0",
+ "solana-pubkey 2.1.0",
 ]
 
 [[package]]
@@ -8191,7 +8372,7 @@ dependencies = [
 name = "spl-name-service"
 version = "0.3.0"
 dependencies = [
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "num-derive",
  "num-traits",
  "solana-program",
@@ -8206,7 +8387,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6166a591d93af33afd75bbd8573c5fd95fb1213f1bf254f0508c89fdb5ee156"
 dependencies = [
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "bytemuck",
  "bytemuck_derive",
  "solana-program",
@@ -8219,7 +8400,7 @@ name = "spl-pod"
 version = "0.5.0"
 dependencies = [
  "base64 0.22.1",
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "bytemuck",
  "bytemuck_derive",
  "num-derive",
@@ -8228,9 +8409,9 @@ dependencies = [
  "serde_json",
  "solana-decode-error",
  "solana-msg",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-program-option",
- "solana-pubkey",
+ "solana-pubkey 2.1.0",
  "solana-zk-sdk",
  "thiserror 2.0.9",
 ]
@@ -8291,15 +8472,15 @@ dependencies = [
  "bytemuck",
  "num-derive",
  "num-traits",
- "solana-account-info",
+ "solana-account-info 2.1.0",
  "solana-decode-error",
- "solana-instruction",
+ "solana-instruction 2.1.0",
  "solana-msg",
  "solana-program-entrypoint",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-program-pack",
  "solana-program-test",
- "solana-pubkey",
+ "solana-pubkey 2.1.0",
  "solana-rent",
  "solana-sdk",
  "thiserror 2.0.9",
@@ -8322,7 +8503,7 @@ dependencies = [
  "approx",
  "arrayref",
  "bincode",
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "num-derive",
  "num-traits",
  "num_enum",
@@ -8344,7 +8525,7 @@ name = "spl-single-pool-cli"
 version = "1.0.0"
 dependencies = [
  "bincode",
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "clap 3.2.25",
  "console",
  "serde",
@@ -8406,7 +8587,7 @@ dependencies = [
  "arrayref",
  "assert_matches",
  "bincode",
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "bytemuck",
  "num-derive",
  "num-traits",
@@ -8431,7 +8612,7 @@ name = "spl-stake-pool-cli"
 version = "2.0.0"
 dependencies = [
  "bincode",
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "bs58",
  "clap 2.34.0",
  "serde",
@@ -8476,14 +8657,14 @@ dependencies = [
  "num-derive",
  "num-traits",
  "serde",
- "solana-account-info",
+ "solana-account-info 2.1.0",
  "solana-client",
  "solana-decode-error",
- "solana-instruction",
+ "solana-instruction 2.1.0",
  "solana-msg",
- "solana-program-error",
+ "solana-program-error 2.1.0",
  "solana-program-test",
- "solana-pubkey",
+ "solana-pubkey 2.1.0",
  "solana-sdk",
  "spl-discriminator 0.4.0",
  "spl-pod 0.5.0",
@@ -8590,7 +8771,7 @@ name = "spl-token-2022-test"
 version = "0.0.1"
 dependencies = [
  "async-trait",
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "bytemuck",
  "futures-util",
  "solana-program",
@@ -8782,11 +8963,11 @@ dependencies = [
  "num-derive",
  "num-traits",
  "solana-decode-error",
- "solana-instruction",
+ "solana-instruction 2.1.0",
  "solana-msg",
- "solana-program-error",
- "solana-pubkey",
- "solana-sha256-hasher",
+ "solana-program-error 2.1.0",
+ "solana-pubkey 2.1.0",
+ "solana-sha256-hasher 2.1.0",
  "spl-discriminator 0.4.0",
  "spl-pod 0.5.0",
  "spl-type-length-value 0.7.0",
@@ -8847,7 +9028,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6c2318ddff97e006ed9b1291ebec0750a78547f870f62a69c56fe3b46a5d8fc"
 dependencies = [
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "solana-program",
  "spl-discriminator 0.3.0",
  "spl-pod 0.3.0",
@@ -8859,18 +9040,18 @@ dependencies = [
 name = "spl-token-metadata-interface"
 version = "0.6.0"
 dependencies = [
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "num-derive",
  "num-traits",
  "serde",
  "serde_json",
  "solana-borsh",
  "solana-decode-error",
- "solana-instruction",
+ "solana-instruction 2.1.0",
  "solana-msg",
- "solana-program-error",
- "solana-pubkey",
- "solana-sha256-hasher",
+ "solana-program-error 2.1.0",
+ "solana-pubkey 2.1.0",
+ "solana-sha256-hasher 2.1.0",
  "spl-discriminator 0.4.0",
  "spl-pod 0.5.0",
  "spl-type-length-value 0.7.0",
@@ -9005,40 +9186,40 @@ dependencies = [
 name = "spl-transfer-hook-example-downgrade"
 version = "1.0.0"
 dependencies = [
- "solana-account-info",
+ "solana-account-info 2.1.0",
  "solana-program-entrypoint",
- "solana-program-error",
- "solana-pubkey",
+ "solana-program-error 2.1.0",
+ "solana-pubkey 2.1.0",
 ]
 
 [[package]]
 name = "spl-transfer-hook-example-fail"
 version = "1.0.0"
 dependencies = [
- "solana-account-info",
+ "solana-account-info 2.1.0",
  "solana-program-entrypoint",
- "solana-program-error",
- "solana-pubkey",
+ "solana-program-error 2.1.0",
+ "solana-pubkey 2.1.0",
 ]
 
 [[package]]
 name = "spl-transfer-hook-example-success"
 version = "1.0.0"
 dependencies = [
- "solana-account-info",
+ "solana-account-info 2.1.0",
  "solana-program-entrypoint",
- "solana-program-error",
- "solana-pubkey",
+ "solana-program-error 2.1.0",
+ "solana-pubkey 2.1.0",
 ]
 
 [[package]]
 name = "spl-transfer-hook-example-swap"
 version = "1.0.0"
 dependencies = [
- "solana-account-info",
+ "solana-account-info 2.1.0",
  "solana-program-entrypoint",
- "solana-program-error",
- "solana-pubkey",
+ "solana-program-error 2.1.0",
+ "solana-pubkey 2.1.0",
  "spl-token-2022 6.0.0",
 ]
 
@@ -9046,10 +9227,10 @@ dependencies = [
 name = "spl-transfer-hook-example-swap-with-fee"
 version = "1.0.0"
 dependencies = [
- "solana-account-info",
+ "solana-account-info 2.1.0",
  "solana-program-entrypoint",
- "solana-program-error",
- "solana-pubkey",
+ "solana-program-error 2.1.0",
+ "solana-pubkey 2.1.0",
  "spl-token-2022 6.0.0",
 ]
 
@@ -9077,14 +9258,14 @@ dependencies = [
  "bytemuck",
  "num-derive",
  "num-traits",
- "solana-account-info",
- "solana-cpi",
+ "solana-account-info 2.1.0",
+ "solana-cpi 3.1.0",
  "solana-decode-error",
- "solana-instruction",
+ "solana-instruction 2.1.0",
  "solana-msg",
  "solana-program",
- "solana-program-error",
- "solana-pubkey",
+ "solana-program-error 2.1.0",
+ "solana-pubkey 2.1.0",
  "spl-discriminator 0.4.0",
  "spl-pod 0.5.0",
  "spl-program-error 0.6.0",
@@ -9114,10 +9295,10 @@ dependencies = [
  "bytemuck",
  "num-derive",
  "num-traits",
- "solana-account-info",
+ "solana-account-info 2.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",
@@ -9137,7 +9318,7 @@ dependencies = [
 name = "spl-type-length-value-derive-test"
 version = "0.1.0"
 dependencies = [
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "solana-borsh",
  "spl-discriminator 0.4.0",
  "spl-type-length-value 0.7.0",
@@ -9147,7 +9328,7 @@ dependencies = [
 name = "stateless-asks"
 version = "0.1.0"
 dependencies = [
- "borsh 1.5.3",
+ "borsh 1.5.7",
  "solana-program",
  "solana-program-test",
  "solana-sdk",
diff --git a/instruction-padding/program/Cargo.toml b/instruction-padding/program/Cargo.toml
index b30412155..b63816b1f 100644
--- a/instruction-padding/program/Cargo.toml
+++ b/instruction-padding/program/Cargo.toml
@@ -15,7 +15,7 @@ test-sbf = []
 [dependencies]
 num_enum = "0.7.3"
 solana-account-info = "2.1.0"
-solana-cpi = "2.1.0"
+solana-cpi = "3.1.0"
 solana-instruction = { version = "2.1.0", features = ["std"] }
 solana-program-entrypoint = "2.1.0"
 solana-program-error = "2.1.0"
diff --git a/token/transfer-hook/interface/Cargo.toml b/token/transfer-hook/interface/Cargo.toml
index c8b70cad6..ee45994e0 100644
--- a/token/transfer-hook/interface/Cargo.toml
+++ b/token/transfer-hook/interface/Cargo.toml
@@ -13,7 +13,7 @@ bytemuck = { version = "1.21.0", features = ["derive"] }
 num-derive = "0.4"
 num-traits = "0.2"
 solana-account-info = "2.1.0"
-solana-cpi = "2.1.0"
+solana-cpi = "3.1.0"
 solana-decode-error = "2.1.0"
 solana-instruction = { version = "2.1.0", features = ["std"] }
 solana-msg = "2.1.0"