diff --git a/Cargo.lock b/Cargo.lock index 16ac59a..e425219 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2112,6 +2112,15 @@ dependencies = [ "five8_core", ] +[[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" @@ -2121,6 +2130,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" @@ -5682,7 +5700,7 @@ dependencies = [ "solana-sha256-hasher", "solana-slot-hashes", "solana-svm-transaction", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-sysvar", "solana-time-utils", "solana-transaction", @@ -5705,8 +5723,8 @@ dependencies = [ "bytemuck", "bytemuck_derive", "curve25519-dalek 4.1.3", - "five8", - "five8_const", + "five8 0.2.1", + "five8_const 0.1.3", "rand 0.8.5", "serde", "serde_derive", @@ -5717,6 +5735,19 @@ 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 = [ + "five8 1.0.0", + "five8_const 1.0.0", + "serde", + "serde_derive", + "solana-program-error", +] + [[package]] name = "solana-address-lookup-table-interface" version = "3.0.0" @@ -5920,7 +5951,7 @@ dependencies = [ "solana-svm-log-collector", "solana-svm-measure", "solana-svm-type-overrides", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-transaction-context", ] @@ -6090,7 +6121,7 @@ dependencies = [ "solana-sdk-ids", "solana-signature", "solana-stake-interface", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-transaction", "solana-transaction-error", "solana-transaction-status", @@ -6161,7 +6192,7 @@ dependencies = [ "solana-pubkey", "solana-signature", "solana-signer", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-transaction", "solana-transaction-error", ] @@ -6265,7 +6296,7 @@ dependencies = [ "solana-pubkey", "solana-sdk-ids", "solana-short-vec", - "solana-system-interface", + "solana-system-interface 2.0.0", ] [[package]] @@ -6400,7 +6431,7 @@ dependencies = [ "solana-svm", "solana-svm-timings", "solana-svm-transaction", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-system-transaction", "solana-sysvar", "solana-time-utils", @@ -6453,7 +6484,7 @@ dependencies = [ "solana-runtime-transaction", "solana-sdk-ids", "solana-svm-transaction", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-transaction-error", "solana-vote-program", ] @@ -6616,7 +6647,7 @@ dependencies = [ "solana-nonce", "solana-pubkey", "solana-sdk-ids", - "solana-system-interface", + "solana-system-interface 2.0.0", "thiserror 2.0.17", ] @@ -6644,7 +6675,7 @@ dependencies = [ "solana-packet", "solana-pubkey", "solana-signer", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-system-transaction", "solana-transaction", "solana-version", @@ -6669,7 +6700,7 @@ dependencies = [ "solana-pubkey", "solana-rent", "solana-sdk-ids", - "solana-system-interface", + "solana-system-interface 2.0.0", ] [[package]] @@ -6853,7 +6884,7 @@ dependencies = [ "borsh", "bytemuck", "bytemuck_derive", - "five8", + "five8 0.2.1", "serde", "serde_derive", "solana-atomic-u64", @@ -6934,7 +6965,7 @@ checksum = "80eaf45d386c94e59c0c2d3db4a76c05f90365394aa848edce5826d3f7e77fb3" dependencies = [ "ed25519-dalek 2.2.0", "ed25519-dalek-bip32", - "five8", + "five8 0.2.1", "rand 0.8.5", "solana-derivation-path", "solana-pubkey", @@ -7049,7 +7080,7 @@ dependencies = [ "solana-svm", "solana-svm-timings", "solana-svm-transaction", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-system-transaction", "solana-time-utils", "solana-transaction", @@ -7095,7 +7126,7 @@ dependencies = [ "solana-instruction", "solana-pubkey", "solana-sdk-ids", - "solana-system-interface", + "solana-system-interface 2.0.0", ] [[package]] @@ -7110,7 +7141,7 @@ dependencies = [ "solana-instruction", "solana-pubkey", "solana-sdk-ids", - "solana-system-interface", + "solana-system-interface 2.0.0", ] [[package]] @@ -7531,7 +7562,7 @@ dependencies = [ "solana-svm-timings", "solana-svm-transaction", "solana-svm-type-overrides", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-sysvar", "solana-sysvar-id", "solana-transaction-context", @@ -7589,7 +7620,7 @@ dependencies = [ "solana-svm", "solana-svm-log-collector", "solana-svm-timings", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-sysvar", "solana-sysvar-id", "solana-transaction", @@ -7608,7 +7639,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8909d399deb0851aa524420beeb5646b115fd253ef446e35fe4504c904da3941" dependencies = [ "rand 0.8.5", - "solana-address", + "solana-address 1.0.0", ] [[package]] @@ -7799,7 +7830,7 @@ dependencies = [ "solana-storage-bigtable", "solana-streamer", "solana-svm", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-system-transaction", "solana-sysvar", "solana-time-utils", @@ -8036,7 +8067,7 @@ dependencies = [ "solana-svm-callback", "solana-svm-timings", "solana-svm-transaction", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-system-transaction", "solana-sysvar", "solana-sysvar-id", @@ -8322,7 +8353,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bb8057cc0e9f7b5e89883d49de6f407df655bb6f3a71d0b7baf9986a2218fd9" dependencies = [ "ed25519-dalek 2.2.0", - "five8", + "five8 0.2.1", "rand 0.8.5", "serde", "serde-big-array", @@ -8391,7 +8422,7 @@ dependencies = [ "solana-instruction", "solana-program-error", "solana-pubkey", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-sysvar", "solana-sysvar-id", ] @@ -8577,7 +8608,7 @@ dependencies = [ "solana-svm-timings", "solana-svm-transaction", "solana-svm-type-overrides", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-sysvar-id", "solana-transaction-context", "solana-transaction-error", @@ -8667,6 +8698,21 @@ dependencies = [ "solana-pubkey", ] +[[package]] +name = "solana-system-interface" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14591d6508042ebefb110305d3ba761615927146a26917ade45dc332d8e1ecde" +dependencies = [ + "num-traits", + "serde", + "serde_derive", + "solana-address 2.0.0", + "solana-instruction", + "solana-msg", + "solana-program-error", +] + [[package]] name = "solana-system-program" version = "3.0.10" @@ -8689,7 +8735,7 @@ dependencies = [ "solana-sdk-ids", "solana-svm-log-collector", "solana-svm-type-overrides", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-sysvar", "solana-transaction-context", ] @@ -8705,7 +8751,7 @@ dependencies = [ "solana-message", "solana-pubkey", "solana-signer", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-transaction", ] @@ -8981,7 +9027,7 @@ dependencies = [ "solana-sdk-ids", "solana-signature", "solana-stake-interface", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-transaction", "solana-transaction-error", "solana-transaction-status-client-types", @@ -9212,7 +9258,7 @@ dependencies = [ "solana-serde-varint", "solana-serialize-utils", "solana-short-vec", - "solana-system-interface", + "solana-system-interface 2.0.0", ] [[package]] @@ -9471,7 +9517,7 @@ dependencies = [ "solana-rent", "solana-sdk-ids", "solana-security-txt", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-sysvar", "solana-zk-sdk", "spl-elgamal-registry-interface", @@ -9628,7 +9674,7 @@ dependencies = [ "solana-rent", "solana-sdk-ids", "solana-security-txt", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-sysvar", "solana-zk-sdk", "spl-elgamal-registry-interface", @@ -9697,7 +9743,7 @@ dependencies = [ "solana-rpc-client-api", "solana-signature", "solana-signer", - "solana-system-interface", + "solana-system-interface 2.0.0", "solana-transaction", "spl-associated-token-account-interface", "spl-elgamal-registry", @@ -9838,7 +9884,7 @@ dependencies = [ "solana-sdk-ids", "solana-signature", "solana-signer", - "solana-system-interface", + "solana-system-interface 3.0.0", "solana-test-validator", "solana-transaction", "spl-tlv-account-resolution", @@ -9864,7 +9910,7 @@ dependencies = [ "solana-program-test", "solana-pubkey", "solana-sdk", - "solana-system-interface", + "solana-system-interface 3.0.0", "spl-tlv-account-resolution", "spl-token-2022-interface", "spl-transfer-hook-interface 2.1.0", @@ -9888,7 +9934,7 @@ dependencies = [ "solana-program-error", "solana-pubkey", "solana-sdk-ids", - "solana-system-interface", + "solana-system-interface 2.0.0", "spl-discriminator", "spl-pod", "spl-program-error", @@ -9913,7 +9959,7 @@ dependencies = [ "solana-pubkey", "solana-sdk-ids", "solana-sha256-hasher", - "solana-system-interface", + "solana-system-interface 3.0.0", "spl-discriminator", "spl-pod", "spl-program-error", diff --git a/clients/cli/Cargo.toml b/clients/cli/Cargo.toml index 6627490..176e250 100644 --- a/clients/cli/Cargo.toml +++ b/clients/cli/Cargo.toml @@ -23,7 +23,7 @@ solana-remote-wallet = "3.0.0" solana-sdk-ids = "3.0.0" solana-signature = "3.0.0" solana-signer = "3.0.0" -solana-system-interface = "2" +solana-system-interface = "3" solana-transaction = "3.0.0" spl-tlv-account-resolution = { version = "0.11.0", features = ["serde-traits"] } spl-transfer-hook-interface = { version = "2.0.0", path = "../../interface" } diff --git a/interface/Cargo.toml b/interface/Cargo.toml index 60f4b53..b7c4f83 100644 --- a/interface/Cargo.toml +++ b/interface/Cargo.toml @@ -21,7 +21,7 @@ solana-msg = "3.0.0" solana-program-error = "3.0.0" solana-pubkey = { version = "3.0.0", features = ["curve25519"] } solana-sdk-ids = "3.0.0" -solana-system-interface = "2.0.0" +solana-system-interface = "3.0.0" spl-discriminator = "0.5.1" spl-program-error = "0.8.0" spl-tlv-account-resolution = "0.11.0" diff --git a/program/Cargo.toml b/program/Cargo.toml index 08ce426..bed99a1 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -22,7 +22,7 @@ solana-msg = "3.0.0" solana-program-entrypoint = "3.0.0" solana-program-error = "3.0.0" solana-pubkey = "3.0.0" -solana-system-interface = { version = "2", features = ["bincode"] } +solana-system-interface = { version = "3", features = ["bincode"] } spl-tlv-account-resolution = "0.11.0" spl-token-2022-interface = "2.0.0" spl-transfer-hook-interface = { version = "2.0.0", path = "../interface" }