diff --git a/Cargo.lock b/Cargo.lock index db68a98a..5f110b71 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -47,7 +47,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", ] @@ -76,7 +76,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", @@ -806,6 +806,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.2" @@ -1146,7 +1155,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", @@ -1166,7 +1175,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea155b60511338a5a39c077a457baa8268c229629f091e3281f499b0ab3a96b4" dependencies = [ - "solana-pubkey", + "solana-pubkey 3.0.0", "thiserror 1.0.69", ] @@ -1179,7 +1188,7 @@ dependencies = [ "mollusk-svm-error", "solana-account", "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-transaction-context", ] @@ -1192,7 +1201,7 @@ dependencies = [ "mollusk-svm", "solana-account", "solana-program-pack", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-rent", "spl-associated-token-account-interface 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "spl-token-interface", @@ -1207,7 +1216,7 @@ dependencies = [ "solana-account", "solana-instruction", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-rent", ] @@ -1812,7 +1821,7 @@ dependencies = [ "solana-account-info", "solana-clock", "solana-instruction-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-sysvar", ] @@ -1825,7 +1834,7 @@ checksum = "82f4691b69b172c687d218dd2f1f23fc7ea5e9aa79df9ac26dab3d8dd829ce48" dependencies = [ "solana-program-error", "solana-program-memory", - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] @@ -1839,7 +1848,7 @@ dependencies = [ "bytemuck_derive", "curve25519-dalek", "five8 0.2.1", - "five8_const", + "five8_const 0.1.4", "serde", "serde_derive", "solana-atomic-u64", @@ -1849,6 +1858,24 @@ dependencies = [ "solana-sha256-hasher", ] +[[package]] +name = "solana-address" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e37320fd2945c5d654b2c6210624a52d66c3f1f73b653ed211ab91a703b35bdd" +dependencies = [ + "borsh", + "curve25519-dalek", + "five8 1.0.0", + "five8_const 1.0.0", + "serde", + "solana-atomic-u64", + "solana-define-syscall 4.0.1", + "solana-program-error", + "solana-sanitize", + "solana-sha256-hasher", +] + [[package]] name = "solana-atomic-u64" version = "3.0.0" @@ -1933,7 +1960,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", @@ -1977,7 +2004,7 @@ dependencies = [ "solana-define-syscall 3.0.0", "solana-instruction", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-stable-layout", ] @@ -2021,6 +2048,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" @@ -2112,7 +2145,7 @@ dependencies = [ "serde_derive", "solana-define-syscall 3.0.0", "solana-instruction-error", - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] @@ -2138,7 +2171,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", @@ -2165,7 +2198,7 @@ dependencies = [ "ed25519-dalek", "five8 0.2.1", "rand 0.8.5", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-seed-phrase", "solana-signature", "solana-signer", @@ -2194,7 +2227,7 @@ dependencies = [ "serde_bytes", "serde_derive", "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", ] @@ -2208,7 +2241,7 @@ dependencies = [ "serde_bytes", "serde_derive", "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-system-interface", ] @@ -2235,7 +2268,7 @@ dependencies = [ "lazy_static", "solana-hash 3.1.0", "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sanitize", "solana-sdk-ids", "solana-transaction-error", @@ -2260,7 +2293,7 @@ dependencies = [ "serde_derive", "solana-fee-calculator", "solana-hash 3.1.0", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sha256-hasher", ] @@ -2316,7 +2349,7 @@ dependencies = [ "solana-define-syscall 3.0.0", "solana-msg", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] @@ -2374,7 +2407,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", @@ -2399,7 +2432,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]] @@ -2444,7 +2486,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]] @@ -2497,7 +2539,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7665da4f6e07b58c93ef6aaf9fb6a923fd11b0922ffc53ba74c3cadfa490f26" dependencies = [ "solana-instruction-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sanitize", ] @@ -2529,7 +2571,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bfea97951fee8bae0d6038f39a5efcb6230ecdfe33425ac75196d1a1e3e3235" dependencies = [ - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-signature", "solana-transaction-error", ] @@ -2567,7 +2609,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1da74507795b6e8fb60b7c7306c0c36e2c315805d16eaaf479452661234685ac" dependencies = [ "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] @@ -2583,7 +2625,7 @@ dependencies = [ "solana-cpi", "solana-instruction", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-system-interface", "solana-sysvar", "solana-sysvar-id", @@ -2598,7 +2640,7 @@ dependencies = [ "solana-account", "solana-clock", "solana-precompile-error", - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] @@ -2630,7 +2672,7 @@ checksum = "62606f820fe99b72ee8e26b8e20eed3c2ccc2f6e3146f537c4cb22a442c69170" dependencies = [ "eager", "enum-iterator", - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] @@ -2641,7 +2683,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", @@ -2668,7 +2710,7 @@ dependencies = [ "solana-instruction", "solana-msg", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] @@ -2689,7 +2731,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", @@ -2721,7 +2763,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", @@ -2736,7 +2778,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", ] @@ -2749,7 +2791,7 @@ dependencies = [ "solana-hash 3.1.0", "solana-instruction", "solana-message", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sanitize", "solana-sdk-ids", "solana-signature", @@ -2769,7 +2811,7 @@ dependencies = [ "solana-account", "solana-instruction", "solana-instructions-sysvar", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-rent", "solana-sbpf", "solana-sdk-ids", @@ -2810,7 +2852,7 @@ dependencies = [ "sha3", "solana-derivation-path", "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-seed-derivable", "solana-seed-phrase", @@ -2847,7 +2889,7 @@ dependencies = [ "solana-msg", "solana-program-entrypoint", "solana-program-error", - "solana-pubkey", + "solana-pubkey 4.0.0", "solana-rent", "solana-sdk-ids", "solana-signer", @@ -2866,7 +2908,7 @@ version = "2.0.0" dependencies = [ "borsh", "solana-instruction", - "solana-pubkey", + "solana-pubkey 4.0.0", "solana-sdk-ids", ] @@ -2878,7 +2920,7 @@ checksum = "e6433917b60441d68d99a17e121d9db0ea15a9a69c0e5afa34649cf5ba12612f" dependencies = [ "borsh", "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] @@ -2893,7 +2935,7 @@ dependencies = [ "solana-program-error", "solana-program-option", "solana-program-pack", - "solana-pubkey", + "solana-pubkey 4.0.0", "solana-rent", "solana-signer", "solana-system-interface", @@ -2953,7 +2995,7 @@ dependencies = [ "num_enum", "solana-program-error", "solana-program-option", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-zk-sdk", "thiserror 2.0.17", ] @@ -2974,7 +3016,7 @@ dependencies = [ "solana-program-error", "solana-program-option", "solana-program-pack", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-zk-sdk", "spl-pod", @@ -2999,7 +3041,7 @@ dependencies = [ "solana-instructions-sysvar", "solana-msg", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-zk-sdk", "spl-pod", @@ -3029,7 +3071,7 @@ dependencies = [ "num_enum", "solana-instruction", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "spl-discriminator", "spl-pod", "thiserror 2.0.17", @@ -3050,7 +3092,7 @@ dependencies = [ "solana-program-error", "solana-program-option", "solana-program-pack", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "thiserror 2.0.17", ] @@ -3067,7 +3109,7 @@ dependencies = [ "solana-borsh", "solana-instruction", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "spl-discriminator", "spl-pod", "spl-type-length-value", diff --git a/interface/Cargo.toml b/interface/Cargo.toml index f5ca2e84..d035b8d9 100644 --- a/interface/Cargo.toml +++ b/interface/Cargo.toml @@ -13,7 +13,7 @@ borsh = ["dep:borsh"] [dependencies] borsh = { version = "1", optional = true, features = ["unstable__schema"] } solana-instruction = { version = "3.0.0", features = ["std"] } -solana-pubkey = { version = "3.0.0", features = ["curve25519"] } +solana-pubkey = { version = "4.0.0", features = ["curve25519"] } [dev-dependencies] solana-sdk-ids = "3.0.0" diff --git a/mollusk_harness/Cargo.toml b/mollusk_harness/Cargo.toml index 492212a3..6011d2b2 100644 --- a/mollusk_harness/Cargo.toml +++ b/mollusk_harness/Cargo.toml @@ -19,7 +19,7 @@ solana-keypair = "3.0" solana-program-error = "3.0" solana-program-option = "3.0" solana-program-pack = "3.0" -solana-pubkey = "3.0" +solana-pubkey = "4.0" solana-rent = "3.0" solana-signer = "3.0" solana-system-interface = { version = "2.0", features = ["bincode"] } diff --git a/program/Cargo.toml b/program/Cargo.toml index 35adf320..c7e6e77e 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -21,7 +21,7 @@ solana-instruction = "3.0" solana-msg = "3.0" solana-program-entrypoint = "3.0" solana-program-error = "3.0" -solana-pubkey = "3.0" +solana-pubkey = "4.0" solana-rent = "3.0" solana-sdk-ids = "3.0" solana-system-interface = { version = "2.0", features = ["bincode"] }