diff --git a/Cargo.lock b/Cargo.lock index 324d5c6..004044e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,7 +11,7 @@ dependencies = [ "ahash", "solana-epoch-schedule", "solana-hash 3.1.0", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sha256-hasher", "solana-svm-feature-set", ] @@ -40,7 +40,7 @@ dependencies = [ "solana-poseidon", "solana-program-entrypoint", "solana-program-runtime", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sbpf", "solana-sdk-ids", "solana-secp256k1-recover", @@ -713,6 +713,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" @@ -978,7 +987,7 @@ dependencies = [ "solana-precompile-error", "solana-program-error", "solana-program-runtime", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-rent", "solana-sdk-ids", "solana-slot-hashes", @@ -998,7 +1007,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "682ad3a990ae8f336ee10f402da2e900a37cff38730e29aa8cda2d82e1b2e9f1" dependencies = [ - "solana-pubkey", + "solana-pubkey 3.0.0", "thiserror 1.0.69", ] @@ -1011,7 +1020,7 @@ dependencies = [ "mollusk-svm-error", "solana-account", "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-transaction-context", ] @@ -1024,7 +1033,7 @@ dependencies = [ "solana-account", "solana-instruction", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-rent", ] @@ -1526,7 +1535,7 @@ dependencies = [ "solana-account-info", "solana-clock", "solana-instruction-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-sysvar", ] @@ -1539,7 +1548,7 @@ checksum = "82f4691b69b172c687d218dd2f1f23fc7ea5e9aa79df9ac26dab3d8dd829ce48" dependencies = [ "solana-program-error", "solana-program-memory", - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] @@ -1552,16 +1561,31 @@ dependencies = [ "bytemuck_derive", "curve25519-dalek", "five8 0.2.1", - "five8_const", + "five8_const 0.1.3", "serde", "serde_derive", "solana-atomic-u64", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "solana-program-error", "solana-sanitize", "solana-sha256-hasher", ] +[[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", + "solana-sanitize", +] + [[package]] name = "solana-atomic-u64" version = "3.0.0" @@ -1579,7 +1603,7 @@ checksum = "30c80fb6d791b3925d5ec4bf23a7c169ef5090c013059ec3ed7d0b2c04efa085" dependencies = [ "num-bigint 0.4.6", "num-traits", - "solana-define-syscall", + "solana-define-syscall 3.0.0", ] [[package]] @@ -1600,7 +1624,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffa2e3bdac3339c6d0423275e45dafc5ac25f4d43bf344d026a3cc9a85e244a6" dependencies = [ "blake3", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "solana-hash 3.1.0", ] @@ -1615,7 +1639,7 @@ dependencies = [ "ark-ff", "ark-serialize", "bytemuck", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "thiserror 2.0.17", ] @@ -1637,7 +1661,7 @@ dependencies = [ "solana-packet", "solana-program-entrypoint", "solana-program-runtime", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sbpf", "solana-sdk-ids", "solana-svm-feature-set", @@ -1678,10 +1702,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16238feb63d1cbdf915fb287f29ef7a7ebf81469bd6214f8b72a53866b593f8f" dependencies = [ "solana-account-info", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "solana-instruction", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-stable-layout", ] @@ -1694,7 +1718,7 @@ dependencies = [ "bytemuck", "bytemuck_derive", "curve25519-dalek", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "subtle", "thiserror 2.0.17", ] @@ -1705,6 +1729,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-epoch-rewards" version = "3.0.0" @@ -1776,16 +1806,17 @@ 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", "serde", "serde_derive", - "solana-define-syscall", + "solana-define-syscall 4.0.1", "solana-instruction-error", - "solana-pubkey", + "solana-pubkey 4.0.0", ] [[package]] @@ -1811,7 +1842,7 @@ dependencies = [ "solana-instruction", "solana-instruction-error", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sanitize", "solana-sdk-ids", "solana-serialize-utils", @@ -1825,7 +1856,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57eebd3012946913c8c1b8b43cdf8a6249edb09c0b6be3604ae910332a3acd97" dependencies = [ "sha3", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "solana-hash 3.1.0", ] @@ -1852,7 +1883,7 @@ dependencies = [ "serde_bytes", "serde_derive", "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", ] @@ -1866,7 +1897,7 @@ dependencies = [ "serde_bytes", "serde_derive", "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-system-interface", ] @@ -1891,7 +1922,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85666605c9fd727f865ed381665db0a8fc29f984a030ecc1e40f43bfb2541623" dependencies = [ "lazy_static", - "solana-address", + "solana-address 1.0.0", "solana-hash 3.1.0", "solana-instruction", "solana-sanitize", @@ -1905,7 +1936,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "264275c556ea7e22b9d3f87d56305546a38d4eee8ec884f3b126236cb7dcbbb4" dependencies = [ - "solana-define-syscall", + "solana-define-syscall 3.0.0", ] [[package]] @@ -1918,7 +1949,7 @@ dependencies = [ "serde_derive", "solana-fee-calculator", "solana-hash 3.1.0", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sha256-hasher", ] @@ -1951,7 +1982,7 @@ checksum = "794ff76c70d6f4c5d9c86c626069225c0066043405c0c9d6b96f00c8525dade5" dependencies = [ "ark-bn254", "light-poseidon", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "thiserror 2.0.17", ] @@ -1971,10 +2002,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6557cf5b5e91745d1667447438a1baa7823c6086e4ece67f8e6ebfa7a8f72660" dependencies = [ "solana-account-info", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "solana-msg", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] @@ -1989,7 +2020,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10e5660c60749c7bfb30b447542529758e4dbcecd31b1e8af1fdc92e2bdde90a" dependencies = [ - "solana-define-syscall", + "solana-define-syscall 3.0.0", ] [[package]] @@ -2023,7 +2054,7 @@ dependencies = [ "solana-instruction", "solana-last-restart-slot", "solana-program-entrypoint", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-rent", "solana-sbpf", "solana-sdk-ids", @@ -2048,7 +2079,16 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8909d399deb0851aa524420beeb5646b115fd253ef446e35fe4504c904da3941" dependencies = [ - "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]] @@ -2093,7 +2133,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1b6d6aaf60669c592838d382266b173881c65fb1cdec83b37cb8ce7cb89f9ad" dependencies = [ - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] @@ -2115,7 +2155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "394a4470477d66296af5217970a905b1c5569032a7732c367fb69e5666c8607e" dependencies = [ "k256", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "thiserror 2.0.17", ] @@ -2132,7 +2172,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56e41dd8feea239516c623a02f0a81c2367f4b604d7965237fed0751aeec33ed" dependencies = [ "solana-instruction-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sanitize", ] @@ -2143,7 +2183,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9b912ba6f71cb202c0c3773ec77bf898fa9fe0c78691a2d6859b3b5b8954719" dependencies = [ "sha2 0.10.8", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "solana-hash 3.1.0", ] @@ -2190,7 +2230,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1da74507795b6e8fb60b7c7306c0c36e2c315805d16eaaf479452661234685ac" dependencies = [ "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] @@ -2206,7 +2246,7 @@ dependencies = [ "solana-cpi", "solana-instruction", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-system-interface", "solana-sysvar", "solana-sysvar-id", @@ -2221,7 +2261,7 @@ dependencies = [ "solana-account", "solana-clock", "solana-precompile-error", - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] @@ -2253,7 +2293,7 @@ checksum = "62606f820fe99b72ee8e26b8e20eed3c2ccc2f6e3146f537c4cb22a442c69170" dependencies = [ "eager", "enum-iterator", - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] @@ -2264,7 +2304,7 @@ checksum = "336583f8418964f7050b98996e13151857995604fe057c0d8f2f3512a16d3a8b" dependencies = [ "solana-hash 3.1.0", "solana-message", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-signature", "solana-transaction", @@ -2291,7 +2331,7 @@ dependencies = [ "solana-instruction", "solana-msg", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] @@ -2312,7 +2352,7 @@ dependencies = [ "solana-nonce-account", "solana-packet", "solana-program-runtime", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-svm-log-collector", "solana-svm-type-overrides", @@ -2334,7 +2374,7 @@ dependencies = [ "serde_derive", "solana-account-info", "solana-clock", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "solana-epoch-rewards", "solana-epoch-schedule", "solana-fee-calculator", @@ -2344,7 +2384,7 @@ dependencies = [ "solana-program-entrypoint", "solana-program-error", "solana-program-memory", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-rent", "solana-sdk-ids", "solana-sdk-macro", @@ -2359,7 +2399,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5051bc1a16d5d96a96bc33b5b2ec707495c48fe978097bdaba68d3c47987eb32" dependencies = [ - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", ] @@ -2369,7 +2409,7 @@ version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64928e6af3058dcddd6da6680cbe08324b4e071ad73115738235bbaa9e9f72a5" dependencies = [ - "solana-address", + "solana-address 1.0.0", "solana-hash 3.1.0", "solana-instruction", "solana-instruction-error", @@ -2393,7 +2433,7 @@ dependencies = [ "solana-account", "solana-instruction", "solana-instructions-sysvar", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-rent", "solana-sbpf", "solana-sdk-ids", @@ -2434,7 +2474,7 @@ dependencies = [ "solana-program-entrypoint", "solana-program-error", "solana-program-pack", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-rent", "solana-security-txt", "solana-system-interface", diff --git a/program/Cargo.toml b/program/Cargo.toml index 5dc50d4..0882019 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -15,7 +15,7 @@ bytemuck = { version = "1.23.1", features = ["derive"] } num-derive = "0.4" num-traits = "0.2" solana-account-info = "3.0.0" -solana-instruction = { version = "3.0.0", features = ["std"] } +solana-instruction = { version = "3.1.0", features = ["std"] } solana-msg = "3.0.0" solana-program-entrypoint = "3.0.0" solana-program-error = "3.0.0"