diff --git a/Cargo.lock b/Cargo.lock
index a094245e..6789d9b9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -131,7 +131,7 @@ dependencies = [
  "solana-cpi 3.0.0",
  "solana-curve25519",
  "solana-hash 3.1.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-keccak-hasher 3.0.0",
  "solana-loader-v3-interface 6.1.0",
  "solana-poseidon",
@@ -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"
@@ -2836,7 +2845,7 @@ dependencies = [
  "solana-epoch-rewards 3.0.0",
  "solana-epoch-schedule 3.0.0",
  "solana-hash 3.1.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-instruction-error",
  "solana-loader-v3-interface 6.1.0",
  "solana-loader-v4-interface 3.1.0",
@@ -2878,7 +2887,7 @@ checksum = "f7849281d0ce4f3894742cf508a98b33c3bb284eb7df9d66476ab2168945f128"
 dependencies = [
  "mollusk-svm-error",
  "solana-account 3.2.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-pubkey 3.0.0",
  "solana-transaction-context",
 ]
@@ -2890,7 +2899,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f50b90812979ca5bb440f0a86e970355853d0e9466b939f88ad30af188e20525"
 dependencies = [
  "solana-account 3.2.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-program-error 3.0.0",
  "solana-pubkey 3.0.0",
  "solana-rent 3.0.0",
@@ -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,21 @@ 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",
+ "serde",
+ "serde_derive",
+ "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"
@@ -4608,7 +4632,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-clock 3.0.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-instruction-error",
  "solana-pubkey 3.0.0",
  "solana-sdk-ids 3.0.0",
@@ -4825,7 +4849,7 @@ dependencies = [
  "solana-account 3.2.0",
  "solana-bincode 3.0.0",
  "solana-clock 3.0.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-loader-v3-interface 6.1.0",
  "solana-loader-v4-interface 3.1.0",
  "solana-packet",
@@ -4923,7 +4947,7 @@ dependencies = [
  "solana-connection-cache",
  "solana-epoch-info",
  "solana-hash 3.1.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-keypair",
  "solana-measure",
  "solana-message 3.0.0",
@@ -4957,7 +4981,7 @@ dependencies = [
  "solana-commitment-config",
  "solana-epoch-info",
  "solana-hash 3.1.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-keypair",
  "solana-message 3.0.0",
  "solana-pubkey 3.0.0",
@@ -5037,7 +5061,7 @@ dependencies = [
  "solana-builtins-default-costs",
  "solana-compute-budget",
  "solana-compute-budget-interface",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-packet",
  "solana-pubkey 3.0.0",
  "solana-sdk-ids 3.0.0",
@@ -5053,7 +5077,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8292c436b269ad23cecc8b24f7da3ab07ca111661e25e00ce0e1d22771951ab9"
 dependencies = [
  "borsh 1.5.7",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-sdk-ids 3.0.0",
 ]
 
@@ -5076,7 +5100,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-account 3.2.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-pubkey 3.0.0",
  "solana-sdk-ids 3.0.0",
  "solana-short-vec 3.0.0",
@@ -5156,7 +5180,7 @@ checksum = "16238feb63d1cbdf915fb287f29ef7a7ebf81469bd6214f8b72a53866b593f8f"
 dependencies = [
  "solana-account-info 3.0.0",
  "solana-define-syscall 3.0.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-program-error 3.0.0",
  "solana-pubkey 3.0.0",
  "solana-stable-layout 3.0.0",
@@ -5197,6 +5221,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"
@@ -5216,7 +5246,7 @@ checksum = "e1419197f1c06abf760043f6d64ba9d79a03ad5a43f18c7586471937122094da"
 dependencies = [
  "bytemuck",
  "bytemuck_derive",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-sdk-ids 3.0.0",
 ]
 
@@ -5327,7 +5357,7 @@ dependencies = [
  "solana-address-lookup-table-interface 3.0.0",
  "solana-clock 3.0.0",
  "solana-hash 3.1.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-keccak-hasher 3.0.0",
  "solana-message 3.0.0",
  "solana-nonce 3.0.0",
@@ -5367,7 +5397,7 @@ dependencies = [
  "serde_derive",
  "solana-account 3.2.0",
  "solana-account-info 3.0.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-program-error 3.0.0",
  "solana-pubkey 3.0.0",
  "solana-rent 3.0.0",
@@ -5563,19 +5593,19 @@ dependencies = [
 
 [[package]]
 name = "solana-instruction"
-version = "3.0.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8df4e8fcba01d7efa647ed20a081c234475df5e11a93acb4393cc2c9a7b99bab"
+checksum = "ee1b699a2c1518028a9982e255e0eca10c44d90006542d9d7f9f40dbce3f7c78"
 dependencies = [
  "bincode",
  "borsh 1.5.7",
  "serde",
  "serde_derive",
- "solana-define-syscall 3.0.0",
+ "solana-define-syscall 4.0.1",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
  "solana-instruction-error",
- "solana-pubkey 3.0.0",
+ "solana-pubkey 4.0.0",
 ]
 
 [[package]]
@@ -5615,7 +5645,7 @@ checksum = "7ddf67876c541aa1e21ee1acae35c95c6fbc61119814bfef70579317a5e26955"
 dependencies = [
  "bitflags",
  "solana-account-info 3.0.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-instruction-error",
  "solana-program-error 3.0.0",
  "solana-pubkey 3.0.0",
@@ -5742,7 +5772,7 @@ dependencies = [
  "serde",
  "serde_bytes",
  "serde_derive",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-pubkey 3.0.0",
  "solana-sdk-ids 3.0.0",
  "solana-system-interface 2.0.0",
@@ -5772,7 +5802,7 @@ dependencies = [
  "serde",
  "serde_bytes",
  "serde_derive",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-pubkey 3.0.0",
  "solana-sdk-ids 3.0.0",
  "solana-system-interface 2.0.0",
@@ -5789,7 +5819,7 @@ dependencies = [
  "solana-account 3.2.0",
  "solana-bincode 3.0.0",
  "solana-bpf-loader-program",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-loader-v3-interface 6.1.0",
  "solana-loader-v4-interface 3.1.0",
  "solana-packet",
@@ -5857,7 +5887,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-hash 3.1.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-pubkey 3.0.0",
  "solana-sanitize 3.0.0",
  "solana-sdk-ids 3.0.0",
@@ -6247,7 +6277,7 @@ dependencies = [
  "solana-epoch-schedule 3.0.0",
  "solana-fee-structure",
  "solana-hash 3.1.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-last-restart-slot 3.0.0",
  "solana-program-entrypoint 3.1.0",
  "solana-pubkey 3.0.0",
@@ -6299,7 +6329,7 @@ dependencies = [
  "solana-fee-calculator 3.0.0",
  "solana-genesis-config",
  "solana-hash 3.1.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-keypair",
  "solana-loader-v3-interface 6.1.0",
  "solana-logger",
@@ -6345,7 +6375,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 +6396,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]]
@@ -6508,7 +6547,7 @@ dependencies = [
  "solana-epoch-schedule 3.0.0",
  "solana-feature-gate-interface 3.0.0",
  "solana-hash 3.1.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-message 3.0.0",
  "solana-pubkey 3.0.0",
  "solana-rpc-client-api",
@@ -6659,7 +6698,7 @@ dependencies = [
  "solana-hard-forks",
  "solana-hash 3.1.0",
  "solana-inflation",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-keypair",
  "solana-lattice-hash",
  "solana-loader-v3-interface 6.1.0",
@@ -6857,7 +6896,7 @@ checksum = "445d8e12592631d76fc4dc57858bae66c9fd7cc838c306c62a472547fc9d0ce6"
 dependencies = [
  "bytemuck",
  "openssl",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-sdk-ids 3.0.0",
 ]
 
@@ -7102,7 +7141,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1da74507795b6e8fb60b7c7306c0c36e2c315805d16eaaf479452661234685ac"
 dependencies = [
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-pubkey 3.0.0",
 ]
 
@@ -7160,7 +7199,7 @@ dependencies = [
  "solana-example-mocks 3.0.0",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-program-error 3.0.0",
  "solana-pubkey 3.0.0",
  "solana-sdk-ids 3.0.0",
@@ -7186,7 +7225,7 @@ dependencies = [
  "serde_derive",
  "solana-clock 3.0.0",
  "solana-cpi 3.0.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-program-error 3.0.0",
  "solana-pubkey 3.0.0",
  "solana-system-interface 2.0.0",
@@ -7212,7 +7251,7 @@ dependencies = [
  "solana-cpi 3.0.0",
  "solana-epoch-rewards 3.0.0",
  "solana-epoch-schedule 3.0.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-instruction-error",
  "solana-keypair",
  "solana-logger",
@@ -7249,7 +7288,7 @@ dependencies = [
  "solana-clock 3.0.0",
  "solana-config-interface",
  "solana-genesis-config",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-native-token 3.0.0",
  "solana-packet",
  "solana-program-runtime",
@@ -7328,7 +7367,7 @@ dependencies = [
  "solana-clock 3.0.0",
  "solana-fee-structure",
  "solana-hash 3.1.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-instructions-sysvar 3.0.0",
  "solana-loader-v3-interface 6.1.0",
  "solana-loader-v4-interface 3.1.0",
@@ -7449,7 +7488,7 @@ dependencies = [
  "num-traits",
  "serde",
  "serde_derive",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-msg 3.0.0",
  "solana-program-error 3.0.0",
  "solana-pubkey 3.0.0",
@@ -7468,7 +7507,7 @@ dependencies = [
  "solana-account 3.2.0",
  "solana-bincode 3.0.0",
  "solana-fee-calculator 3.0.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-nonce 3.0.0",
  "solana-nonce-account",
  "solana-packet",
@@ -7554,7 +7593,7 @@ dependencies = [
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
  "solana-hash 3.1.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-last-restart-slot 3.0.0",
  "solana-program-entrypoint 3.1.0",
  "solana-program-error 3.0.0",
@@ -7677,9 +7716,9 @@ dependencies = [
  "bincode",
  "serde",
  "serde_derive",
- "solana-address",
+ "solana-address 1.0.0",
  "solana-hash 3.1.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-instruction-error",
  "solana-message 3.0.0",
  "solana-sanitize 3.0.0",
@@ -7701,7 +7740,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-account 3.2.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-instructions-sysvar 3.0.0",
  "solana-pubkey 3.0.0",
  "solana-rent 3.0.0",
@@ -7761,7 +7800,7 @@ dependencies = [
  "serde_json",
  "solana-account-decoder-client-types",
  "solana-commitment-config",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-message 3.0.0",
  "solana-pubkey 3.0.0",
  "solana-reward-info",
@@ -7831,7 +7870,7 @@ dependencies = [
  "solana-bincode 3.0.0",
  "solana-clock 3.0.0",
  "solana-hash 3.1.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-keypair",
  "solana-packet",
  "solana-pubkey 3.0.0",
@@ -7884,7 +7923,7 @@ dependencies = [
  "serde_with",
  "solana-clock 3.0.0",
  "solana-hash 3.1.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-instruction-error",
  "solana-pubkey 3.0.0",
  "solana-rent 3.0.0",
@@ -7910,7 +7949,7 @@ dependencies = [
  "serde_with",
  "solana-clock 3.0.0",
  "solana-hash 3.1.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-instruction-error",
  "solana-pubkey 3.0.0",
  "solana-rent 3.0.0",
@@ -7939,7 +7978,7 @@ dependencies = [
  "solana-clock 3.0.0",
  "solana-epoch-schedule 3.0.0",
  "solana-hash 3.1.0",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-keypair",
  "solana-packet",
  "solana-program-runtime",
@@ -7964,7 +8003,7 @@ dependencies = [
  "bytemuck",
  "num-derive",
  "num-traits",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-program-runtime",
  "solana-sdk-ids 3.0.0",
  "solana-svm-log-collector",
@@ -7995,7 +8034,7 @@ dependencies = [
  "serde_json",
  "sha3",
  "solana-derivation-path",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-pubkey 3.0.0",
  "solana-sdk-ids 3.0.0",
  "solana-seed-derivable",
@@ -8018,7 +8057,7 @@ dependencies = [
  "bytemuck",
  "num-derive",
  "num-traits",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-program-runtime",
  "solana-sdk-ids 3.0.0",
  "solana-svm-log-collector",
@@ -8048,7 +8087,7 @@ dependencies = [
  "sha3",
  "solana-curve25519",
  "solana-derivation-path",
- "solana-instruction 3.0.0",
+ "solana-instruction 3.1.0",
  "solana-pubkey 3.0.0",
  "solana-sdk-ids 3.0.0",
  "solana-seed-derivable",
diff --git a/interface/Cargo.toml b/interface/Cargo.toml
index a987f507..2e52978b 100644
--- a/interface/Cargo.toml
+++ b/interface/Cargo.toml
@@ -25,7 +25,7 @@ solana-clock = "3.0.0"
 solana-cpi = { version = "3.0.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"
+solana-instruction = "3.1.0"
 solana-program-error = "3.0.0"
 solana-pubkey = { version = "3.0.0", default-features = false }
 solana-system-interface = "2.0.0"
diff --git a/program/Cargo.toml b/program/Cargo.toml
index 0bcb2995..db4845d5 100644
--- a/program/Cargo.toml
+++ b/program/Cargo.toml
@@ -34,7 +34,7 @@ solana-account = { version = "3.2.0", features = ["bincode"] }
 solana-config-interface = { version = "2", features = ["serde"] }
 solana-epoch-rewards = "3.0.0"
 solana-epoch-schedule = "3.0.0"
-solana-instruction = "3.0.0"
+solana-instruction = "3.1.0"
 solana-keypair = "3.0.0"
 solana-logger = "3.0.0"
 solana-program-test = "3.0.10"