From 1360049f352364289fe4da13d2cfac8c8182394e Mon Sep 17 00:00:00 2001 From: Jon C Date: Fri, 8 Aug 2025 00:11:22 +0200 Subject: [PATCH] deps: Bump sdk to v3, decouple from token program #### Problem The interface crate is still on the v2 sdk crates, but the v3 crates are ready. #### Summary of changes Bump the sdk crates to v3 and decouple the program from the repo version of the interface crate. The only change is the `to_str` signature on the error. While doing this, I noticed that the interface crate wasn't actually part of the workspace, so I added it in. --- Cargo.lock | 863 ++++++++++++++++++++++++----------------- Cargo.toml | 2 +- interface/Cargo.toml | 12 +- interface/src/error.rs | 2 +- program/Cargo.toml | 2 +- 5 files changed, 522 insertions(+), 359 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d16fad20..bdc65072 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -61,9 +61,9 @@ checksum = "2733340e0429d146d4b77d265ae80b22e253507b30a2257ff68eccb78eab210b" dependencies = [ "ahash 0.8.11", "solana-epoch-schedule", - "solana-hash", - "solana-pubkey", - "solana-sha256-hasher", + "solana-hash 2.3.0", + "solana-pubkey 2.4.0", + "solana-sha256-hasher 2.2.1", "solana-svm-feature-set", ] @@ -96,8 +96,8 @@ dependencies = [ "solana-ed25519-program", "solana-message", "solana-precompile-error", - "solana-pubkey", - "solana-sdk-ids", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", "solana-secp256k1-program", "solana-secp256r1-program", ] @@ -109,8 +109,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "732a49e540c5b7b8d8943d50ad4b51b98ad9951494053b51fb909c140d3df8b1" dependencies = [ "agave-feature-set", - "solana-pubkey", - "solana-sdk-ids", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", ] [[package]] @@ -119,11 +119,11 @@ version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e79356209e3126f9a60af1b50690be8334336b4b9e52e9ccc87e775519d78f78" dependencies = [ - "solana-hash", + "solana-hash 2.3.0", "solana-message", "solana-packet", - "solana-pubkey", - "solana-sdk-ids", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", "solana-short-vec", "solana-signature", "solana-svm-transaction", @@ -2537,18 +2537,18 @@ dependencies = [ "solana-compute-budget", "solana-epoch-rewards", "solana-epoch-schedule", - "solana-hash", - "solana-instruction", + "solana-hash 2.3.0", + "solana-instruction 2.3.0", "solana-loader-v3-interface 3.0.0", "solana-loader-v4-interface", "solana-log-collector", "solana-logger", "solana-precompile-error", - "solana-program-error", + "solana-program-error 2.2.2", "solana-program-runtime", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rent", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-slot-hashes", "solana-stake-interface", "solana-svm-callback", @@ -2565,7 +2565,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b6dbd427ad309c5a2334dafe5664a100b20abf6cf10ddd0c1b2b92db894eda3" dependencies = [ - "solana-pubkey", + "solana-pubkey 2.4.0", "thiserror 1.0.69", ] @@ -2585,10 +2585,10 @@ dependencies = [ "solana-compute-budget", "solana-epoch-rewards", "solana-epoch-schedule", - "solana-hash", - "solana-instruction", + "solana-hash 2.3.0", + "solana-instruction 2.3.0", "solana-keccak-hasher", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rent", "solana-slot-hashes", "solana-stake-interface", @@ -2616,8 +2616,8 @@ checksum = "2707b65c79ad330365c43a793868932ed32ffa893818b4b8b1d70e2acf88f783" dependencies = [ "mollusk-svm-error", "solana-account", - "solana-instruction", - "solana-pubkey", + "solana-instruction 2.3.0", + "solana-pubkey 2.4.0", "solana-transaction-context", ] @@ -2628,9 +2628,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed0bb72e20d0f2429eeb8a4bbc85d95a0ac7e042c415b56494069cef26a70cca" dependencies = [ "solana-account", - "solana-instruction", - "solana-program-error", - "solana-pubkey", + "solana-instruction 2.3.0", + "solana-program-error 2.2.2", + "solana-pubkey 2.4.0", "solana-rent", ] @@ -2796,18 +2796,19 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a" dependencies = [ "num_enum_derive", + "rustversion", ] [[package]] name = "num_enum_derive" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", @@ -3076,13 +3077,13 @@ dependencies = [ "pinocchio", "pinocchio-log", "pinocchio-token-interface", - "solana-instruction", + "solana-instruction 2.3.0", "solana-keypair", - "solana-program-error", - "solana-program-option", - "solana-program-pack", + "solana-program-error 2.2.2", + "solana-program-option 2.2.1", + "solana-program-pack 2.2.1", "solana-program-test", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-signature", "solana-signer", "solana-system-interface", @@ -4177,9 +4178,9 @@ dependencies = [ "serde_derive", "solana-account-info", "solana-clock", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", + "solana-instruction 2.3.0", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", "solana-sysvar", ] @@ -4195,7 +4196,7 @@ dependencies = [ "serde_derive", "serde_json", "solana-account", - "solana-pubkey", + "solana-pubkey 2.4.0", "zstd", ] @@ -4207,9 +4208,9 @@ checksum = "c8f5152a288ef1912300fc6efa6c2d1f9bb55d9398eb6c72326360b8063987da" dependencies = [ "bincode", "serde", - "solana-program-error", + "solana-program-error 2.2.2", "solana-program-memory", - "solana-pubkey", + "solana-pubkey 2.4.0", ] [[package]] @@ -4251,17 +4252,17 @@ dependencies = [ "solana-epoch-schedule", "solana-fee-calculator", "solana-genesis-config", - "solana-hash", + "solana-hash 2.3.0", "solana-lattice-hash", "solana-measure", "solana-message", "solana-metrics", "solana-nohash-hasher", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rayon-threadlimit", "solana-rent-collector", "solana-reward-info", - "solana-sha256-hasher", + "solana-sha256-hasher 2.2.1", "solana-slot-hashes", "solana-svm-transaction", "solana-system-interface", @@ -4277,6 +4278,23 @@ dependencies = [ "thiserror 2.0.12", ] +[[package]] +name = "solana-address" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a7a457086457ea9db9a5199d719dc8734dc2d0342fad0d8f77633c31eb62f19" +dependencies = [ + "bytemuck", + "bytemuck_derive", + "five8", + "five8_const", + "solana-atomic-u64 3.0.0", + "solana-define-syscall 3.0.0", + "solana-program-error 3.0.0", + "solana-sanitize 3.0.0", + "solana-sha256-hasher 3.0.0", +] + [[package]] name = "solana-address-lookup-table-interface" version = "2.2.2" @@ -4288,9 +4306,9 @@ dependencies = [ "serde", "serde_derive", "solana-clock", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", + "solana-instruction 2.3.0", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", "solana-slot-hashes", ] @@ -4303,6 +4321,15 @@ dependencies = [ "parking_lot", ] +[[package]] +name = "solana-atomic-u64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a933ff1e50aff72d02173cfcd7511bd8540b027ee720b75f353f594f834216d0" +dependencies = [ + "parking_lot", +] + [[package]] name = "solana-banks-client" version = "2.3.4" @@ -4315,10 +4342,10 @@ dependencies = [ "solana-banks-interface", "solana-clock", "solana-commitment-config", - "solana-hash", + "solana-hash 2.3.0", "solana-message", - "solana-program-pack", - "solana-pubkey", + "solana-program-pack 2.2.1", + "solana-pubkey 2.4.0", "solana-rent", "solana-signature", "solana-sysvar", @@ -4342,9 +4369,9 @@ dependencies = [ "solana-account", "solana-clock", "solana-commitment-config", - "solana-hash", + "solana-hash 2.3.0", "solana-message", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-signature", "solana-transaction", "solana-transaction-context", @@ -4367,9 +4394,9 @@ dependencies = [ "solana-client", "solana-clock", "solana-commitment-config", - "solana-hash", + "solana-hash 2.3.0", "solana-message", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-runtime", "solana-runtime-transaction", "solana-send-transaction-service", @@ -4390,7 +4417,7 @@ checksum = "75db7f2bbac3e62cfd139065d15bcda9e2428883ba61fc8d27ccb251081e7567" dependencies = [ "num-bigint 0.4.6", "num-traits", - "solana-define-syscall", + "solana-define-syscall 2.3.0", ] [[package]] @@ -4401,7 +4428,7 @@ checksum = "19a3787b8cf9c9fe3dd360800e8b70982b9e5a8af9e11c354b6665dd4a003adc" dependencies = [ "bincode", "serde", - "solana-instruction", + "solana-instruction 2.3.0", ] [[package]] @@ -4411,9 +4438,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1a0801e25a1b31a14494fc80882a036be0ffd290efc4c2d640bfcca120a4672" dependencies = [ "blake3", - "solana-define-syscall", - "solana-hash", - "solana-sanitize", + "solana-define-syscall 2.3.0", + "solana-hash 2.3.0", + "solana-sanitize 2.2.1", ] [[package]] @@ -4427,7 +4454,7 @@ dependencies = [ "ark-ff", "ark-serialize", "bytemuck", - "solana-define-syscall", + "solana-define-syscall 2.3.0", "thiserror 2.0.12", ] @@ -4461,8 +4488,8 @@ dependencies = [ "solana-clock", "solana-cpi", "solana-curve25519", - "solana-hash", - "solana-instruction", + "solana-hash 2.3.0", + "solana-instruction 2.3.0", "solana-keccak-hasher", "solana-loader-v3-interface 5.0.0", "solana-loader-v4-interface", @@ -4472,11 +4499,11 @@ dependencies = [ "solana-poseidon", "solana-program-entrypoint", "solana-program-runtime", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-sbpf", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-secp256k1-recover", - "solana-sha256-hasher", + "solana-sha256-hasher 2.2.1", "solana-stable-layout", "solana-svm-feature-set", "solana-system-interface", @@ -4503,7 +4530,7 @@ dependencies = [ "rand 0.8.5", "solana-clock", "solana-measure", - "solana-pubkey", + "solana-pubkey 2.4.0", "tempfile", ] @@ -4516,11 +4543,11 @@ dependencies = [ "agave-feature-set", "solana-bpf-loader-program", "solana-compute-budget-program", - "solana-hash", + "solana-hash 2.3.0", "solana-loader-v4-program", "solana-program-runtime", - "solana-pubkey", - "solana-sdk-ids", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", "solana-stake-program", "solana-system-program", "solana-vote-program", @@ -4540,8 +4567,8 @@ dependencies = [ "solana-bpf-loader-program", "solana-compute-budget-program", "solana-loader-v4-program", - "solana-pubkey", - "solana-sdk-ids", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", "solana-stake-program", "solana-system-program", "solana-vote-program", @@ -4568,12 +4595,12 @@ dependencies = [ "solana-commitment-config", "solana-connection-cache", "solana-epoch-info", - "solana-hash", - "solana-instruction", + "solana-hash 2.3.0", + "solana-instruction 2.3.0", "solana-keypair", "solana-measure", "solana-message", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-pubsub-client", "solana-quic-client", "solana-quic-definitions", @@ -4602,11 +4629,11 @@ dependencies = [ "solana-account", "solana-commitment-config", "solana-epoch-info", - "solana-hash", - "solana-instruction", + "solana-hash 2.3.0", + "solana-instruction 2.3.0", "solana-keypair", "solana-message", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-signature", "solana-signer", "solana-system-interface", @@ -4622,7 +4649,7 @@ checksum = "1bb482ab70fced82ad3d7d3d87be33d466a3498eb8aa856434ff3c0dfc2e2e31" dependencies = [ "serde", "serde_derive", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-sdk-macro", "solana-sysvar-id", ] @@ -4635,7 +4662,7 @@ checksum = "7ace9fea2daa28354d107ea879cff107181d85cd4e0f78a2bedb10e1a428c97e" dependencies = [ "serde", "serde_derive", - "solana-hash", + "solana-hash 2.3.0", ] [[package]] @@ -4670,10 +4697,10 @@ dependencies = [ "solana-builtins-default-costs", "solana-compute-budget", "solana-compute-budget-interface", - "solana-instruction", + "solana-instruction 2.3.0", "solana-packet", - "solana-pubkey", - "solana-sdk-ids", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", "solana-svm-transaction", "solana-transaction-error", "thiserror 2.0.12", @@ -4686,8 +4713,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8432d2c4c22d0499aa06d62e4f7e333f81777b3d7c96050ae9e5cb71a8c3aee4" dependencies = [ "borsh 1.5.7", - "solana-instruction", - "solana-sdk-ids", + "solana-instruction 2.3.0", + "solana-sdk-ids 2.2.1", ] [[package]] @@ -4754,9 +4781,9 @@ dependencies = [ "solana-fee-structure", "solana-metrics", "solana-packet", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-runtime-transaction", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-svm-transaction", "solana-system-interface", "solana-transaction-error", @@ -4770,10 +4797,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8dc71126edddc2ba014622fc32d0f5e2e78ec6c5a1e0eb511b85618c09e9ea11" dependencies = [ "solana-account-info", - "solana-define-syscall", - "solana-instruction", - "solana-program-error", - "solana-pubkey", + "solana-define-syscall 2.3.0", + "solana-instruction 2.3.0", + "solana-program-error 2.2.2", + "solana-pubkey 2.4.0", "solana-stable-layout", ] @@ -4786,7 +4813,7 @@ dependencies = [ "bytemuck", "bytemuck_derive", "curve25519-dalek 4.1.3", - "solana-define-syscall", + "solana-define-syscall 2.3.0", "subtle", "thiserror 2.0.12", ] @@ -4806,6 +4833,12 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ae3e2abcf541c8122eafe9a625d4d194b4023c20adde1e251f94e056bb1aee2" +[[package]] +name = "solana-define-syscall" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9697086a4e102d28a156b8d6b521730335d6951bd39a5e766512bbe09007cee" + [[package]] name = "solana-derivation-path" version = "2.2.1" @@ -4827,9 +4860,9 @@ dependencies = [ "bytemuck_derive", "ed25519-dalek", "solana-feature-set", - "solana-instruction", + "solana-instruction 2.3.0", "solana-precompile-error", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", ] [[package]] @@ -4850,8 +4883,8 @@ checksum = "86b575d3dd323b9ea10bb6fe89bf6bf93e249b215ba8ed7f68f1a3633f384db7" dependencies = [ "serde", "serde_derive", - "solana-hash", - "solana-sdk-ids", + "solana-hash 2.3.0", + "solana-sdk-ids 2.2.1", "solana-sdk-macro", "solana-sysvar-id", ] @@ -4863,8 +4896,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96c5fd2662ae7574810904585fd443545ed2b568dbd304b25a31e79ccc76e81b" dependencies = [ "siphasher 0.3.11", - "solana-hash", - "solana-pubkey", + "solana-hash 2.3.0", + "solana-pubkey 2.4.0", ] [[package]] @@ -4875,7 +4908,7 @@ checksum = "3fce071fbddecc55d727b1d7ed16a629afe4f6e4c217bc8d00af3b785f6f67ed" dependencies = [ "serde", "serde_derive", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-sdk-macro", "solana-sysvar-id", ] @@ -4890,13 +4923,13 @@ dependencies = [ "serde_derive", "solana-address-lookup-table-interface", "solana-clock", - "solana-hash", - "solana-instruction", + "solana-hash 2.3.0", + "solana-instruction 2.3.0", "solana-keccak-hasher", "solana-message", "solana-nonce", - "solana-pubkey", - "solana-sdk-ids", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", "solana-system-interface", "thiserror 2.0.12", ] @@ -4912,11 +4945,11 @@ dependencies = [ "serde_derive", "solana-account", "solana-account-info", - "solana-instruction", - "solana-program-error", - "solana-pubkey", + "solana-instruction 2.3.0", + "solana-program-error 2.2.2", + "solana-pubkey 2.4.0", "solana-rent", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-system-interface", ] @@ -4929,9 +4962,9 @@ dependencies = [ "ahash 0.8.11", "lazy_static", "solana-epoch-schedule", - "solana-hash", - "solana-pubkey", - "solana-sha256-hasher", + "solana-hash 2.3.0", + "solana-pubkey 2.4.0", + "solana-sha256-hasher 2.2.1", ] [[package]] @@ -4984,16 +5017,16 @@ dependencies = [ "solana-cluster-type", "solana-epoch-schedule", "solana-fee-calculator", - "solana-hash", + "solana-hash 2.3.0", "solana-inflation", "solana-keypair", "solana-logger", "solana-native-token", "solana-poh-config", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rent", - "solana-sdk-ids", - "solana-sha256-hasher", + "solana-sdk-ids 2.2.1", + "solana-sha256-hasher 2.2.1", "solana-shred-version", "solana-signer", "solana-time-utils", @@ -5022,11 +5055,22 @@ dependencies = [ "js-sys", "serde", "serde_derive", - "solana-atomic-u64", - "solana-sanitize", + "solana-atomic-u64 2.2.1", + "solana-sanitize 2.2.1", "wasm-bindgen", ] +[[package]] +name = "solana-hash" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a063723b9e84c14d8c0d2cdf0268207dc7adecf546e31251f9e07c7b00b566c" +dependencies = [ + "five8", + "solana-atomic-u64 3.0.0", + "solana-sanitize 3.0.0", +] + [[package]] name = "solana-inflation" version = "2.2.1" @@ -5050,11 +5094,32 @@ dependencies = [ "num-traits", "serde", "serde_derive", - "solana-define-syscall", - "solana-pubkey", + "solana-define-syscall 2.3.0", + "solana-pubkey 2.4.0", "wasm-bindgen", ] +[[package]] +name = "solana-instruction" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df4e8fcba01d7efa647ed20a081c234475df5e11a93acb4393cc2c9a7b99bab" +dependencies = [ + "solana-define-syscall 3.0.0", + "solana-instruction-error", + "solana-pubkey 3.0.0", +] + +[[package]] +name = "solana-instruction-error" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f0d483b8ae387178d9210e0575b666b05cdd4bd0f2f188128249f6e454d39d" +dependencies = [ + "num-traits", + "solana-program-error 3.0.0", +] + [[package]] name = "solana-instructions-sysvar" version = "2.2.2" @@ -5063,11 +5128,11 @@ checksum = "e0e85a6fad5c2d0c4f5b91d34b8ca47118fc593af706e523cdbedf846a954f57" dependencies = [ "bitflags", "solana-account-info", - "solana-instruction", - "solana-program-error", - "solana-pubkey", - "solana-sanitize", - "solana-sdk-ids", + "solana-instruction 2.3.0", + "solana-program-error 2.2.2", + "solana-pubkey 2.4.0", + "solana-sanitize 2.2.1", + "solana-sdk-ids 2.2.1", "solana-serialize-utils", "solana-sysvar-id", ] @@ -5079,9 +5144,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7aeb957fbd42a451b99235df4942d96db7ef678e8d5061ef34c9b34cae12f79" dependencies = [ "sha3", - "solana-define-syscall", - "solana-hash", - "solana-sanitize", + "solana-define-syscall 2.3.0", + "solana-hash 2.3.0", + "solana-sanitize 2.2.1", ] [[package]] @@ -5095,7 +5160,7 @@ dependencies = [ "five8", "rand 0.7.3", "solana-derivation-path", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-seed-derivable", "solana-seed-phrase", "solana-signature", @@ -5111,7 +5176,7 @@ checksum = "4a6360ac2fdc72e7463565cd256eedcf10d7ef0c28a1249d261ec168c1b55cdd" dependencies = [ "serde", "serde_derive", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-sdk-macro", "solana-sysvar-id", ] @@ -5137,9 +5202,9 @@ dependencies = [ "serde", "serde_bytes", "serde_derive", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", + "solana-instruction 2.3.0", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", ] [[package]] @@ -5151,9 +5216,9 @@ dependencies = [ "serde", "serde_bytes", "serde_derive", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", + "solana-instruction 2.3.0", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", "solana-system-interface", ] @@ -5166,9 +5231,9 @@ dependencies = [ "serde", "serde_bytes", "serde_derive", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", + "solana-instruction 2.3.0", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", "solana-system-interface", ] @@ -5181,9 +5246,9 @@ dependencies = [ "serde", "serde_bytes", "serde_derive", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", + "solana-instruction 2.3.0", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", "solana-system-interface", ] @@ -5198,16 +5263,16 @@ dependencies = [ "solana-account", "solana-bincode", "solana-bpf-loader-program", - "solana-instruction", + "solana-instruction 2.3.0", "solana-loader-v3-interface 5.0.0", "solana-loader-v4-interface", "solana-log-collector", "solana-measure", "solana-packet", "solana-program-runtime", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-sbpf", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-transaction-context", "solana-type-overrides", ] @@ -5252,11 +5317,11 @@ dependencies = [ "serde", "serde_derive", "solana-bincode", - "solana-hash", - "solana-instruction", - "solana-pubkey", - "solana-sanitize", - "solana-sdk-ids", + "solana-hash 2.3.0", + "solana-instruction 2.3.0", + "solana-pubkey 2.4.0", + "solana-sanitize 2.2.1", + "solana-sdk-ids 2.2.1", "solana-short-vec", "solana-system-interface", "solana-transaction-error", @@ -5274,7 +5339,7 @@ dependencies = [ "log", "reqwest", "solana-cluster-type", - "solana-sha256-hasher", + "solana-sha256-hasher 2.2.1", "solana-time-utils", "thiserror 2.0.12", ] @@ -5285,7 +5350,7 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36a1a14399afaabc2781a1db09cb14ee4cc4ee5c7a5a3cfcc601811379a8092" dependencies = [ - "solana-define-syscall", + "solana-define-syscall 2.3.0", ] [[package]] @@ -5330,9 +5395,9 @@ dependencies = [ "serde", "serde_derive", "solana-fee-calculator", - "solana-hash", - "solana-pubkey", - "solana-sha256-hasher", + "solana-hash 2.3.0", + "solana-pubkey 2.4.0", + "solana-sha256-hasher 2.2.1", ] [[package]] @@ -5342,9 +5407,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cde971a20b8dbf60144d6a84439dda86b5466e00e2843091fe731083cda614da" dependencies = [ "solana-account", - "solana-hash", + "solana-hash 2.3.0", "solana-nonce", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", ] [[package]] @@ -5381,13 +5446,13 @@ dependencies = [ "rand 0.8.5", "rayon", "serde", - "solana-hash", + "solana-hash 2.3.0", "solana-message", "solana-metrics", "solana-packet", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rayon-threadlimit", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-short-vec", "solana-signature", "solana-time-utils", @@ -5411,7 +5476,7 @@ checksum = "65143c77c1d4864c05e238f25b7d41b5a14b4d56352afab38fe89d97a78fff7f" dependencies = [ "ark-bn254", "light-poseidon", - "solana-define-syscall", + "solana-define-syscall 2.3.0", "thiserror 2.0.12", ] @@ -5452,7 +5517,7 @@ dependencies = [ "serde_derive", "solana-account-info", "solana-address-lookup-table-interface", - "solana-atomic-u64", + "solana-atomic-u64 2.2.1", "solana-big-mod-exp", "solana-bincode", "solana-blake3-hasher", @@ -5460,14 +5525,14 @@ dependencies = [ "solana-clock", "solana-cpi", "solana-decode-error", - "solana-define-syscall", + "solana-define-syscall 2.3.0", "solana-epoch-rewards", "solana-epoch-schedule", "solana-example-mocks", "solana-feature-gate-interface", "solana-fee-calculator", - "solana-hash", - "solana-instruction", + "solana-hash 2.3.0", + "solana-instruction 2.3.0", "solana-instructions-sysvar", "solana-keccak-hasher", "solana-last-restart-slot", @@ -5479,19 +5544,19 @@ dependencies = [ "solana-native-token", "solana-nonce", "solana-program-entrypoint", - "solana-program-error", + "solana-program-error 2.2.2", "solana-program-memory", - "solana-program-option", - "solana-program-pack", - "solana-pubkey", + "solana-program-option 2.2.1", + "solana-program-pack 2.2.1", + "solana-pubkey 2.4.0", "solana-rent", - "solana-sanitize", - "solana-sdk-ids", + "solana-sanitize 2.2.1", + "solana-sdk-ids 2.2.1", "solana-sdk-macro", "solana-secp256k1-recover", "solana-serde-varint", "solana-serialize-utils", - "solana-sha256-hasher", + "solana-sha256-hasher 2.2.1", "solana-short-vec", "solana-slot-hashes", "solana-slot-history", @@ -5513,8 +5578,8 @@ checksum = "32ce041b1a0ed275290a5008ee1a4a6c48f5054c8a3d78d313c08958a06aedbd" dependencies = [ "solana-account-info", "solana-msg", - "solana-program-error", - "solana-pubkey", + "solana-program-error 2.2.2", + "solana-pubkey 2.4.0", ] [[package]] @@ -5528,18 +5593,24 @@ dependencies = [ "serde", "serde_derive", "solana-decode-error", - "solana-instruction", + "solana-instruction 2.3.0", "solana-msg", - "solana-pubkey", + "solana-pubkey 2.4.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.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a5426090c6f3fd6cfdc10685322fede9ca8e5af43cd6a59e98bfe4e91671712" dependencies = [ - "solana-define-syscall", + "solana-define-syscall 2.3.0", ] [[package]] @@ -5548,13 +5619,28 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc677a2e9bc616eda6dbdab834d463372b92848b2bfe4a1ed4e4b4adba3397d0" +[[package]] +name = "solana-program-option" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e7b4ddb464f274deb4a497712664c3b612e3f5f82471d4e47710fc4ab1c3095" + [[package]] name = "solana-program-pack" version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "319f0ef15e6e12dc37c597faccb7d62525a509fec5f6975ecb9419efddeb277b" dependencies = [ - "solana-program-error", + "solana-program-error 2.2.2", +] + +[[package]] +name = "solana-program-pack" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c169359de21f6034a63ebf96d6b380980307df17a8d371344ff04a883ec4e9d0" +dependencies = [ + "solana-program-error 3.0.0", ] [[package]] @@ -5576,17 +5662,17 @@ dependencies = [ "solana-epoch-rewards", "solana-epoch-schedule", "solana-fee-structure", - "solana-hash", - "solana-instruction", + "solana-hash 2.3.0", + "solana-instruction 2.3.0", "solana-last-restart-slot", "solana-log-collector", "solana-measure", "solana-metrics", "solana-program-entrypoint", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rent", "solana-sbpf", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-slot-hashes", "solana-stable-layout", "solana-svm-callback", @@ -5628,8 +5714,8 @@ dependencies = [ "solana-epoch-schedule", "solana-fee-calculator", "solana-genesis-config", - "solana-hash", - "solana-instruction", + "solana-hash 2.3.0", + "solana-instruction 2.3.0", "solana-keypair", "solana-loader-v3-interface 5.0.0", "solana-log-collector", @@ -5639,13 +5725,13 @@ dependencies = [ "solana-native-token", "solana-poh-config", "solana-program-entrypoint", - "solana-program-error", + "solana-program-error 2.2.2", "solana-program-runtime", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rent", "solana-runtime", "solana-sbpf", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-signer", "solana-stable-layout", "solana-stake-interface", @@ -5682,14 +5768,23 @@ dependencies = [ "rand 0.8.5", "serde", "serde_derive", - "solana-atomic-u64", + "solana-atomic-u64 2.2.1", "solana-decode-error", - "solana-define-syscall", - "solana-sanitize", - "solana-sha256-hasher", + "solana-define-syscall 2.3.0", + "solana-sanitize 2.2.1", + "solana-sha256-hasher 2.2.1", "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", +] + [[package]] name = "solana-pubsub-client" version = "2.3.4" @@ -5706,7 +5801,7 @@ dependencies = [ "serde_json", "solana-account-decoder-client-types", "solana-clock", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rpc-client-types", "solana-signature", "thiserror 2.0.12", @@ -5736,7 +5831,7 @@ dependencies = [ "solana-measure", "solana-metrics", "solana-net-utils", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-quic-definitions", "solana-rpc-client-api", "solana-signer", @@ -5773,7 +5868,7 @@ checksum = "d1aea8fdea9de98ca6e8c2da5827707fb3842833521b528a713810ca685d2480" dependencies = [ "serde", "serde_derive", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-sdk-macro", "solana-sysvar-id", ] @@ -5790,9 +5885,9 @@ dependencies = [ "solana-clock", "solana-epoch-schedule", "solana-genesis-config", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rent", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", ] [[package]] @@ -5801,7 +5896,7 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f6f9113c6003492e74438d1288e30cffa8ccfdc2ef7b49b9e816d8034da18cd" dependencies = [ - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-reward-info", ] @@ -5841,10 +5936,10 @@ dependencies = [ "solana-epoch-info", "solana-epoch-schedule", "solana-feature-gate-interface", - "solana-hash", - "solana-instruction", + "solana-hash 2.3.0", + "solana-instruction 2.3.0", "solana-message", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rpc-client-api", "solana-signature", "solana-transaction", @@ -5885,12 +5980,12 @@ checksum = "582f8b6b0404d6dca8064ebfefd310c1d183d33a018a89844e82ef0c28824671" dependencies = [ "solana-account", "solana-commitment-config", - "solana-hash", + "solana-hash 2.3.0", "solana-message", "solana-nonce", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rpc-client", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "thiserror 2.0.12", ] @@ -5912,7 +6007,7 @@ dependencies = [ "solana-commitment-config", "solana-fee-calculator", "solana-inflation", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-transaction-error", "solana-transaction-status-client-types", "solana-version", @@ -5990,9 +6085,9 @@ dependencies = [ "solana-fee-structure", "solana-genesis-config", "solana-hard-forks", - "solana-hash", + "solana-hash 2.3.0", "solana-inflation", - "solana-instruction", + "solana-instruction 2.3.0", "solana-keypair", "solana-lattice-hash", "solana-loader-v3-interface 5.0.0", @@ -6009,18 +6104,18 @@ dependencies = [ "solana-poh-config", "solana-precompile-error", "solana-program-runtime", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rayon-threadlimit", "solana-rent", "solana-rent-collector", "solana-rent-debits", "solana-reward-info", "solana-runtime-transaction", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-secp256k1-program", "solana-seed-derivable", "solana-serde", - "solana-sha256-hasher", + "solana-sha256-hasher 2.2.1", "solana-signature", "solana-signer", "solana-slot-hashes", @@ -6067,10 +6162,10 @@ dependencies = [ "log", "solana-compute-budget", "solana-compute-budget-instruction", - "solana-hash", + "solana-hash 2.3.0", "solana-message", - "solana-pubkey", - "solana-sdk-ids", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", "solana-signature", "solana-svm-transaction", "solana-transaction", @@ -6084,6 +6179,12 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61f1bc1357b8188d9c4a3af3fc55276e56987265eb7ad073ae6f8180ee54cecf" +[[package]] +name = "solana-sanitize" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927e833259588ac8f860861db0f6e2668c3cc46d917798ade116858960acfe8a" + [[package]] name = "solana-sbpf" version = "0.11.1" @@ -6107,7 +6208,16 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c5d8b9cc68d5c88b062a33e23a6466722467dde0035152d8fb1afbcdf350a5f" dependencies = [ - "solana-pubkey", + "solana-pubkey 2.4.0", +] + +[[package]] +name = "solana-sdk-ids" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1b6d6aaf60669c592838d382266b173881c65fb1cdec83b37cb8ce7cb89f9ad" +dependencies = [ + "solana-pubkey 3.0.0", ] [[package]] @@ -6142,7 +6252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baa3120b6cdaa270f39444f5093a90a7b03d296d362878f7a6991d6de3bbe496" dependencies = [ "libsecp256k1", - "solana-define-syscall", + "solana-define-syscall 2.3.0", "thiserror 2.0.12", ] @@ -6155,9 +6265,9 @@ dependencies = [ "bytemuck", "openssl", "solana-feature-set", - "solana-instruction", + "solana-instruction 2.3.0", "solana-precompile-error", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", ] [[package]] @@ -6199,12 +6309,12 @@ dependencies = [ "solana-client", "solana-clock", "solana-connection-cache", - "solana-hash", + "solana-hash 2.3.0", "solana-keypair", "solana-measure", "solana-metrics", "solana-nonce-account", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-quic-definitions", "solana-runtime", "solana-signature", @@ -6238,9 +6348,9 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "817a284b63197d2b27afdba829c5ab34231da4a9b4e763466a003c40ca4f535e" dependencies = [ - "solana-instruction", - "solana-pubkey", - "solana-sanitize", + "solana-instruction 2.3.0", + "solana-pubkey 2.4.0", + "solana-sanitize 2.2.1", ] [[package]] @@ -6250,8 +6360,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0037386961c0d633421f53560ad7c80675c0447cba4d1bb66d60974dd486c7ea" dependencies = [ "sha2 0.10.8", - "solana-define-syscall", - "solana-hash", + "solana-define-syscall 2.3.0", + "solana-hash 2.3.0", +] + +[[package]] +name = "solana-sha256-hasher" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b912ba6f71cb202c0c3773ec77bf898fa9fe0c78691a2d6859b3b5b8954719" +dependencies = [ + "sha2 0.10.8", + "solana-define-syscall 3.0.0", + "solana-hash 3.0.0", ] [[package]] @@ -6270,8 +6391,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afd3db0461089d1ad1a78d9ba3f15b563899ca2386351d38428faa5350c60a98" dependencies = [ "solana-hard-forks", - "solana-hash", - "solana-sha256-hasher", + "solana-hash 2.3.0", + "solana-sha256-hasher 2.2.1", ] [[package]] @@ -6285,7 +6406,7 @@ dependencies = [ "serde", "serde-big-array", "serde_derive", - "solana-sanitize", + "solana-sanitize 2.2.1", ] [[package]] @@ -6294,7 +6415,7 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c41991508a4b02f021c1342ba00bcfa098630b213726ceadc7cb032e051975b" dependencies = [ - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-signature", "solana-transaction-error", ] @@ -6307,8 +6428,8 @@ checksum = "0c8691982114513763e88d04094c9caa0376b867a29577939011331134c301ce" dependencies = [ "serde", "serde_derive", - "solana-hash", - "solana-sdk-ids", + "solana-hash 2.3.0", + "solana-sdk-ids 2.2.1", "solana-sysvar-id", ] @@ -6321,7 +6442,7 @@ dependencies = [ "bv", "serde", "serde_derive", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-sysvar-id", ] @@ -6331,8 +6452,8 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f14f7d02af8f2bc1b5efeeae71bc1c2b7f0f65cd75bcc7d8180f2c762a57f54" dependencies = [ - "solana-instruction", - "solana-pubkey", + "solana-instruction 2.3.0", + "solana-pubkey 2.4.0", ] [[package]] @@ -6349,9 +6470,9 @@ dependencies = [ "solana-clock", "solana-cpi", "solana-decode-error", - "solana-instruction", - "solana-program-error", - "solana-pubkey", + "solana-instruction 2.3.0", + "solana-program-error 2.2.2", + "solana-pubkey 2.4.0", "solana-system-interface", "solana-sysvar-id", ] @@ -6370,14 +6491,14 @@ dependencies = [ "solana-clock", "solana-config-program-client", "solana-genesis-config", - "solana-instruction", + "solana-instruction 2.3.0", "solana-log-collector", "solana-native-token", "solana-packet", "solana-program-runtime", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rent", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-stake-interface", "solana-sysvar", "solana-transaction-context", @@ -6418,7 +6539,7 @@ dependencies = [ "solana-net-utils", "solana-packet", "solana-perf", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-quic-definitions", "solana-signature", "solana-signer", @@ -6447,8 +6568,8 @@ dependencies = [ "solana-account", "solana-clock", "solana-fee-structure", - "solana-hash", - "solana-instruction", + "solana-hash 2.3.0", + "solana-instruction 2.3.0", "solana-instructions-sysvar", "solana-loader-v3-interface 5.0.0", "solana-loader-v4-interface", @@ -6459,13 +6580,13 @@ dependencies = [ "solana-nonce", "solana-nonce-account", "solana-program-entrypoint", - "solana-program-pack", + "solana-program-pack 2.2.1", "solana-program-runtime", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rent", "solana-rent-collector", "solana-rent-debits", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-slot-hashes", "solana-svm-callback", "solana-svm-feature-set", @@ -6489,7 +6610,7 @@ checksum = "4aa58b3b9410f377b572cb2e7fd1910900295bce47b9dcdbcbc42569a2b192c9" dependencies = [ "solana-account", "solana-precompile-error", - "solana-pubkey", + "solana-pubkey 2.4.0", ] [[package]] @@ -6506,10 +6627,10 @@ checksum = "0012625e8569e94c044bed0c466ee6dab9af5a821d279933fbc343e38b842cc9" dependencies = [ "solana-account", "solana-clock", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rent", "solana-rent-collector", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-transaction-context", "solana-transaction-error", ] @@ -6520,10 +6641,10 @@ version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfc3d7bb7e0d630d28295b1a51b240a32922f598b6a72b3b821c7d6c9463702e" dependencies = [ - "solana-hash", + "solana-hash 2.3.0", "solana-message", - "solana-pubkey", - "solana-sdk-ids", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", "solana-signature", "solana-transaction", ] @@ -6539,8 +6660,8 @@ dependencies = [ "serde", "serde_derive", "solana-decode-error", - "solana-instruction", - "solana-pubkey", + "solana-instruction 2.3.0", + "solana-pubkey 2.4.0", "wasm-bindgen", ] @@ -6557,14 +6678,14 @@ dependencies = [ "solana-account", "solana-bincode", "solana-fee-calculator", - "solana-instruction", + "solana-instruction 2.3.0", "solana-log-collector", "solana-nonce", "solana-nonce-account", "solana-packet", "solana-program-runtime", - "solana-pubkey", - "solana-sdk-ids", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", "solana-system-interface", "solana-sysvar", "solana-transaction-context", @@ -6577,10 +6698,10 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bd98a25e5bcba8b6be8bcbb7b84b24c2a6a8178d7fb0e3077a916855ceba91a" dependencies = [ - "solana-hash", + "solana-hash 2.3.0", "solana-keypair", "solana-message", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-signer", "solana-system-interface", "solana-transaction", @@ -6601,21 +6722,21 @@ dependencies = [ "serde_derive", "solana-account-info", "solana-clock", - "solana-define-syscall", + "solana-define-syscall 2.3.0", "solana-epoch-rewards", "solana-epoch-schedule", "solana-fee-calculator", - "solana-hash", - "solana-instruction", + "solana-hash 2.3.0", + "solana-instruction 2.3.0", "solana-instructions-sysvar", "solana-last-restart-slot", "solana-program-entrypoint", - "solana-program-error", + "solana-program-error 2.2.2", "solana-program-memory", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rent", - "solana-sanitize", - "solana-sdk-ids", + "solana-sanitize 2.2.1", + "solana-sdk-ids 2.2.1", "solana-sdk-macro", "solana-slot-hashes", "solana-slot-history", @@ -6629,8 +6750,8 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5762b273d3325b047cfda250787f8d796d781746860d5d0a746ee29f3e8812c1" dependencies = [ - "solana-pubkey", - "solana-sdk-ids", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", ] [[package]] @@ -6648,11 +6769,11 @@ dependencies = [ "solana-commitment-config", "solana-connection-cache", "solana-epoch-info", - "solana-hash", - "solana-instruction", + "solana-hash 2.3.0", + "solana-instruction 2.3.0", "solana-keypair", "solana-message", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rpc-client", "solana-rpc-client-api", "solana-signature", @@ -6676,7 +6797,7 @@ checksum = "9e6b2450d6c51c25b57cc067e0ab93015feb27347c34a81ddd540f9979a2b125" dependencies = [ "eager", "enum-iterator", - "solana-pubkey", + "solana-pubkey 2.4.0", ] [[package]] @@ -6687,7 +6808,7 @@ checksum = "261b7aeeca06bbbe05f8c82913c2415389efc46435de9932a71839439a614c2f" dependencies = [ "rustls 0.23.28", "solana-keypair", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-signer", "x509-parser", ] @@ -6713,7 +6834,7 @@ dependencies = [ "solana-measure", "solana-message", "solana-net-utils", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-pubsub-client", "solana-quic-definitions", "solana-rpc-client", @@ -6763,13 +6884,13 @@ dependencies = [ "serde", "serde_derive", "solana-bincode", - "solana-hash", - "solana-instruction", + "solana-hash 2.3.0", + "solana-instruction 2.3.0", "solana-keypair", "solana-message", - "solana-pubkey", - "solana-sanitize", - "solana-sdk-ids", + "solana-pubkey 2.4.0", + "solana-sanitize 2.2.1", + "solana-sdk-ids 2.2.1", "solana-short-vec", "solana-signature", "solana-signer", @@ -6788,11 +6909,11 @@ dependencies = [ "serde", "serde_derive", "solana-account", - "solana-instruction", + "solana-instruction 2.3.0", "solana-instructions-sysvar", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rent", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", ] [[package]] @@ -6803,8 +6924,8 @@ checksum = "222a9dc8fdb61c6088baab34fc3a8b8473a03a7a5fd404ed8dd502fa79b67cb1" dependencies = [ "serde", "serde_derive", - "solana-instruction", - "solana-sanitize", + "solana-instruction 2.3.0", + "solana-sanitize 2.2.1", ] [[package]] @@ -6878,7 +6999,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96fb2a227e734de3200c12a5f57ad75dd9af1f798ec8ead564b6fe923ad9bcc1" dependencies = [ "assert_matches", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-runtime-transaction", "solana-transaction", "static_assertions", @@ -6896,7 +7017,7 @@ dependencies = [ "semver", "serde", "serde_derive", - "solana-sanitize", + "solana-sanitize 2.2.1", "solana-serde-varint", ] @@ -6913,12 +7034,12 @@ dependencies = [ "solana-account", "solana-bincode", "solana-clock", - "solana-hash", - "solana-instruction", + "solana-hash 2.3.0", + "solana-instruction 2.3.0", "solana-keypair", "solana-packet", - "solana-pubkey", - "solana-sdk-ids", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", "solana-serialize-utils", "solana-signature", "solana-signer", @@ -6941,11 +7062,11 @@ dependencies = [ "serde_derive", "solana-clock", "solana-decode-error", - "solana-hash", - "solana-instruction", - "solana-pubkey", + "solana-hash 2.3.0", + "solana-instruction 2.3.0", + "solana-pubkey 2.4.0", "solana-rent", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-serde-varint", "solana-serialize-utils", "solana-short-vec", @@ -6969,14 +7090,14 @@ dependencies = [ "solana-bincode", "solana-clock", "solana-epoch-schedule", - "solana-hash", - "solana-instruction", + "solana-hash 2.3.0", + "solana-instruction 2.3.0", "solana-keypair", "solana-packet", "solana-program-runtime", - "solana-pubkey", + "solana-pubkey 2.4.0", "solana-rent", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-signer", "solana-slot-hashes", "solana-transaction", @@ -6995,10 +7116,10 @@ dependencies = [ "bytemuck", "num-derive", "num-traits", - "solana-instruction", + "solana-instruction 2.3.0", "solana-log-collector", "solana-program-runtime", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-zk-sdk", ] @@ -7025,9 +7146,9 @@ dependencies = [ "serde_json", "sha3", "solana-derivation-path", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", + "solana-instruction 2.3.0", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", "solana-seed-derivable", "solana-seed-phrase", "solana-signature", @@ -7048,10 +7169,10 @@ dependencies = [ "bytemuck", "num-derive", "num-traits", - "solana-instruction", + "solana-instruction 2.3.0", "solana-log-collector", "solana-program-runtime", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-zk-token-sdk", ] @@ -7078,9 +7199,9 @@ dependencies = [ "sha3", "solana-curve25519", "solana-derivation-path", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", + "solana-instruction 2.3.0", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", "solana-seed-derivable", "solana-seed-phrase", "solana-signature", @@ -7106,8 +7227,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7398da23554a31660f17718164e31d31900956054f54f52d5ec1be51cb4f4b3" dependencies = [ "bytemuck", - "solana-program-error", - "solana-sha256-hasher", + "solana-program-error 2.2.2", + "solana-sha256-hasher 2.2.1", "spl-discriminator-derive", ] @@ -7144,13 +7265,13 @@ dependencies = [ "bytemuck", "solana-account-info", "solana-cpi", - "solana-instruction", + "solana-instruction 2.3.0", "solana-msg", "solana-program-entrypoint", - "solana-program-error", - "solana-pubkey", + "solana-program-error 2.2.2", + "solana-pubkey 2.4.0", "solana-rent", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-security-txt", "solana-system-interface", "solana-sysvar", @@ -7166,7 +7287,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "741a62a566d97c58d33f9ed32337ceedd4e35109a686e31b1866c5dfa56abddc" dependencies = [ "bytemuck", - "solana-pubkey", + "solana-pubkey 2.4.0", ] [[package]] @@ -7176,11 +7297,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f09647c0974e33366efeb83b8e2daebb329f0420149e74d3a4bd2c08cf9f7cb" dependencies = [ "solana-account-info", - "solana-instruction", + "solana-instruction 2.3.0", "solana-msg", "solana-program-entrypoint", - "solana-program-error", - "solana-pubkey", + "solana-program-error 2.2.2", + "solana-pubkey 2.4.0", ] [[package]] @@ -7196,9 +7317,9 @@ dependencies = [ "num-traits", "solana-decode-error", "solana-msg", - "solana-program-error", - "solana-program-option", - "solana-pubkey", + "solana-program-error 2.2.2", + "solana-program-option 2.2.1", + "solana-pubkey 2.4.0", "solana-zk-sdk", "thiserror 2.0.12", ] @@ -7213,7 +7334,7 @@ dependencies = [ "num-traits", "solana-decode-error", "solana-msg", - "solana-program-error", + "solana-program-error 2.2.2", "spl-program-error-derive", "thiserror 2.0.12", ] @@ -7241,10 +7362,10 @@ dependencies = [ "num-traits", "solana-account-info", "solana-decode-error", - "solana-instruction", + "solana-instruction 2.3.0", "solana-msg", - "solana-program-error", - "solana-pubkey", + "solana-program-error 2.2.2", + "solana-pubkey 2.4.0", "spl-discriminator", "spl-pod", "spl-program-error", @@ -7270,19 +7391,20 @@ dependencies = [ "solana-account-info", "solana-clock", "solana-cpi", - "solana-instruction", + "solana-instruction 2.3.0", "solana-msg", "solana-native-token", "solana-program-entrypoint", - "solana-program-error", + "solana-program-error 2.2.2", "solana-program-memory", - "solana-program-option", - "solana-program-pack", - "solana-pubkey", + "solana-program-option 2.2.1", + "solana-program-pack 2.2.1", + "solana-pubkey 2.4.0", "solana-rent", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-system-interface", "solana-sysvar", + "spl-token-interface 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "strum 0.24.1", "strum_macros 0.24.3", "thiserror 2.0.12", @@ -7302,16 +7424,16 @@ dependencies = [ "solana-account-info", "solana-cpi", "solana-decode-error", - "solana-instruction", + "solana-instruction 2.3.0", "solana-msg", "solana-program-entrypoint", - "solana-program-error", + "solana-program-error 2.2.2", "solana-program-memory", - "solana-program-option", - "solana-program-pack", - "solana-pubkey", + "solana-program-option 2.2.1", + "solana-program-pack 2.2.1", + "solana-pubkey 2.4.0", "solana-rent", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-sysvar", "thiserror 2.0.12", ] @@ -7331,17 +7453,17 @@ dependencies = [ "solana-clock", "solana-cpi", "solana-decode-error", - "solana-instruction", + "solana-instruction 2.3.0", "solana-msg", "solana-native-token", "solana-program-entrypoint", - "solana-program-error", + "solana-program-error 2.2.2", "solana-program-memory", - "solana-program-option", - "solana-program-pack", - "solana-pubkey", + "solana-program-option 2.2.1", + "solana-program-pack 2.2.1", + "solana-pubkey 2.4.0", "solana-rent", - "solana-sdk-ids", + "solana-sdk-ids 2.2.1", "solana-security-txt", "solana-system-interface", "solana-sysvar", @@ -7381,12 +7503,12 @@ dependencies = [ "bytemuck", "solana-account-info", "solana-curve25519", - "solana-instruction", + "solana-instruction 2.3.0", "solana-instructions-sysvar", "solana-msg", - "solana-program-error", - "solana-pubkey", - "solana-sdk-ids", + "solana-program-error 2.2.2", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", "solana-zk-sdk", "spl-pod", "thiserror 2.0.12", @@ -7413,15 +7535,56 @@ dependencies = [ "num-derive", "num-traits", "solana-decode-error", - "solana-instruction", + "solana-instruction 2.3.0", "solana-msg", - "solana-program-error", - "solana-pubkey", + "solana-program-error 2.2.2", + "solana-pubkey 2.4.0", "spl-discriminator", "spl-pod", "thiserror 2.0.12", ] +[[package]] +name = "spl-token-interface" +version = "1.0.0" +dependencies = [ + "arrayref", + "bytemuck", + "num-derive", + "num-traits", + "num_enum", + "proptest", + "solana-instruction 3.0.0", + "solana-program-error 3.0.0", + "solana-program-option 3.0.0", + "solana-program-pack 3.0.0", + "solana-pubkey 3.0.0", + "solana-sdk-ids 3.0.0", + "strum 0.24.1", + "strum_macros 0.24.3", + "thiserror 2.0.12", +] + +[[package]] +name = "spl-token-interface" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e0c2d4e38ef5834cf7fb1b592b8a8c6eab8485f5ac7a04a151b502c63a0aaa" +dependencies = [ + "arrayref", + "bytemuck", + "num-derive", + "num-traits", + "num_enum", + "solana-instruction 2.3.0", + "solana-program-error 2.2.2", + "solana-program-option 2.2.1", + "solana-program-pack 2.2.1", + "solana-pubkey 2.4.0", + "solana-sdk-ids 2.2.1", + "thiserror 2.0.12", +] + [[package]] name = "spl-token-metadata-interface" version = "0.7.0" @@ -7433,10 +7596,10 @@ dependencies = [ "num-traits", "solana-borsh", "solana-decode-error", - "solana-instruction", + "solana-instruction 2.3.0", "solana-msg", - "solana-program-error", - "solana-pubkey", + "solana-program-error 2.2.2", + "solana-pubkey 2.4.0", "spl-discriminator", "spl-pod", "spl-type-length-value", @@ -7456,10 +7619,10 @@ dependencies = [ "solana-account-info", "solana-cpi", "solana-decode-error", - "solana-instruction", + "solana-instruction 2.3.0", "solana-msg", - "solana-program-error", - "solana-pubkey", + "solana-program-error 2.2.2", + "solana-pubkey 2.4.0", "spl-discriminator", "spl-pod", "spl-program-error", @@ -7480,7 +7643,7 @@ dependencies = [ "solana-account-info", "solana-decode-error", "solana-msg", - "solana-program-error", + "solana-program-error 2.2.2", "spl-discriminator", "spl-pod", "thiserror 2.0.12", diff --git a/Cargo.toml b/Cargo.toml index 6f4fe5e2..692da5b4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] resolver = "2" -members = ["p-interface", "p-token", "program"] +members = ["interface", "p-interface", "p-token", "program"] [workspace.package] authors = ["Anza Maintainers "] diff --git a/interface/Cargo.toml b/interface/Cargo.toml index 9723f5ce..94326908 100644 --- a/interface/Cargo.toml +++ b/interface/Cargo.toml @@ -15,12 +15,12 @@ bytemuck = "1.20.0" num-derive = "0.4" num_enum = "0.7.4" num-traits = "0.2" -solana-instruction = "2.3.0" -solana-program-error = "2.2.2" -solana-program-option = "2.2.1" -solana-program-pack = "2.2.1" -solana-pubkey = { version = "2.4.0", features = ["bytemuck"] } -solana-sdk-ids = "2.2.1" +solana-instruction = "3.0.0" +solana-program-error = "3.0.0" +solana-program-option = "3.0.0" +solana-program-pack = "3.0.0" +solana-pubkey = { version = "3.0.0", features = ["bytemuck"] } +solana-sdk-ids = "3.0.0" thiserror = "2.0" [dev-dependencies] diff --git a/interface/src/error.rs b/interface/src/error.rs index 82a28724..d0b555d5 100644 --- a/interface/src/error.rs +++ b/interface/src/error.rs @@ -114,7 +114,7 @@ impl TryFrom for TokenError { } impl ToStr for TokenError { - fn to_str(&self) -> &'static str { + fn to_str(&self) -> &'static str { match self { TokenError::NotRentExempt => "Error: Lamport balance below rent-exempt threshold", TokenError::InsufficientFunds => "Error: insufficient funds", diff --git a/program/Cargo.toml b/program/Cargo.toml index 39095f79..7dc4c5e9 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -30,7 +30,7 @@ solana-pubkey = { workspace = true, features = ["bytemuck"] } solana-rent = "2.2.1" solana-sdk-ids = "2.2.1" solana-sysvar = { version = "2.2.2", features = ["bincode"] } -spl-token-interface = { version = "1.0", path = "../interface" } +spl-token-interface = { version = "1.0" } thiserror = "2.0" [dev-dependencies]