diff --git a/Cargo.lock b/Cargo.lock
index 67290cb..9a3e772 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -128,7 +128,7 @@ dependencies = [
  "solana-blake3-hasher 3.0.0",
  "solana-bn254",
  "solana-clock 3.0.0",
- "solana-cpi 3.0.0",
+ "solana-cpi 3.1.0",
  "solana-curve25519",
  "solana-hash 3.1.0",
  "solana-instruction 3.0.0",
@@ -1672,6 +1672,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"
@@ -4567,7 +4576,7 @@ dependencies = [
  "bytemuck_derive",
  "curve25519-dalek 4.1.3",
  "five8 0.2.1",
- "five8_const",
+ "five8_const 0.1.3",
  "rand 0.8.5",
  "serde",
  "serde_derive",
@@ -4580,6 +4589,19 @@ dependencies = [
  "solana-sha256-hasher 3.0.0",
 ]
 
+[[package]]
+name = "solana-address"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e37320fd2945c5d654b2c6210624a52d66c3f1f73b653ed211ab91a703b35bdd"
+dependencies = [
+ "five8 1.0.0",
+ "five8_const 1.0.0",
+ "solana-define-syscall 4.0.1",
+ "solana-program-error 3.0.0",
+ "solana-sanitize 3.0.0",
+]
+
 [[package]]
 name = "solana-address-lookup-table-interface"
 version = "2.2.2"
@@ -5150,15 +5172,15 @@ dependencies = [
 
 [[package]]
 name = "solana-cpi"
-version = "3.0.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16238feb63d1cbdf915fb287f29ef7a7ebf81469bd6214f8b72a53866b593f8f"
+checksum = "4dea26709d867aada85d0d3617db0944215c8bb28d3745b912de7db13a23280c"
 dependencies = [
  "solana-account-info 3.0.0",
- "solana-define-syscall 3.0.0",
+ "solana-define-syscall 4.0.1",
  "solana-instruction 3.0.0",
  "solana-program-error 3.0.0",
- "solana-pubkey 3.0.0",
+ "solana-pubkey 4.0.0",
  "solana-stable-layout 3.0.0",
 ]
 
@@ -5197,6 +5219,12 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9697086a4e102d28a156b8d6b521730335d6951bd39a5e766512bbe09007cee"
 
+[[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 = "3.0.0"
@@ -6345,7 +6373,7 @@ dependencies = [
  "bytemuck_derive",
  "curve25519-dalek 4.1.3",
  "five8 0.2.1",
- "five8_const",
+ "five8_const 0.1.3",
  "getrandom 0.2.15",
  "js-sys",
  "num-traits",
@@ -6366,7 +6394,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8909d399deb0851aa524420beeb5646b115fd253ef446e35fe4504c904da3941"
 dependencies = [
  "rand 0.8.5",
- "solana-address",
+ "solana-address 1.0.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]]
@@ -6646,7 +6683,7 @@ dependencies = [
  "solana-compute-budget-instruction",
  "solana-compute-budget-interface",
  "solana-cost-model",
- "solana-cpi 3.0.0",
+ "solana-cpi 3.1.0",
  "solana-ed25519-program",
  "solana-epoch-info",
  "solana-epoch-rewards-hasher",
@@ -7152,7 +7189,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-clock 3.0.0",
- "solana-cpi 3.0.0",
+ "solana-cpi 3.1.0",
  "solana-instruction 3.0.0",
  "solana-program-error 3.0.0",
  "solana-pubkey 3.0.0",
@@ -7176,7 +7213,7 @@ dependencies = [
  "solana-account 3.2.0",
  "solana-borsh 3.0.0",
  "solana-clock 3.0.0",
- "solana-cpi 3.0.0",
+ "solana-cpi 3.1.0",
  "solana-example-mocks 3.0.0",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
@@ -7209,7 +7246,7 @@ dependencies = [
  "solana-account-info 3.0.0",
  "solana-clock 3.0.0",
  "solana-config-interface",
- "solana-cpi 3.0.0",
+ "solana-cpi 3.1.0",
  "solana-epoch-rewards 3.0.0",
  "solana-epoch-schedule 3.0.0",
  "solana-instruction 3.0.0",
@@ -7678,7 +7715,7 @@ dependencies = [
  "bincode",
  "serde",
  "serde_derive",
- "solana-address",
+ "solana-address 1.0.0",
  "solana-hash 3.1.0",
  "solana-instruction 3.0.0",
  "solana-instruction-error",
diff --git a/interface/Cargo.toml b/interface/Cargo.toml
index f91d225..99a3d6a 100644
--- a/interface/Cargo.toml
+++ b/interface/Cargo.toml
@@ -22,7 +22,7 @@ num-traits = "0.2"
 serde = { version = "1.0.210", optional = true }
 serde_derive = { version = "1.0.210", optional = true }
 solana-clock = "3.0.0"
-solana-cpi = { version = "3.0.0", optional = true }
+solana-cpi = { version = "3.1.0", optional = true }
 solana-frozen-abi = { version = "3.0.1", features = ["frozen-abi"], optional = true }
 solana-frozen-abi-macro = { version = "3.0.1", features = ["frozen-abi"], optional = true }
 solana-instruction = "3.0.0"
diff --git a/program/Cargo.toml b/program/Cargo.toml
index 4d1737f..81a3e64 100644
--- a/program/Cargo.toml
+++ b/program/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2021"
 bincode = "1.3.3"
 solana-account-info = { version = "3.0.0", features = ["bincode"] }
 solana-clock = "3.0.0"
-solana-cpi = "3.0.0"
+solana-cpi = "3.1.0"
 solana-instruction-error = "2.0.0"
 solana-msg = "3.0.0"
 solana-native-token = "3.0.0"