diff --git a/Cargo.lock b/Cargo.lock index 0aaac540b..e3bfc5f94 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" @@ -5226,7 +5244,7 @@ dependencies = [ "serde", "serde_bytes", "serde_derive", - "solana-instruction", + "solana-instruction 2.1.0", "solana-program", ] @@ -5268,7 +5286,7 @@ dependencies = [ "serde_derive", "serde_json", "solana-account", - "solana-pubkey", + "solana-pubkey 2.1.0", "zstd", ] @@ -5280,9 +5298,9 @@ checksum = "6abe81cfc4a75f71a510c6856b03a7d8525e416af3c69d55daef62e6078b8d40" dependencies = [ "bincode", "serde", - "solana-program-error", + "solana-program-error 2.1.0", "solana-program-memory", - "solana-pubkey", + "solana-pubkey 2.1.0", ] [[package]] @@ -5331,6 +5349,19 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "solana-address" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1384b52c435a750cc9c538760fc7bb472fd78e65a9900a2d07312c5bb335b72" +dependencies = [ + "five8", + "five8_const 1.0.0", + "solana-define-syscall 5.1.0", + "solana-program-error 3.0.1", + "solana-sanitize 3.0.1", +] + [[package]] name = "solana-address-lookup-table-program" version = "2.1.0" @@ -5417,7 +5448,7 @@ checksum = "9e85cb5961c356345a61378163fd9057011b35540f8bcdd8d8a09cb10117264f" dependencies = [ "bincode", "serde", - "solana-instruction", + "solana-instruction 2.1.0", ] [[package]] @@ -5432,7 +5463,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_derive", - "solana-sanitize", + "solana-sanitize 2.1.0", "solana-sdk", ] @@ -5766,7 +5797,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", @@ -5818,10 +5849,10 @@ 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-define-syscall 2.1.0", + "solana-instruction 2.1.0", + "solana-program-error 2.1.0", + "solana-pubkey 2.1.0", "solana-stable-layout", ] @@ -5853,6 +5884,12 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7062ae1de58e294d3bee5fd2c89efc155b7f7383ddce4cb88345dfafaaabc5bd" +[[package]] +name = "solana-define-syscall" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e14a4f604117f379840956a8fc8695e4c84f5b0ebed192f31f60d9b85d581d" + [[package]] name = "solana-derivation-path" version = "2.1.0" @@ -5931,7 +5968,7 @@ dependencies = [ "solana-clock", "solana-epoch-schedule", "solana-hash", - "solana-pubkey", + "solana-pubkey 2.1.0", "solana-sha256-hasher", ] @@ -6021,7 +6058,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", @@ -6048,7 +6085,7 @@ dependencies = [ "serde", "serde_derive", "solana-atomic-u64", - "solana-sanitize", + "solana-sanitize 2.1.0", "wasm-bindgen", ] @@ -6069,7 +6106,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24c9c6590e4eaf91efa887b2689b2941fe4b324bccd9a95f77853168f3d9a88" dependencies = [ "bytemuck", - "solana-pubkey", + "solana-pubkey 2.1.0", ] [[package]] @@ -6085,11 +6122,32 @@ dependencies = [ "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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ebb0ffd19263051bc3f683fcc086134b8ff23af894dcb63f7563c7137b42f1" +dependencies = [ + "solana-define-syscall 5.1.0", + "solana-instruction-error", + "solana-pubkey 4.2.0", +] + +[[package]] +name = "solana-instruction-error" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0b188842592fdf6cb96f55263ae1bf11713ab5114401d1d5a881ed7cc41bef6" +dependencies = [ + "num-traits", + "solana-program-error 3.0.1", +] + [[package]] name = "solana-last-restart-slot" version = "2.1.0" @@ -6261,7 +6319,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 +6420,7 @@ checksum = "f193a65f0db7fe5615c76c2814d6450a2e4cda61f786d5bf7a6b1ad0c179b947" dependencies = [ "ark-bn254", "light-poseidon", - "solana-define-syscall", + "solana-define-syscall 2.1.0", "thiserror 1.0.69", ] @@ -6395,7 +6453,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", @@ -6418,22 +6476,22 @@ dependencies = [ "solana-clock", "solana-cpi", "solana-decode-error", - "solana-define-syscall", + "solana-define-syscall 2.1.0", "solana-epoch-schedule", "solana-fee-calculator", "solana-hash", - "solana-instruction", + "solana-instruction 2.1.0", "solana-last-restart-slot", "solana-msg", "solana-native-token", "solana-program-entrypoint", - "solana-program-error", + "solana-program-error 2.1.0", "solana-program-memory", "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", @@ -6456,8 +6514,8 @@ checksum = "0eb90f3fa3e979b912451a404508f1f90bb6e5c1d7767625f622b20016fb9fde" dependencies = [ "solana-account-info", "solana-msg", - "solana-program-error", - "solana-pubkey", + "solana-program-error 2.1.0", + "solana-pubkey 2.1.0", ] [[package]] @@ -6471,11 +6529,17 @@ dependencies = [ "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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f04fa578707b3612b095f0c8e19b66a1233f7c42ca8082fcb3b745afcc0add6" + [[package]] name = "solana-program-memory" version = "2.1.0" @@ -6483,7 +6547,7 @@ 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]] @@ -6498,7 +6562,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 +6617,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", @@ -6579,7 +6643,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,12 +6652,21 @@ dependencies = [ "serde_derive", "solana-atomic-u64", "solana-decode-error", - "solana-define-syscall", - "solana-sanitize", + "solana-define-syscall 2.1.0", + "solana-sanitize 2.1.0", "solana-sha256-hasher", "wasm-bindgen", ] +[[package]] +name = "solana-pubkey" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7db719574990de7e8b0f55a8593ac92a5ccb42c8ce67b3e4bf05b139d5d9ee71" +dependencies = [ + "solana-address", +] + [[package]] name = "solana-pubsub-client" version = "2.1.0" @@ -6908,7 +6981,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 +6993,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" @@ -6965,14 +7044,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-pubkey 2.1.0", + "solana-sanitize 2.1.0", "solana-sdk-macro", "solana-secp256k1-recover", "solana-serde-varint", @@ -7003,7 +7082,7 @@ checksum = "f2eef5a00a75648273c3fb6e3d85b0c8c02fcc1e36c4271664dcc39b6b128d41" dependencies = [ "borsh 1.5.3", "libsecp256k1", - "solana-define-syscall", + "solana-define-syscall 2.1.0", "thiserror 1.0.69", ] @@ -7045,9 +7124,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,7 +7136,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", ] @@ -7082,7 +7161,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_derive", - "solana-sanitize", + "solana-sanitize 2.1.0", ] [[package]] @@ -7113,8 +7192,8 @@ 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]] @@ -7377,8 +7456,8 @@ checksum = "37a4bea6d80b34fe6e785d19bf928fe103928d1f6c9935ec23bb6a9d4d7a33d2" dependencies = [ "serde", "serde_derive", - "solana-instruction", - "solana-sanitize", + "solana-instruction 2.1.0", + "solana-sanitize 2.1.0", ] [[package]] @@ -7551,7 +7630,7 @@ dependencies = [ "serde", "serde_derive", "solana-feature-set", - "solana-sanitize", + "solana-sanitize 2.1.0", "solana-serde-varint", ] @@ -7780,9 +7859,9 @@ dependencies = [ name = "spl-associated-token-account-client" version = "2.0.0" dependencies = [ - "solana-instruction", + "solana-instruction 3.4.0", "solana-program", - "solana-pubkey", + "solana-pubkey 2.1.0", ] [[package]] @@ -7843,7 +7922,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", ] @@ -8107,12 +8186,12 @@ dependencies = [ "num_enum", "solana-account-info", "solana-cpi", - "solana-instruction", + "solana-instruction 3.4.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", ] @@ -8172,11 +8251,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f09647c0974e33366efeb83b8e2daebb329f0420149e74d3a4bd2c08cf9f7cb" dependencies = [ "solana-account-info", - "solana-instruction", + "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]] @@ -8228,9 +8307,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", ] @@ -8293,13 +8372,13 @@ dependencies = [ "num-traits", "solana-account-info", "solana-decode-error", - "solana-instruction", + "solana-instruction 3.4.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", @@ -8479,11 +8558,11 @@ dependencies = [ "solana-account-info", "solana-client", "solana-decode-error", - "solana-instruction", + "solana-instruction 3.4.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", @@ -8782,10 +8861,10 @@ dependencies = [ "num-derive", "num-traits", "solana-decode-error", - "solana-instruction", + "solana-instruction 3.4.0", "solana-msg", - "solana-program-error", - "solana-pubkey", + "solana-program-error 2.1.0", + "solana-pubkey 2.1.0", "solana-sha256-hasher", "spl-discriminator 0.4.0", "spl-pod 0.5.0", @@ -8866,10 +8945,10 @@ dependencies = [ "serde_json", "solana-borsh", "solana-decode-error", - "solana-instruction", + "solana-instruction 3.4.0", "solana-msg", - "solana-program-error", - "solana-pubkey", + "solana-program-error 2.1.0", + "solana-pubkey 2.1.0", "solana-sha256-hasher", "spl-discriminator 0.4.0", "spl-pod 0.5.0", @@ -9007,8 +9086,8 @@ version = "1.0.0" dependencies = [ "solana-account-info", "solana-program-entrypoint", - "solana-program-error", - "solana-pubkey", + "solana-program-error 2.1.0", + "solana-pubkey 2.1.0", ] [[package]] @@ -9017,8 +9096,8 @@ version = "1.0.0" dependencies = [ "solana-account-info", "solana-program-entrypoint", - "solana-program-error", - "solana-pubkey", + "solana-program-error 2.1.0", + "solana-pubkey 2.1.0", ] [[package]] @@ -9027,8 +9106,8 @@ version = "1.0.0" dependencies = [ "solana-account-info", "solana-program-entrypoint", - "solana-program-error", - "solana-pubkey", + "solana-program-error 2.1.0", + "solana-pubkey 2.1.0", ] [[package]] @@ -9037,8 +9116,8 @@ version = "1.0.0" dependencies = [ "solana-account-info", "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", ] @@ -9048,8 +9127,8 @@ version = "1.0.0" dependencies = [ "solana-account-info", "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", ] @@ -9080,11 +9159,11 @@ dependencies = [ "solana-account-info", "solana-cpi", "solana-decode-error", - "solana-instruction", + "solana-instruction 3.4.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", @@ -9117,7 +9196,7 @@ dependencies = [ "solana-account-info", "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/associated-token-account/client/Cargo.toml b/associated-token-account/client/Cargo.toml index 7a5297969..9fcf29984 100644 --- a/associated-token-account/client/Cargo.toml +++ b/associated-token-account/client/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" edition = "2021" [dependencies] -solana-instruction = { version = "2.1.0", features = ["std"] } +solana-instruction = { version = "3.4.0", features = ["std"] } solana-pubkey = { version = "2.1.0", features = ["curve25519"] } [dev-dependencies] diff --git a/instruction-padding/program/Cargo.toml b/instruction-padding/program/Cargo.toml index b30412155..6db06efad 100644 --- a/instruction-padding/program/Cargo.toml +++ b/instruction-padding/program/Cargo.toml @@ -16,7 +16,7 @@ test-sbf = [] num_enum = "0.7.3" solana-account-info = "2.1.0" solana-cpi = "2.1.0" -solana-instruction = { version = "2.1.0", features = ["std"] } +solana-instruction = { version = "3.4.0", features = ["std"] } solana-program-entrypoint = "2.1.0" solana-program-error = "2.1.0" solana-pubkey = "2.1.0" diff --git a/libraries/tlv-account-resolution/Cargo.toml b/libraries/tlv-account-resolution/Cargo.toml index e95642cd4..3a7206bcc 100644 --- a/libraries/tlv-account-resolution/Cargo.toml +++ b/libraries/tlv-account-resolution/Cargo.toml @@ -18,7 +18,7 @@ num-traits = "0.2" serde = { version = "1.0.217", optional = true } solana-account-info = "2.1.0" solana-decode-error = "2.1.0" -solana-instruction = { version = "2.1.0", features = ["std"] } +solana-instruction = { version = "3.4.0", features = ["std"] } solana-program-error = "2.1.0" solana-msg = "2.1.0" solana-pubkey = "2.1.0" diff --git a/record/program/Cargo.toml b/record/program/Cargo.toml index 5d9ebe6fc..3ac427c93 100644 --- a/record/program/Cargo.toml +++ b/record/program/Cargo.toml @@ -17,7 +17,7 @@ num-derive = "0.4" num-traits = "0.2" solana-account-info = "2.1.0" solana-decode-error = "2.1.0" -solana-instruction = { version = "2.1.0", features = ["std"] } +solana-instruction = { version = "3.4.0", features = ["std"] } solana-msg = "2.1.0" solana-program-entrypoint = "2.1.0" solana-program-error = "2.1.0" diff --git a/token-group/interface/Cargo.toml b/token-group/interface/Cargo.toml index 49a7c6332..75e006d0a 100644 --- a/token-group/interface/Cargo.toml +++ b/token-group/interface/Cargo.toml @@ -12,7 +12,7 @@ bytemuck = "1.21.0" num-derive = "0.4" num-traits = "0.2" solana-decode-error = "2.1.0" -solana-instruction = "2.1.0" +solana-instruction = "3.4.0" solana-msg = "2.1.0" solana-program-error = "2.1.0" solana-pubkey = "2.1.0" diff --git a/token-metadata/interface/Cargo.toml b/token-metadata/interface/Cargo.toml index c904c15a9..542a30b45 100644 --- a/token-metadata/interface/Cargo.toml +++ b/token-metadata/interface/Cargo.toml @@ -17,7 +17,7 @@ num-traits = "0.2" serde = { version = "1.0.217", optional = true } solana-borsh = "2.1.0" solana-decode-error = "2.1.0" -solana-instruction = "2.1.0" +solana-instruction = "3.4.0" solana-msg = "2.1.0" solana-program-error = "2.1.0" spl-discriminator = { version = "0.4.0", path = "../../libraries/discriminator" } diff --git a/token/transfer-hook/interface/Cargo.toml b/token/transfer-hook/interface/Cargo.toml index c8b70cad6..fc9513aa4 100644 --- a/token/transfer-hook/interface/Cargo.toml +++ b/token/transfer-hook/interface/Cargo.toml @@ -15,7 +15,7 @@ num-traits = "0.2" solana-account-info = "2.1.0" solana-cpi = "2.1.0" solana-decode-error = "2.1.0" -solana-instruction = { version = "2.1.0", features = ["std"] } +solana-instruction = { version = "3.4.0", features = ["std"] } solana-msg = "2.1.0" solana-program-error = "2.1.0" solana-pubkey = { version = "2.1.0", features = ["curve25519"] }