diff --git a/Cargo.toml b/Cargo.toml index 3a52e98b3..75e359a21 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -87,7 +87,7 @@ solana-program-test = "2.3.1" solana-pubsub-client = "2.3.1" solana-rpc-client-api = "2.3.1" solana-sdk = "2.3.1" -solana-system-interface = "1.0.0" +solana-system-interface = "3.2.0" solana-transaction-status = "2.3.1" bitflags = "2" tabled = "0" diff --git a/sdk/serviceability/testdata/fixtures/generate-fixtures/Cargo.lock b/sdk/serviceability/testdata/fixtures/generate-fixtures/Cargo.lock index 1ed0b3edb..17930ac7a 100644 --- a/sdk/serviceability/testdata/fixtures/generate-fixtures/Cargo.lock +++ b/sdk/serviceability/testdata/fixtures/generate-fixtures/Cargo.lock @@ -346,19 +346,19 @@ dependencies = [ [[package]] name = "doublezero-program-common" -version = "0.26.0" +version = "0.27.1" dependencies = [ "borsh 1.6.0", "byteorder", "ipnetwork", "serde", "solana-program", - "solana-system-interface", + "solana-system-interface 3.2.0", ] [[package]] name = "doublezero-serviceability" -version = "0.26.0" +version = "0.27.1" dependencies = [ "bitflags", "borsh 1.6.0", @@ -367,7 +367,7 @@ dependencies = [ "doublezero-program-common", "ipnetwork", "solana-program", - "solana-system-interface", + "solana-system-interface 3.2.0", "thiserror", ] @@ -404,6 +404,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.4" @@ -413,6 +422,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" @@ -954,11 +972,22 @@ checksum = "c8f5152a288ef1912300fc6efa6c2d1f9bb55d9398eb6c72326360b8063987da" dependencies = [ "bincode", "serde", - "solana-program-error", + "solana-program-error 2.2.2", "solana-program-memory", "solana-pubkey", ] +[[package]] +name = "solana-address" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39c93e262f671bf402e1040e4a7e40b05d81da5956c7681948c975a0997517bb" +dependencies = [ + "five8 1.0.0", + "five8_const 1.0.0", + "solana-program-error 3.0.1", +] + [[package]] name = "solana-address-lookup-table-interface" version = "2.2.2" @@ -993,7 +1022,7 @@ checksum = "75db7f2bbac3e62cfd139065d15bcda9e2428883ba61fc8d27ccb251081e7567" dependencies = [ "num-bigint", "num-traits", - "solana-define-syscall", + "solana-define-syscall 2.3.0", ] [[package]] @@ -1014,7 +1043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1a0801e25a1b31a14494fc80882a036be0ffd290efc4c2d640bfcca120a4672" dependencies = [ "blake3", - "solana-define-syscall", + "solana-define-syscall 2.3.0", "solana-hash", "solana-sanitize", ] @@ -1049,9 +1078,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8dc71126edddc2ba014622fc32d0f5e2e78ec6c5a1e0eb511b85618c09e9ea11" dependencies = [ "solana-account-info", - "solana-define-syscall", + "solana-define-syscall 2.3.0", "solana-instruction", - "solana-program-error", + "solana-program-error 2.2.2", "solana-pubkey", "solana-stable-layout", ] @@ -1071,6 +1100,12 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ae3e2abcf541c8122eafe9a625d4d194b4023c20adde1e251f94e056bb1aee2" +[[package]] +name = "solana-define-syscall" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e14a4f604117f379840956a8fc8695e4c84f5b0ebed192f31f60d9b85d581d" + [[package]] name = "solana-epoch-rewards" version = "2.2.1" @@ -1115,7 +1150,7 @@ dependencies = [ "solana-nonce", "solana-pubkey", "solana-sdk-ids", - "solana-system-interface", + "solana-system-interface 1.0.0", "thiserror", ] @@ -1131,11 +1166,11 @@ dependencies = [ "solana-account", "solana-account-info", "solana-instruction", - "solana-program-error", + "solana-program-error 2.2.2", "solana-pubkey", "solana-rent", "solana-sdk-ids", - "solana-system-interface", + "solana-system-interface 1.0.0", ] [[package]] @@ -1158,7 +1193,7 @@ dependencies = [ "borsh 1.6.0", "bytemuck", "bytemuck_derive", - "five8", + "five8 0.2.1", "js-sys", "serde", "serde_derive", @@ -1181,7 +1216,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "solana-define-syscall", + "solana-define-syscall 2.3.0", "solana-pubkey", "wasm-bindgen", ] @@ -1195,7 +1230,7 @@ dependencies = [ "bitflags", "solana-account-info", "solana-instruction", - "solana-program-error", + "solana-program-error 2.2.2", "solana-pubkey", "solana-sanitize", "solana-sdk-ids", @@ -1210,7 +1245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7aeb957fbd42a451b99235df4942d96db7ef678e8d5061ef34c9b34cae12f79" dependencies = [ "sha3", - "solana-define-syscall", + "solana-define-syscall 2.3.0", "solana-hash", "solana-sanitize", ] @@ -1254,7 +1289,7 @@ dependencies = [ "solana-instruction", "solana-pubkey", "solana-sdk-ids", - "solana-system-interface", + "solana-system-interface 1.0.0", ] [[package]] @@ -1269,7 +1304,7 @@ dependencies = [ "solana-instruction", "solana-pubkey", "solana-sdk-ids", - "solana-system-interface", + "solana-system-interface 1.0.0", ] [[package]] @@ -1290,7 +1325,7 @@ dependencies = [ "solana-sanitize", "solana-sdk-ids", "solana-short-vec", - "solana-system-interface", + "solana-system-interface 1.0.0", "solana-transaction-error", "wasm-bindgen", ] @@ -1301,7 +1336,16 @@ 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]] +name = "solana-msg" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726b7cbbc6be6f1c6f29146ac824343b9415133eee8cce156452ad1db93f8008" +dependencies = [ + "solana-define-syscall 5.1.0", ] [[package]] @@ -1359,7 +1403,7 @@ 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", @@ -1374,11 +1418,11 @@ dependencies = [ "solana-loader-v3-interface", "solana-loader-v4-interface", "solana-message", - "solana-msg", + "solana-msg 2.2.1", "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", @@ -1396,7 +1440,7 @@ dependencies = [ "solana-slot-history", "solana-stable-layout", "solana-stake-interface", - "solana-system-interface", + "solana-system-interface 1.0.0", "solana-sysvar", "solana-sysvar-id", "solana-vote-interface", @@ -1411,8 +1455,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32ce041b1a0ed275290a5008ee1a4a6c48f5054c8a3d78d313c08958a06aedbd" dependencies = [ "solana-account-info", - "solana-msg", - "solana-program-error", + "solana-msg 2.2.1", + "solana-program-error 2.2.2", "solana-pubkey", ] @@ -1428,17 +1472,23 @@ dependencies = [ "serde_derive", "solana-decode-error", "solana-instruction", - "solana-msg", + "solana-msg 2.2.1", "solana-pubkey", ] +[[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.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]] @@ -1453,7 +1503,7 @@ 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]] @@ -1467,8 +1517,8 @@ dependencies = [ "bytemuck", "bytemuck_derive", "curve25519-dalek", - "five8", - "five8_const", + "five8 0.2.1", + "five8_const 0.1.4", "getrandom 0.2.17", "js-sys", "num-traits", @@ -1476,7 +1526,7 @@ dependencies = [ "serde_derive", "solana-atomic-u64", "solana-decode-error", - "solana-define-syscall", + "solana-define-syscall 2.3.0", "solana-sanitize", "solana-sha256-hasher", "wasm-bindgen", @@ -1529,7 +1579,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", ] @@ -1560,7 +1610,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa3feb32c28765f6aa1ce8f3feac30936f16c5c3f7eb73d63a5b8f6f8ecdc44" dependencies = [ "sha2 0.10.9", - "solana-define-syscall", + "solana-define-syscall 2.3.0", "solana-hash", ] @@ -1624,9 +1674,9 @@ dependencies = [ "solana-cpi", "solana-decode-error", "solana-instruction", - "solana-program-error", + "solana-program-error 2.2.2", "solana-pubkey", - "solana-system-interface", + "solana-system-interface 1.0.0", "solana-sysvar-id", ] @@ -1646,6 +1696,18 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "solana-system-interface" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55b54965bf0b76fa8e2b35376583efddd4d916618cfe595bf48c7d7b55a9e628" +dependencies = [ + "num-traits", + "solana-address", + "solana-msg 3.1.0", + "solana-program-error 3.0.1", +] + [[package]] name = "solana-sysvar" version = "2.3.0" @@ -1661,7 +1723,7 @@ 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", @@ -1670,7 +1732,7 @@ dependencies = [ "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-rent", @@ -1724,7 +1786,7 @@ dependencies = [ "solana-serde-varint", "solana-serialize-utils", "solana-short-vec", - "solana-system-interface", + "solana-system-interface 1.0.0", ] [[package]]