diff --git a/Cargo.lock b/Cargo.lock index 2ef67f0f8f43b..4b6ddf671c93f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -769,10 +769,17 @@ dependencies = [ "frame-support", "parachains-common", "rococo-emulated-chain", +<<<<<<< HEAD "sp-core 35.0.0", "sp-keyring", "staging-xcm", "testnet-parachains-constants", +======= + "sp-core 28.0.0", + "sp-keyring 31.0.0", + "staging-xcm 7.0.1", + "testnet-parachains-constants 1.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -796,11 +803,19 @@ dependencies = [ "polkadot-runtime-common", "rococo-runtime-constants", "rococo-system-emulated-network", +<<<<<<< HEAD "sp-core 35.0.0", "sp-runtime 40.1.0", "staging-xcm", "staging-xcm-executor", "xcm-runtime-apis", +======= + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", + "staging-xcm-executor 7.0.0", + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -813,6 +828,7 @@ dependencies = [ "bp-asset-hub-westend", "bp-bridge-hub-rococo", "bp-bridge-hub-westend", +<<<<<<< HEAD "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", "cumulus-pallet-session-benchmarking", @@ -830,6 +846,25 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", +======= + "cumulus-pallet-aura-ext 0.7.0", + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-session-benchmarking 9.0.0", + "cumulus-pallet-weight-reclaim", + "cumulus-pallet-xcm 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", + "cumulus-primitives-aura 0.7.0", + "cumulus-primitives-core 0.7.0", + "cumulus-primitives-utility 0.7.0", + "frame-benchmarking 28.0.0", + "frame-executive 28.0.0", + "frame-metadata-hash-extension 0.1.0", + "frame-support 28.0.0", + "frame-system 28.0.0", + "frame-system-benchmarking 28.0.0", + "frame-system-rpc-runtime-api 26.0.0", + "frame-try-runtime 0.34.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "hex-literal", "log", "pallet-asset-conversion", @@ -864,6 +899,7 @@ dependencies = [ "rococo-runtime-constants", "scale-info", "serde_json", +<<<<<<< HEAD "snowbridge-router-primitives", "sp-api 35.0.0", "sp-block-builder", @@ -886,6 +922,30 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "xcm-runtime-apis", +======= + "snowbridge-router-primitives 0.9.0", + "sp-api 26.0.0", + "sp-block-builder 26.0.0", + "sp-consensus-aura 0.32.0", + "sp-core 28.0.0", + "sp-genesis-builder 0.8.0", + "sp-inherents 26.0.0", + "sp-keyring 31.0.0", + "sp-offchain 26.0.0", + "sp-runtime 31.0.1", + "sp-session 27.0.0", + "sp-storage 19.0.0", + "sp-transaction-pool 26.0.0", + "sp-version 29.0.0", + "sp-weights 27.0.0", + "staging-parachain-info 0.7.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", + "testnet-parachains-constants 1.0.0", + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -896,12 +956,21 @@ dependencies = [ "bp-bridge-hub-westend", "cumulus-primitives-core", "emulated-integration-tests-common", +<<<<<<< HEAD "frame-support", "parachains-common", "sp-core 35.0.0", "sp-keyring", "staging-xcm", "testnet-parachains-constants", +======= + "frame-support 28.0.0", + "parachains-common 7.0.0", + "sp-core 28.0.0", + "sp-keyring 31.0.0", + "staging-xcm 7.0.1", + "testnet-parachains-constants 1.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "westend-emulated-chain", ] @@ -910,10 +979,17 @@ name = "asset-hub-westend-integration-tests" version = "1.0.0" dependencies = [ "assert_matches", +<<<<<<< HEAD "asset-test-utils", "assets-common", "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", +======= + "asset-test-utils 7.0.0", + "assets-common 0.7.0", + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "emulated-integration-tests-common", "frame-metadata-hash-extension", "frame-support", @@ -928,6 +1004,7 @@ dependencies = [ "pallet-xcm", "parachains-common", "parity-scale-codec", +<<<<<<< HEAD "polkadot-runtime-common", "sp-core 35.0.0", "sp-runtime 40.1.0", @@ -936,6 +1013,16 @@ dependencies = [ "staging-xcm-executor", "westend-system-emulated-network", "xcm-runtime-apis", +======= + "polkadot-runtime-common 7.0.0", + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "westend-system-emulated-network", + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -948,6 +1035,7 @@ dependencies = [ "bp-asset-hub-westend", "bp-bridge-hub-rococo", "bp-bridge-hub-westend", +<<<<<<< HEAD "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", "cumulus-pallet-session-benchmarking", @@ -965,6 +1053,25 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", +======= + "cumulus-pallet-aura-ext 0.7.0", + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-session-benchmarking 9.0.0", + "cumulus-pallet-weight-reclaim", + "cumulus-pallet-xcm 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", + "cumulus-primitives-aura 0.7.0", + "cumulus-primitives-core 0.7.0", + "cumulus-primitives-utility 0.7.0", + "frame-benchmarking 28.0.0", + "frame-executive 28.0.0", + "frame-metadata-hash-extension 0.1.0", + "frame-support 28.0.0", + "frame-system 28.0.0", + "frame-system-benchmarking 28.0.0", + "frame-system-rpc-runtime-api 26.0.0", + "frame-try-runtime 0.34.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "hex-literal", "log", "pallet-asset-conversion", @@ -1012,6 +1119,7 @@ dependencies = [ "sp-runtime 40.1.0", "sp-session", "sp-std 14.0.0", +<<<<<<< HEAD "sp-storage 22.0.0", "sp-transaction-pool", "sp-version 38.0.0", @@ -1023,17 +1131,38 @@ dependencies = [ "testnet-parachains-constants", "westend-runtime-constants", "xcm-runtime-apis", +======= + "sp-storage 19.0.0", + "sp-transaction-pool 26.0.0", + "sp-version 29.0.0", + "staging-parachain-info 0.7.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", + "testnet-parachains-constants 1.0.0", + "westend-runtime-constants 7.0.0", + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] name = "asset-test-utils" version = "21.0.0" dependencies = [ +<<<<<<< HEAD "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", "frame-support", "frame-system", +======= + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", + "cumulus-primitives-core 0.7.0", + "frame-support 28.0.0", + "frame-system 28.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "hex-literal", "pallet-assets", "pallet-balances", @@ -1045,6 +1174,7 @@ dependencies = [ "parachains-common", "parachains-runtimes-test-utils", "parity-scale-codec", +<<<<<<< HEAD "sp-io 39.0.0", "sp-runtime 40.1.0", "staging-parachain-info", @@ -1052,14 +1182,83 @@ dependencies = [ "staging-xcm-builder", "staging-xcm-executor", "substrate-wasm-builder", +======= + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "staging-parachain-info 0.7.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", + "xcm-runtime-apis 0.1.1", +] + +[[package]] +name = "asset-test-utils" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0324df9ce91a9840632e865dd3272bd20162023856f1b189b7ae58afa5c6b61" +dependencies = [ + "cumulus-pallet-parachain-system 0.17.1", + "cumulus-pallet-xcmp-queue 0.17.0", + "cumulus-primitives-core 0.16.0", + "frame-support 38.0.0", + "frame-system 38.0.0", + "pallet-assets 40.0.0", + "pallet-balances 39.0.0", + "pallet-collator-selection 19.0.0", + "pallet-session 38.0.0", + "pallet-timestamp 37.0.0", + "pallet-xcm 17.0.0", + "pallet-xcm-bridge-hub-router 0.15.1", + "parachains-common 18.0.0", + "parachains-runtimes-test-utils 17.0.0", + "parity-scale-codec", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "staging-parachain-info 0.17.0", + "staging-xcm 14.2.0", + "staging-xcm-builder 17.0.1", + "staging-xcm-executor 17.0.0", + "substrate-wasm-builder 24.0.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] name = "assets-common" version = "0.19.0" dependencies = [ +<<<<<<< HEAD "cumulus-primitives-core", "frame-support", +======= + "cumulus-primitives-core 0.7.0", + "frame-support 28.0.0", + "impl-trait-for-tuples", + "pallet-asset-conversion 10.0.0", + "pallet-assets 29.1.0", + "pallet-xcm 7.0.0", + "parachains-common 7.0.0", + "parity-scale-codec", + "scale-info", + "sp-api 26.0.0", + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", + "tracing", +] + +[[package]] +name = "assets-common" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4556e56f9206b129c3f96249cd907b76e8d7ad5265fe368c228c708789a451a3" +dependencies = [ + "cumulus-primitives-core 0.16.0", + "frame-support 38.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "impl-trait-for-tuples", "log", "pallet-asset-conversion", @@ -1806,8 +2005,13 @@ dependencies = [ "frame-support", "parity-scale-codec", "scale-info", +<<<<<<< HEAD "sp-core 35.0.0", "staging-xcm", +======= + "sp-core 28.0.0", + "staging-xcm 7.0.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -1818,8 +2022,13 @@ dependencies = [ "frame-support", "parity-scale-codec", "scale-info", +<<<<<<< HEAD "sp-core 35.0.0", "staging-xcm", +======= + "sp-core 28.0.0", + "staging-xcm 7.0.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -2117,7 +2326,29 @@ dependencies = [ "sp-core 35.0.0", "sp-io 39.0.0", "sp-std 14.0.0", +<<<<<<< HEAD "staging-xcm", +======= + "staging-xcm 7.0.1", +] + +[[package]] +name = "bp-xcm-bridge-hub" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6909117ca87cb93703742939d5f0c4c93e9646d9cda22262e9709d68c929999b" +dependencies = [ + "bp-messages 0.18.0", + "bp-runtime 0.18.0", + "frame-support 38.0.0", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "staging-xcm 14.2.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -2126,9 +2357,28 @@ version = "0.15.0" dependencies = [ "parity-scale-codec", "scale-info", +<<<<<<< HEAD "sp-core 35.0.0", "sp-runtime 40.1.0", "staging-xcm", +======= + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", +] + +[[package]] +name = "bp-xcm-bridge-hub-router" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9284820ca704f5c065563cad77d2e3d069a23cc9cb3a29db9c0de8dd3b173a87" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-runtime 39.0.2", + "staging-xcm 14.2.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -2144,7 +2394,31 @@ dependencies = [ "sp-core 35.0.0", "sp-runtime 40.1.0", "sp-std 14.0.0", +<<<<<<< HEAD "staging-xcm", +======= + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", +] + +[[package]] +name = "bridge-hub-common" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b53c53d627e2da38f8910807944bf3121e154b5c0ac9e122995af9dfb13ed" +dependencies = [ + "cumulus-primitives-core 0.16.0", + "frame-support 38.0.0", + "pallet-message-queue 41.0.1", + "parity-scale-codec", + "scale-info", + "snowbridge-core 0.10.0", + "sp-core 34.0.0", + "sp-runtime 39.0.2", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "staging-xcm 14.2.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -2155,19 +2429,32 @@ dependencies = [ "bridge-hub-common", "bridge-hub-rococo-runtime", "emulated-integration-tests-common", +<<<<<<< HEAD "frame-support", "parachains-common", "sp-core 35.0.0", "sp-keyring", "staging-xcm", "testnet-parachains-constants", +======= + "frame-support 28.0.0", + "parachains-common 7.0.0", + "sp-core 28.0.0", + "sp-keyring 31.0.0", + "staging-xcm 7.0.1", + "testnet-parachains-constants 1.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] name = "bridge-hub-rococo-integration-tests" version = "1.0.0" dependencies = [ +<<<<<<< HEAD "cumulus-pallet-xcmp-queue", +======= + "cumulus-pallet-xcmp-queue 0.7.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "emulated-integration-tests-common", "frame-support", "hex-literal", @@ -2182,6 +2469,7 @@ dependencies = [ "rococo-system-emulated-network", "rococo-westend-system-emulated-network", "scale-info", +<<<<<<< HEAD "snowbridge-core", "snowbridge-pallet-inbound-queue-fixtures", "snowbridge-pallet-outbound-queue", @@ -2193,6 +2481,19 @@ dependencies = [ "staging-xcm-executor", "testnet-parachains-constants", "xcm-runtime-apis", +======= + "snowbridge-core 0.2.0", + "snowbridge-pallet-inbound-queue-fixtures 0.10.0", + "snowbridge-pallet-outbound-queue 0.2.0", + "snowbridge-pallet-system 0.2.0", + "snowbridge-router-primitives 0.9.0", + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", + "staging-xcm-executor 7.0.0", + "testnet-parachains-constants 1.0.0", + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -2212,6 +2513,7 @@ dependencies = [ "bp-rococo", "bp-runtime", "bp-westend", +<<<<<<< HEAD "bp-xcm-bridge-hub-router", "bridge-hub-common", "bridge-hub-test-utils", @@ -2233,6 +2535,29 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", +======= + "bp-xcm-bridge-hub-router 0.6.0", + "bridge-hub-common 0.1.0", + "bridge-hub-test-utils 0.7.0", + "bridge-runtime-common 0.7.0", + "cumulus-pallet-aura-ext 0.7.0", + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-session-benchmarking 9.0.0", + "cumulus-pallet-weight-reclaim", + "cumulus-pallet-xcm 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", + "cumulus-primitives-aura 0.7.0", + "cumulus-primitives-core 0.7.0", + "cumulus-primitives-utility 0.7.0", + "frame-benchmarking 28.0.0", + "frame-executive 28.0.0", + "frame-metadata-hash-extension 0.1.0", + "frame-support 28.0.0", + "frame-system 28.0.0", + "frame-system-benchmarking 28.0.0", + "frame-system-rpc-runtime-api 26.0.0", + "frame-try-runtime 0.34.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "hex-literal", "log", "pallet-aura", @@ -2284,6 +2609,7 @@ dependencies = [ "sp-runtime 40.1.0", "sp-session", "sp-std 14.0.0", +<<<<<<< HEAD "sp-storage 22.0.0", "sp-transaction-pool", "sp-version 38.0.0", @@ -2294,12 +2620,25 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "xcm-runtime-apis", +======= + "sp-storage 19.0.0", + "sp-transaction-pool 26.0.0", + "sp-version 29.0.0", + "staging-parachain-info 0.7.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", + "testnet-parachains-constants 1.0.0", + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] name = "bridge-hub-test-utils" version = "0.21.1" dependencies = [ +<<<<<<< HEAD "asset-test-utils", "bp-header-chain", "bp-messages", @@ -2312,6 +2651,20 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "frame-support", "frame-system", +======= + "asset-test-utils 7.0.0", + "bp-header-chain 0.7.0", + "bp-messages 0.7.0", + "bp-parachains 0.7.0", + "bp-polkadot-core 0.7.0", + "bp-relayers 0.7.0", + "bp-runtime 0.7.0", + "bp-test-utils 0.7.0", + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", + "frame-support 28.0.0", + "frame-system 28.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "impl-trait-for-tuples", "log", "pallet-balances", @@ -2331,6 +2684,53 @@ dependencies = [ "sp-keyring", "sp-runtime 40.1.0", "sp-std 14.0.0", +<<<<<<< HEAD +======= + "sp-tracing 16.0.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", +] + +[[package]] +name = "bridge-hub-test-utils" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0b3aa5fd8481a06ca16e47fd3d2d9c6abe76b27d922ec8980a853f242173b3" +dependencies = [ + "asset-test-utils 18.0.0", + "bp-header-chain 0.18.1", + "bp-messages 0.18.0", + "bp-parachains 0.18.0", + "bp-polkadot-core 0.18.0", + "bp-relayers 0.18.0", + "bp-runtime 0.18.0", + "bp-test-utils 0.18.0", + "bp-xcm-bridge-hub 0.4.0", + "bridge-runtime-common 0.18.0", + "cumulus-pallet-parachain-system 0.17.1", + "cumulus-pallet-xcmp-queue 0.17.0", + "frame-support 38.0.0", + "frame-system 38.0.0", + "impl-trait-for-tuples", + "log", + "pallet-balances 39.0.0", + "pallet-bridge-grandpa 0.18.0", + "pallet-bridge-messages 0.18.0", + "pallet-bridge-parachains 0.18.0", + "pallet-bridge-relayers 0.18.0", + "pallet-timestamp 37.0.0", + "pallet-utility 38.0.0", + "pallet-xcm 17.0.0", + "pallet-xcm-bridge-hub 0.13.0", + "parachains-common 18.0.0", + "parachains-runtimes-test-utils 17.0.0", + "parity-scale-codec", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-keyring 39.0.0", + "sp-runtime 39.0.2", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "sp-tracing 17.0.1", "staging-xcm", "staging-xcm-builder", @@ -2345,12 +2745,21 @@ dependencies = [ "bridge-hub-common", "bridge-hub-westend-runtime", "emulated-integration-tests-common", +<<<<<<< HEAD "frame-support", "parachains-common", "sp-core 35.0.0", "sp-keyring", "staging-xcm", "testnet-parachains-constants", +======= + "frame-support 28.0.0", + "parachains-common 7.0.0", + "sp-core 28.0.0", + "sp-keyring 31.0.0", + "staging-xcm 7.0.1", + "testnet-parachains-constants 1.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -2359,7 +2768,12 @@ version = "1.0.0" dependencies = [ "asset-hub-westend-runtime", "bridge-hub-westend-runtime", +<<<<<<< HEAD "cumulus-pallet-xcmp-queue", +======= + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "emulated-integration-tests-common", "frame-support", "hex-literal", @@ -2374,6 +2788,7 @@ dependencies = [ "parity-scale-codec", "rococo-westend-system-emulated-network", "scale-info", +<<<<<<< HEAD "snowbridge-core", "snowbridge-pallet-inbound-queue", "snowbridge-pallet-inbound-queue-fixtures", @@ -2386,6 +2801,20 @@ dependencies = [ "staging-xcm-executor", "testnet-parachains-constants", "xcm-runtime-apis", +======= + "snowbridge-core 0.2.0", + "snowbridge-pallet-inbound-queue 0.2.0", + "snowbridge-pallet-inbound-queue-fixtures 0.10.0", + "snowbridge-pallet-outbound-queue 0.2.0", + "snowbridge-pallet-system 0.2.0", + "snowbridge-router-primitives 0.9.0", + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", + "staging-xcm-executor 7.0.0", + "testnet-parachains-constants 1.0.0", + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -2404,6 +2833,7 @@ dependencies = [ "bp-rococo", "bp-runtime", "bp-westend", +<<<<<<< HEAD "bp-xcm-bridge-hub-router", "bridge-hub-common", "bridge-hub-test-utils", @@ -2425,6 +2855,29 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", +======= + "bp-xcm-bridge-hub-router 0.6.0", + "bridge-hub-common 0.1.0", + "bridge-hub-test-utils 0.7.0", + "bridge-runtime-common 0.7.0", + "cumulus-pallet-aura-ext 0.7.0", + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-session-benchmarking 9.0.0", + "cumulus-pallet-weight-reclaim", + "cumulus-pallet-xcm 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", + "cumulus-primitives-aura 0.7.0", + "cumulus-primitives-core 0.7.0", + "cumulus-primitives-utility 0.7.0", + "frame-benchmarking 28.0.0", + "frame-executive 28.0.0", + "frame-metadata-hash-extension 0.1.0", + "frame-support 28.0.0", + "frame-system 28.0.0", + "frame-system-benchmarking 28.0.0", + "frame-system-rpc-runtime-api 26.0.0", + "frame-try-runtime 0.34.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "hex-literal", "log", "pallet-aura", @@ -2475,6 +2928,7 @@ dependencies = [ "sp-runtime 40.1.0", "sp-session", "sp-std 14.0.0", +<<<<<<< HEAD "sp-storage 22.0.0", "sp-transaction-pool", "sp-version 38.0.0", @@ -2486,6 +2940,20 @@ dependencies = [ "testnet-parachains-constants", "westend-runtime-constants", "xcm-runtime-apis", +======= + "sp-storage 19.0.0", + "sp-transaction-pool 26.0.0", + "sp-version 29.0.0", + "staging-parachain-info 0.7.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", + "testnet-parachains-constants 1.0.0", + "tracing", + "westend-runtime-constants 7.0.0", + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -2515,9 +2983,15 @@ dependencies = [ "sp-io 39.0.0", "sp-runtime 40.1.0", "sp-std 14.0.0", +<<<<<<< HEAD "sp-trie 38.0.0", "sp-weights 31.0.0", "staging-xcm", +======= + "sp-trie 29.0.0", + "sp-weights 27.0.0", + "staging-xcm 7.0.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "static_assertions", "tuplex", ] @@ -3083,8 +3557,13 @@ name = "collectives-westend-integration-tests" version = "1.0.0" dependencies = [ "assert_matches", +<<<<<<< HEAD "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", +======= + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "emulated-integration-tests-common", "frame-support", "pallet-asset-rate", @@ -3097,12 +3576,21 @@ dependencies = [ "pallet-xcm", "parachains-common", "parity-scale-codec", +<<<<<<< HEAD "polkadot-runtime-common", "sp-runtime 40.1.0", "staging-xcm", "staging-xcm-executor", "testnet-parachains-constants", "westend-runtime-constants", +======= + "polkadot-runtime-common 7.0.0", + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", + "staging-xcm-executor 7.0.0", + "testnet-parachains-constants 1.0.0", + "westend-runtime-constants 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "westend-system-emulated-network", ] @@ -3110,6 +3598,7 @@ dependencies = [ name = "collectives-westend-runtime" version = "17.0.0" dependencies = [ +<<<<<<< HEAD "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", "cumulus-pallet-session-benchmarking", @@ -3126,6 +3615,24 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", +======= + "cumulus-pallet-aura-ext 0.7.0", + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-session-benchmarking 9.0.0", + "cumulus-pallet-weight-reclaim", + "cumulus-pallet-xcm 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", + "cumulus-primitives-aura 0.7.0", + "cumulus-primitives-core 0.7.0", + "cumulus-primitives-utility 0.7.0", + "frame-benchmarking 28.0.0", + "frame-executive 28.0.0", + "frame-support 28.0.0", + "frame-system 28.0.0", + "frame-system-benchmarking 28.0.0", + "frame-system-rpc-runtime-api 26.0.0", + "frame-try-runtime 0.34.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "hex-literal", "log", "pallet-alliance", @@ -3172,6 +3679,7 @@ dependencies = [ "sp-runtime 40.1.0", "sp-session", "sp-std 14.0.0", +<<<<<<< HEAD "sp-storage 22.0.0", "sp-transaction-pool", "sp-version 38.0.0", @@ -3183,6 +3691,19 @@ dependencies = [ "testnet-parachains-constants", "westend-runtime-constants", "xcm-runtime-apis", +======= + "sp-storage 19.0.0", + "sp-transaction-pool 26.0.0", + "sp-version 29.0.0", + "staging-parachain-info 0.7.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", + "testnet-parachains-constants 1.0.0", + "westend-runtime-constants 7.0.0", + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -3400,6 +3921,7 @@ checksum = "f272d0c4cf831b4fa80ee529c7707f76585986e910e1fbce1d7921970bc1a241" name = "contracts-rococo-runtime" version = "0.20.0" dependencies = [ +<<<<<<< HEAD "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", "cumulus-pallet-session-benchmarking", @@ -3416,6 +3938,24 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", +======= + "cumulus-pallet-aura-ext 0.7.0", + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-session-benchmarking 9.0.0", + "cumulus-pallet-weight-reclaim", + "cumulus-pallet-xcm 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", + "cumulus-primitives-aura 0.7.0", + "cumulus-primitives-core 0.7.0", + "cumulus-primitives-utility 0.7.0", + "frame-benchmarking 28.0.0", + "frame-executive 28.0.0", + "frame-support 28.0.0", + "frame-system 28.0.0", + "frame-system-benchmarking 28.0.0", + "frame-system-rpc-runtime-api 26.0.0", + "frame-try-runtime 0.34.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "hex-literal", "log", "pallet-aura", @@ -3439,6 +3979,7 @@ dependencies = [ "polkadot-runtime-common", "rococo-runtime-constants", "scale-info", +<<<<<<< HEAD "sp-api 35.0.0", "sp-block-builder", "sp-consensus-aura", @@ -3458,6 +3999,27 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "xcm-runtime-apis", +======= + "sp-api 26.0.0", + "sp-block-builder 26.0.0", + "sp-consensus-aura 0.32.0", + "sp-core 28.0.0", + "sp-genesis-builder 0.8.0", + "sp-inherents 26.0.0", + "sp-offchain 26.0.0", + "sp-runtime 31.0.1", + "sp-session 27.0.0", + "sp-storage 19.0.0", + "sp-transaction-pool 26.0.0", + "sp-version 29.0.0", + "staging-parachain-info 0.7.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", + "testnet-parachains-constants 1.0.0", + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -3534,15 +4096,22 @@ dependencies = [ "polkadot-runtime-parachains", "rococo-runtime-constants", "rococo-system-emulated-network", +<<<<<<< HEAD "sp-runtime 40.1.0", "staging-xcm", "staging-xcm-executor", +======= + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", + "staging-xcm-executor 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] name = "coretime-rococo-runtime" version = "0.13.0" dependencies = [ +<<<<<<< HEAD "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", "cumulus-pallet-session-benchmarking", @@ -3560,6 +4129,25 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", +======= + "cumulus-pallet-aura-ext 0.7.0", + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-session-benchmarking 9.0.0", + "cumulus-pallet-weight-reclaim", + "cumulus-pallet-xcm 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", + "cumulus-primitives-aura 0.7.0", + "cumulus-primitives-core 0.7.0", + "cumulus-primitives-utility 0.7.0", + "frame-benchmarking 28.0.0", + "frame-executive 28.0.0", + "frame-metadata-hash-extension 0.1.0", + "frame-support 28.0.0", + "frame-system 28.0.0", + "frame-system-benchmarking 28.0.0", + "frame-system-rpc-runtime-api 26.0.0", + "frame-try-runtime 0.34.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "hex-literal", "log", "pallet-aura", @@ -3585,6 +4173,7 @@ dependencies = [ "rococo-runtime-constants", "scale-info", "serde", +<<<<<<< HEAD "sp-api 35.0.0", "sp-block-builder", "sp-consensus-aura", @@ -3604,6 +4193,29 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "xcm-runtime-apis", +======= + "serde_json", + "sp-api 26.0.0", + "sp-block-builder 26.0.0", + "sp-consensus-aura 0.32.0", + "sp-core 28.0.0", + "sp-genesis-builder 0.8.0", + "sp-inherents 26.0.0", + "sp-keyring 31.0.0", + "sp-offchain 26.0.0", + "sp-runtime 31.0.1", + "sp-session 27.0.0", + "sp-storage 19.0.0", + "sp-transaction-pool 26.0.0", + "sp-version 29.0.0", + "staging-parachain-info 0.7.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", + "testnet-parachains-constants 1.0.0", + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -3625,6 +4237,7 @@ version = "0.1.0" dependencies = [ "cumulus-pallet-parachain-system", "emulated-integration-tests-common", +<<<<<<< HEAD "frame-support", "pallet-balances", "pallet-broker", @@ -3636,6 +4249,19 @@ dependencies = [ "staging-xcm", "staging-xcm-executor", "westend-runtime-constants", +======= + "frame-support 28.0.0", + "pallet-balances 28.0.0", + "pallet-broker 0.6.0", + "pallet-identity 29.0.0", + "pallet-message-queue 31.0.0", + "polkadot-runtime-common 7.0.0", + "polkadot-runtime-parachains 7.0.0", + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", + "staging-xcm-executor 7.0.0", + "westend-runtime-constants 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "westend-system-emulated-network", ] @@ -3643,6 +4269,7 @@ dependencies = [ name = "coretime-westend-runtime" version = "0.13.0" dependencies = [ +<<<<<<< HEAD "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", "cumulus-pallet-session-benchmarking", @@ -3660,6 +4287,25 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", +======= + "cumulus-pallet-aura-ext 0.7.0", + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-session-benchmarking 9.0.0", + "cumulus-pallet-weight-reclaim", + "cumulus-pallet-xcm 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", + "cumulus-primitives-aura 0.7.0", + "cumulus-primitives-core 0.7.0", + "cumulus-primitives-utility 0.7.0", + "frame-benchmarking 28.0.0", + "frame-executive 28.0.0", + "frame-metadata-hash-extension 0.1.0", + "frame-support 28.0.0", + "frame-system 28.0.0", + "frame-system-benchmarking 28.0.0", + "frame-system-rpc-runtime-api 26.0.0", + "frame-try-runtime 0.34.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "hex-literal", "log", "pallet-aura", @@ -3683,6 +4329,7 @@ dependencies = [ "polkadot-runtime-common", "scale-info", "serde", +<<<<<<< HEAD "sp-api 35.0.0", "sp-block-builder", "sp-consensus-aura", @@ -3703,6 +4350,30 @@ dependencies = [ "testnet-parachains-constants", "westend-runtime-constants", "xcm-runtime-apis", +======= + "serde_json", + "sp-api 26.0.0", + "sp-block-builder 26.0.0", + "sp-consensus-aura 0.32.0", + "sp-core 28.0.0", + "sp-genesis-builder 0.8.0", + "sp-inherents 26.0.0", + "sp-keyring 31.0.0", + "sp-offchain 26.0.0", + "sp-runtime 31.0.1", + "sp-session 27.0.0", + "sp-storage 19.0.0", + "sp-transaction-pool 26.0.0", + "sp-version 29.0.0", + "staging-parachain-info 0.7.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", + "testnet-parachains-constants 1.0.0", + "westend-runtime-constants 7.0.0", + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -4308,11 +4979,37 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", +<<<<<<< HEAD "sp-core 35.0.0", "sp-io 39.0.0", "sp-runtime 40.1.0", "sp-tracing 17.0.1", "staging-xcm", +======= + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-tracing 16.0.0", + "staging-xcm 7.0.1", +] + +[[package]] +name = "cumulus-pallet-dmp-queue" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97263a8e758d201ebe81db7cea7b278b4fb869c11442f77acef70138ac1a252f" +dependencies = [ + "cumulus-primitives-core 0.16.0", + "frame-benchmarking 38.0.0", + "frame-support 38.0.0", + "frame-system 38.0.0", + "log", + "parity-scale-codec", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "staging-xcm 14.2.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -4354,12 +5051,21 @@ dependencies = [ "sp-runtime 40.1.0", "sp-state-machine 0.44.0", "sp-std 14.0.0", +<<<<<<< HEAD "sp-tracing 17.0.1", "sp-trie 38.0.0", "sp-version 38.0.0", "staging-xcm", "staging-xcm-builder", "trie-db 0.29.1", +======= + "sp-tracing 16.0.0", + "sp-trie 29.0.0", + "sp-version 29.0.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "trie-db", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "trie-standardmap", ] @@ -4408,14 +5114,40 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", +<<<<<<< HEAD "sp-io 39.0.0", "sp-runtime 40.1.0", "staging-xcm", +======= + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", +] + +[[package]] +name = "cumulus-pallet-xcm" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e49231f6cd8274438b078305dc8ce44c54c0d3f4a28e902589bcbaa53d954608" +dependencies = [ + "cumulus-primitives-core 0.16.0", + "frame-support 38.0.0", + "frame-system 38.0.0", + "parity-scale-codec", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "staging-xcm 14.2.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] name = "cumulus-pallet-xcmp-queue" +<<<<<<< HEAD version = "0.18.1" +======= +version = "0.7.1" +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) dependencies = [ "bounded-collections", "bp-xcm-bridge-hub-router", @@ -4431,12 +5163,47 @@ dependencies = [ "polkadot-runtime-common", "polkadot-runtime-parachains", "scale-info", +<<<<<<< HEAD "sp-core 35.0.0", "sp-io 39.0.0", "sp-runtime 40.1.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", +======= + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", +] + +[[package]] +name = "cumulus-pallet-xcmp-queue" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f788bdac9474795ea13ba791b55798fb664b2e3da8c3a7385b480c9af4e6539" +dependencies = [ + "bounded-collections", + "bp-xcm-bridge-hub-router 0.14.1", + "cumulus-primitives-core 0.16.0", + "frame-benchmarking 38.0.0", + "frame-support 38.0.0", + "frame-system 38.0.0", + "log", + "pallet-message-queue 41.0.1", + "parity-scale-codec", + "polkadot-runtime-common 17.0.0", + "polkadot-runtime-parachains 17.0.1", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "staging-xcm 14.2.0", + "staging-xcm-builder 17.0.1", + "staging-xcm-executor 17.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -4449,8 +5216,29 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", +<<<<<<< HEAD "sp-runtime 40.1.0", "staging-xcm", +======= + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", +] + +[[package]] +name = "cumulus-ping" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47128f797359951723e2d106a80e592d007bb7446c299958cdbafb1489ddbf0" +dependencies = [ + "cumulus-pallet-xcm 0.17.0", + "cumulus-primitives-core 0.16.0", + "frame-support 38.0.0", + "frame-system 38.0.0", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.2", + "staging-xcm 14.2.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -4488,10 +5276,34 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-primitives", "scale-info", +<<<<<<< HEAD "sp-api 35.0.0", "sp-runtime 40.1.0", "sp-trie 38.0.0", "staging-xcm", +======= + "sp-api 26.0.0", + "sp-runtime 31.0.1", + "sp-trie 29.0.0", + "staging-xcm 7.0.1", +] + +[[package]] +name = "cumulus-primitives-core" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c6b5221a4a3097f2ebef66c84c1e6d7a0b8ec7e63f2bd5ae04c1e6d3fc7514e" +dependencies = [ + "parity-scale-codec", + "polkadot-core-primitives 15.0.0", + "polkadot-parachain-primitives 14.0.0", + "polkadot-primitives 16.0.0", + "scale-info", + "sp-api 34.0.0", + "sp-runtime 39.0.2", + "sp-trie 37.0.0", + "staging-xcm 14.2.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -4540,6 +5352,45 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" +<<<<<<< HEAD +======= +version = "0.7.0" +dependencies = [ + "cumulus-primitives-core 0.7.0", + "sp-inherents 26.0.0", + "sp-timestamp 26.0.0", +] + +[[package]] +name = "cumulus-primitives-timestamp" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33cffb8f010f39ac36b31d38994b8f9d9256d9b5e495d96b4ec59d3e30852d53" +dependencies = [ + "cumulus-primitives-core 0.16.0", + "sp-inherents 34.0.0", + "sp-timestamp 34.0.0", +] + +[[package]] +name = "cumulus-primitives-utility" +version = "0.7.0" +dependencies = [ + "cumulus-primitives-core 0.7.0", + "frame-support 28.0.0", + "log", + "pallet-asset-conversion 10.0.0", + "parity-scale-codec", + "polkadot-runtime-common 7.0.0", + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", +] + +[[package]] +name = "cumulus-primitives-utility" +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) version = "0.17.0" dependencies = [ "cumulus-primitives-core", @@ -5510,6 +6361,7 @@ dependencies = [ name = "emulated-integration-tests-common" version = "19.0.1" dependencies = [ +<<<<<<< HEAD "asset-test-utils", "bp-messages", "bp-xcm-bridge-hub", @@ -5524,12 +6376,29 @@ dependencies = [ "pallet-xcm", "pallet-xcm-bridge-hub", "parachains-common", +======= + "asset-test-utils 7.0.0", + "bp-messages 0.7.0", + "bp-xcm-bridge-hub 0.2.0", + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", + "cumulus-primitives-core 0.7.0", + "frame-support 28.0.0", + "pallet-assets 29.1.0", + "pallet-balances 28.0.0", + "pallet-bridge-messages 0.7.0", + "pallet-message-queue 31.0.0", + "pallet-xcm 7.0.0", + "pallet-xcm-bridge-hub 0.2.0", + "parachains-common 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "parity-scale-codec", "paste", "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-parachains", "sc-consensus-grandpa", +<<<<<<< HEAD "sp-authority-discovery", "sp-consensus-babe", "sp-consensus-beefy", @@ -5537,6 +6406,15 @@ dependencies = [ "sp-keyring", "sp-runtime 40.1.0", "staging-xcm", +======= + "sp-authority-discovery 26.0.0", + "sp-consensus-babe 0.32.0", + "sp-consensus-beefy 13.0.0", + "sp-core 28.0.0", + "sp-keyring 31.0.0", + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "xcm-emulator", ] @@ -7021,6 +7899,7 @@ dependencies = [ "parachains-common", "parity-scale-codec", "scale-info", +<<<<<<< HEAD "sp-api 35.0.0", "sp-block-builder", "sp-consensus-aura", @@ -7039,6 +7918,26 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", +======= + "sp-api 26.0.0", + "sp-block-builder 26.0.0", + "sp-consensus-aura 0.32.0", + "sp-core 28.0.0", + "sp-genesis-builder 0.8.0", + "sp-inherents 26.0.0", + "sp-offchain 26.0.0", + "sp-runtime 31.0.1", + "sp-session 27.0.0", + "sp-storage 19.0.0", + "sp-transaction-pool 26.0.0", + "sp-version 29.0.0", + "staging-parachain-info 0.7.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", + "testnet-parachains-constants 1.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -11474,6 +12373,7 @@ dependencies = [ "scale-info", "serde", "smallvec", +<<<<<<< HEAD "sp-api 35.0.0", "sp-core 35.0.0", "sp-io 39.0.0", @@ -11483,6 +12383,16 @@ dependencies = [ "sp-tracing 17.0.1", "staging-xcm", "staging-xcm-builder", +======= + "sp-api 26.0.0", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-keystore 0.34.0", + "sp-runtime 31.0.1", + "sp-tracing 16.0.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "wasm-instrument", "wasmi 0.32.3", "wat", @@ -11526,11 +12436,55 @@ dependencies = [ "polkadot-runtime-parachains", "pretty_assertions", "scale-info", +<<<<<<< HEAD "sp-api 35.0.0", "sp-core 35.0.0", "sp-io 39.0.0", "sp-keystore 0.41.0", "sp-runtime 40.1.0", +======= + "sp-api 26.0.0", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-keystore 0.34.0", + "sp-runtime 31.0.1", + "sp-tracing 16.0.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "xcm-simulator 7.0.0", +] + +[[package]] +name = "pallet-contracts-mock-network" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "309666537ed001c61a99f59fa7b98680f4a6e4e361ed3bc64f7b0237da3e3e06" +dependencies = [ + "frame-support 38.0.0", + "frame-system 38.0.0", + "pallet-assets 40.0.0", + "pallet-balances 39.0.0", + "pallet-contracts 38.0.0", + "pallet-contracts-proc-macro 23.0.1", + "pallet-contracts-uapi 12.0.0", + "pallet-insecure-randomness-collective-flip 26.0.0", + "pallet-message-queue 41.0.1", + "pallet-proxy 38.0.0", + "pallet-timestamp 37.0.0", + "pallet-utility 38.0.0", + "pallet-xcm 17.0.0", + "parity-scale-codec", + "polkadot-parachain-primitives 14.0.0", + "polkadot-primitives 16.0.0", + "polkadot-runtime-parachains 17.0.1", + "scale-info", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.2", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "sp-tracing 17.0.1", "staging-xcm", "staging-xcm-builder", @@ -12591,6 +13545,7 @@ dependencies = [ "secp256k1", "serde", "serde_json", +<<<<<<< HEAD "sp-api 35.0.0", "sp-arithmetic 26.0.0", "sp-core 35.0.0", @@ -12602,6 +13557,20 @@ dependencies = [ "sp-weights 31.0.0", "staging-xcm", "staging-xcm-builder", +======= + "sp-api 26.0.0", + "sp-arithmetic 23.0.0", + "sp-consensus-aura 0.32.0", + "sp-consensus-babe 0.32.0", + "sp-consensus-slots 0.32.0", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-keystore 0.34.0", + "sp-runtime 31.0.1", + "sp-tracing 16.0.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "subxt-signer", ] @@ -12680,11 +13649,52 @@ dependencies = [ "polkadot-runtime-parachains", "pretty_assertions", "scale-info", +<<<<<<< HEAD "sp-api 35.0.0", "sp-core 35.0.0", "sp-io 39.0.0", "sp-keystore 0.41.0", "sp-runtime 40.1.0", +======= + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-tracing 16.0.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "xcm-simulator 7.0.0", +] + +[[package]] +name = "pallet-revive-mock-network" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60e74591d44dbd78db02c8593f5caa75bd61bcc4d63999302150223fb969ae37" +dependencies = [ + "frame-support 38.0.0", + "frame-system 38.0.0", + "pallet-assets 40.0.0", + "pallet-balances 39.0.0", + "pallet-message-queue 41.0.1", + "pallet-proxy 38.0.0", + "pallet-revive 0.2.0", + "pallet-revive-proc-macro 0.1.1", + "pallet-revive-uapi 0.1.1", + "pallet-timestamp 37.0.0", + "pallet-utility 38.0.0", + "pallet-xcm 17.0.0", + "parity-scale-codec", + "polkadot-parachain-primitives 14.0.0", + "polkadot-primitives 16.0.0", + "polkadot-runtime-parachains 17.0.1", + "scale-info", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.2", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "sp-tracing 17.0.1", "staging-xcm", "staging-xcm-builder", @@ -12907,6 +13917,7 @@ dependencies = [ "rand_chacha 0.3.1", "scale-info", "serde", +<<<<<<< HEAD "sp-application-crypto 39.0.0", "sp-core 35.0.0", "sp-io 39.0.0", @@ -12915,6 +13926,48 @@ dependencies = [ "sp-staking", "sp-tracing 17.0.1", "substrate-test-utils", +======= + "sp-application-crypto 38.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", +] + +[[package]] +name = "pallet-staking-ah-client" +version = "0.1.0" +dependencies = [ + "frame-support 28.0.0", + "frame-system 28.0.0", + "log", + "pallet-authorship 28.0.0", + "pallet-session 28.0.0", + "pallet-staking 28.0.0", + "pallet-staking-rc-client", + "parity-scale-codec", + "polkadot-primitives 7.0.0", + "polkadot-runtime-parachains 7.0.0", + "scale-info", + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "sp-staking 26.0.0", + "staging-xcm 7.0.1", +] + +[[package]] +name = "pallet-staking-rc-client" +version = "0.1.0" +dependencies = [ + "frame-support 28.0.0", + "frame-system 28.0.0", + "log", + "parity-scale-codec", + "scale-info", + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "sp-staking 26.0.0", + "staging-xcm 7.0.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -13191,6 +14244,178 @@ dependencies = [ [[package]] name = "pallet-verify-signature" +<<<<<<< HEAD +======= +version = "1.0.0" +dependencies = [ + "frame-benchmarking 28.0.0", + "frame-support 28.0.0", + "frame-system 28.0.0", + "parity-scale-codec", + "scale-info", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-weights 27.0.0", +] + +[[package]] +name = "pallet-vesting" +version = "28.0.0" +dependencies = [ + "frame-benchmarking 28.0.0", + "frame-support 28.0.0", + "frame-system 28.0.0", + "log", + "pallet-balances 28.0.0", + "parity-scale-codec", + "scale-info", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", +] + +[[package]] +name = "pallet-vesting" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "807df2ef13ab6bf940879352c3013bfa00b670458b4c125c2f60e5753f68e3d5" +dependencies = [ + "frame-benchmarking 38.0.0", + "frame-support 38.0.0", + "frame-system 38.0.0", + "log", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-whitelist" +version = "27.0.0" +dependencies = [ + "frame-benchmarking 28.0.0", + "frame-support 28.0.0", + "frame-system 28.0.0", + "pallet-balances 28.0.0", + "pallet-preimage 28.0.0", + "parity-scale-codec", + "scale-info", + "sp-api 26.0.0", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", +] + +[[package]] +name = "pallet-whitelist" +version = "37.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ef17df925290865cf37096dd0cb76f787df11805bba01b1d0ca3e106d06280b" +dependencies = [ + "frame-benchmarking 38.0.0", + "frame-support 38.0.0", + "frame-system 38.0.0", + "parity-scale-codec", + "scale-info", + "sp-api 34.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-xcm" +version = "7.0.0" +dependencies = [ + "bounded-collections", + "frame-benchmarking 28.0.0", + "frame-support 28.0.0", + "frame-system 28.0.0", + "pallet-assets 29.1.0", + "pallet-balances 28.0.0", + "parity-scale-codec", + "polkadot-parachain-primitives 6.0.0", + "polkadot-runtime-parachains 7.0.0", + "scale-info", + "serde", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "tracing", + "xcm-runtime-apis 0.1.1", +] + +[[package]] +name = "pallet-xcm" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b1760b6589e53f4ad82216c72c0e38fcb4df149c37224ab3301dc240c85d1d4" +dependencies = [ + "bounded-collections", + "frame-benchmarking 38.0.0", + "frame-support 38.0.0", + "frame-system 38.0.0", + "log", + "pallet-balances 39.0.0", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "staging-xcm 14.2.0", + "staging-xcm-builder 17.0.1", + "staging-xcm-executor 17.0.0", + "xcm-runtime-apis 0.4.0", +] + +[[package]] +name = "pallet-xcm-benchmarks" +version = "7.0.0" +dependencies = [ + "frame-benchmarking 28.0.0", + "frame-support 28.0.0", + "frame-system 28.0.0", + "log", + "pallet-assets 29.1.0", + "pallet-balances 28.0.0", + "pallet-xcm 7.0.0", + "parity-scale-codec", + "polkadot-primitives 7.0.0", + "polkadot-runtime-common 7.0.0", + "scale-info", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-tracing 16.0.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", +] + +[[package]] +name = "pallet-xcm-benchmarks" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da423463933b42f4a4c74175f9e9295a439de26719579b894ce533926665e4a" +dependencies = [ + "frame-benchmarking 38.0.0", + "frame-support 38.0.0", + "frame-system 38.0.0", + "log", + "parity-scale-codec", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "staging-xcm 14.2.0", + "staging-xcm-builder 17.0.1", + "staging-xcm-executor 17.0.0", +] + +[[package]] +name = "pallet-xcm-bridge-hub" +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) version = "0.2.0" dependencies = [ "frame-benchmarking", @@ -13202,6 +14427,7 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", +<<<<<<< HEAD "sp-core 35.0.0", "sp-io 39.0.0", "sp-runtime 40.1.0", @@ -13287,6 +14513,15 @@ dependencies = [ "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", +======= + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-std 14.0.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -13311,9 +14546,14 @@ dependencies = [ "sp-io 39.0.0", "sp-runtime 40.1.0", "sp-std 14.0.0", +<<<<<<< HEAD "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", +======= + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -13390,6 +14630,7 @@ dependencies = [ "parity-scale-codec", "polkadot-primitives", "scale-info", +<<<<<<< HEAD "sp-consensus-aura", "sp-core 35.0.0", "sp-io 39.0.0", @@ -13398,6 +14639,47 @@ dependencies = [ "staging-xcm", "staging-xcm-executor", "substrate-wasm-builder", +======= + "sp-consensus-aura 0.32.0", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "staging-parachain-info 0.7.0", + "staging-xcm 7.0.1", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", +] + +[[package]] +name = "parachains-common" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9460a69f409be27c62161d8b4d36ffc32735d09a4f9097f9c789db0cca7196c" +dependencies = [ + "cumulus-primitives-core 0.16.0", + "cumulus-primitives-utility 0.17.0", + "frame-support 38.0.0", + "frame-system 38.0.0", + "log", + "pallet-asset-tx-payment 38.0.0", + "pallet-assets 40.0.0", + "pallet-authorship 38.0.0", + "pallet-balances 39.0.0", + "pallet-collator-selection 19.0.0", + "pallet-message-queue 41.0.1", + "pallet-xcm 17.0.0", + "parity-scale-codec", + "polkadot-primitives 16.0.0", + "scale-info", + "sp-consensus-aura 0.40.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "staging-parachain-info 0.17.0", + "staging-xcm 14.2.0", + "staging-xcm-executor 17.0.0", + "substrate-wasm-builder 24.0.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -13419,6 +14701,7 @@ dependencies = [ name = "parachains-runtimes-test-utils" version = "20.0.0" dependencies = [ +<<<<<<< HEAD "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", @@ -13426,6 +14709,15 @@ dependencies = [ "cumulus-test-relay-sproof-builder", "frame-support", "frame-system", +======= + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", + "cumulus-primitives-core 0.7.0", + "cumulus-primitives-parachain-inherent 0.7.0", + "cumulus-test-relay-sproof-builder 0.7.0", + "frame-support 28.0.0", + "frame-system 28.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "hex-literal", "pallet-balances", "pallet-collator-selection", @@ -13433,11 +14725,51 @@ dependencies = [ "pallet-timestamp", "pallet-xcm", "parity-scale-codec", +<<<<<<< HEAD "polkadot-parachain-primitives", "sp-consensus-aura", "sp-core 35.0.0", "sp-io 39.0.0", "sp-runtime 40.1.0", +======= + "polkadot-parachain-primitives 6.0.0", + "sp-consensus-aura 0.32.0", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-tracing 16.0.0", + "staging-parachain-info 0.7.0", + "staging-xcm 7.0.1", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", + "xcm-runtime-apis 0.1.1", +] + +[[package]] +name = "parachains-runtimes-test-utils" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287d2db0a2d19466caa579a69f021bfdc6fa352f382c8395dade58d1d0c6adfe" +dependencies = [ + "cumulus-pallet-parachain-system 0.17.1", + "cumulus-pallet-xcmp-queue 0.17.0", + "cumulus-primitives-core 0.16.0", + "cumulus-primitives-parachain-inherent 0.16.0", + "cumulus-test-relay-sproof-builder 0.16.0", + "frame-support 38.0.0", + "frame-system 38.0.0", + "pallet-balances 39.0.0", + "pallet-collator-selection 19.0.0", + "pallet-session 38.0.0", + "pallet-timestamp 37.0.0", + "pallet-xcm 17.0.0", + "parity-scale-codec", + "polkadot-parachain-primitives 14.0.0", + "sp-consensus-aura 0.40.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "sp-tracing 17.0.1", "staging-parachain-info", "staging-xcm", @@ -13638,15 +14970,22 @@ dependencies = [ "frame-support", "parachains-common", "penpal-runtime", +<<<<<<< HEAD "sp-core 35.0.0", "sp-keyring", "staging-xcm", +======= + "sp-core 28.0.0", + "sp-keyring 31.0.0", + "staging-xcm 7.0.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] name = "penpal-runtime" version = "0.27.0" dependencies = [ +<<<<<<< HEAD "assets-common", "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -13662,6 +15001,23 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", +======= + "assets-common 0.7.0", + "cumulus-pallet-aura-ext 0.7.0", + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-session-benchmarking 9.0.0", + "cumulus-pallet-xcm 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", + "cumulus-primitives-core 0.7.0", + "cumulus-primitives-utility 0.7.0", + "frame-benchmarking 28.0.0", + "frame-executive 28.0.0", + "frame-support 28.0.0", + "frame-system 28.0.0", + "frame-system-benchmarking 28.0.0", + "frame-system-rpc-runtime-api 26.0.0", + "frame-try-runtime 0.34.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "hex-literal", "log", "pallet-asset-conversion", @@ -13686,6 +15042,7 @@ dependencies = [ "primitive-types 0.12.2", "scale-info", "smallvec", +<<<<<<< HEAD "snowbridge-router-primitives", "sp-api 35.0.0", "sp-block-builder", @@ -13705,6 +15062,27 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "xcm-runtime-apis", +======= + "snowbridge-router-primitives 0.9.0", + "sp-api 26.0.0", + "sp-block-builder 26.0.0", + "sp-consensus-aura 0.32.0", + "sp-core 28.0.0", + "sp-genesis-builder 0.8.0", + "sp-inherents 26.0.0", + "sp-offchain 26.0.0", + "sp-runtime 31.0.1", + "sp-session 27.0.0", + "sp-storage 19.0.0", + "sp-transaction-pool 26.0.0", + "sp-version 29.0.0", + "staging-parachain-info 0.7.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -13735,15 +15113,22 @@ dependencies = [ "polkadot-runtime-common", "rococo-runtime-constants", "rococo-system-emulated-network", +<<<<<<< HEAD "sp-runtime 40.1.0", "staging-xcm", "staging-xcm-executor", +======= + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", + "staging-xcm-executor 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] name = "people-rococo-runtime" version = "0.13.0" dependencies = [ +<<<<<<< HEAD "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", "cumulus-pallet-session-benchmarking", @@ -13753,6 +15138,17 @@ dependencies = [ "cumulus-primitives-core", "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", +======= + "cumulus-pallet-aura-ext 0.7.0", + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-session-benchmarking 9.0.0", + "cumulus-pallet-weight-reclaim", + "cumulus-pallet-xcm 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", + "cumulus-primitives-aura 0.7.0", + "cumulus-primitives-core 0.7.0", + "cumulus-primitives-utility 0.7.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "enumflags2", "frame-benchmarking", "frame-executive", @@ -13786,6 +15182,7 @@ dependencies = [ "rococo-runtime-constants", "scale-info", "serde", +<<<<<<< HEAD "sp-api 35.0.0", "sp-block-builder", "sp-consensus-aura", @@ -13805,6 +15202,29 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "xcm-runtime-apis", +======= + "serde_json", + "sp-api 26.0.0", + "sp-block-builder 26.0.0", + "sp-consensus-aura 0.32.0", + "sp-core 28.0.0", + "sp-genesis-builder 0.8.0", + "sp-inherents 26.0.0", + "sp-keyring 31.0.0", + "sp-offchain 26.0.0", + "sp-runtime 31.0.1", + "sp-session 27.0.0", + "sp-storage 19.0.0", + "sp-transaction-pool 26.0.0", + "sp-version 29.0.0", + "staging-parachain-info 0.7.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", + "testnet-parachains-constants 1.0.0", + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -13833,11 +15253,20 @@ dependencies = [ "pallet-xcm", "parachains-common", "parity-scale-codec", +<<<<<<< HEAD "polkadot-runtime-common", "sp-runtime 40.1.0", "staging-xcm", "staging-xcm-executor", "westend-runtime-constants", +======= + "polkadot-runtime-common 7.0.0", + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", + "staging-xcm-executor 7.0.0", + "westend-runtime", + "westend-runtime-constants 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "westend-system-emulated-network", ] @@ -13845,6 +15274,7 @@ dependencies = [ name = "people-westend-runtime" version = "0.13.0" dependencies = [ +<<<<<<< HEAD "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", "cumulus-pallet-session-benchmarking", @@ -13854,6 +15284,17 @@ dependencies = [ "cumulus-primitives-core", "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", +======= + "cumulus-pallet-aura-ext 0.7.0", + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-session-benchmarking 9.0.0", + "cumulus-pallet-weight-reclaim", + "cumulus-pallet-xcm 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", + "cumulus-primitives-aura 0.7.0", + "cumulus-primitives-core 0.7.0", + "cumulus-primitives-utility 0.7.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "enumflags2", "frame-benchmarking", "frame-executive", @@ -13886,6 +15327,7 @@ dependencies = [ "polkadot-runtime-common", "scale-info", "serde", +<<<<<<< HEAD "sp-api 35.0.0", "sp-block-builder", "sp-consensus-aura", @@ -13906,6 +15348,30 @@ dependencies = [ "testnet-parachains-constants", "westend-runtime-constants", "xcm-runtime-apis", +======= + "serde_json", + "sp-api 26.0.0", + "sp-block-builder 26.0.0", + "sp-consensus-aura 0.32.0", + "sp-core 28.0.0", + "sp-genesis-builder 0.8.0", + "sp-inherents 26.0.0", + "sp-keyring 31.0.0", + "sp-offchain 26.0.0", + "sp-runtime 31.0.1", + "sp-session 27.0.0", + "sp-storage 19.0.0", + "sp-transaction-pool 26.0.0", + "sp-version 29.0.0", + "staging-parachain-info 0.7.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", + "testnet-parachains-constants 1.0.0", + "westend-runtime-constants 7.0.0", + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -15186,10 +16652,17 @@ dependencies = [ "sc-service", "serde", "serde_json", +<<<<<<< HEAD "sp-core 35.0.0", "sp-genesis-builder", "sp-keyring", "staging-xcm", +======= + "sp-core 28.0.0", + "sp-genesis-builder 0.8.0", + "sp-keyring 31.0.0", + "staging-xcm 7.0.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "substrate-build-script-utils", ] @@ -15320,6 +16793,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", +<<<<<<< HEAD "slot-range-helper", "sp-api 35.0.0", "sp-core 35.0.0", @@ -15334,6 +16808,72 @@ dependencies = [ "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", +======= + "slot-range-helper 7.0.0", + "sp-api 26.0.0", + "sp-core 28.0.0", + "sp-inherents 26.0.0", + "sp-io 30.0.0", + "sp-keyring 31.0.0", + "sp-keystore 0.34.0", + "sp-npos-elections 26.0.0", + "sp-runtime 31.0.1", + "sp-session 27.0.0", + "sp-staking 26.0.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "static_assertions", +] + +[[package]] +name = "polkadot-runtime-common" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc15154ba5ca55d323fcf7af0f5dcd39d58dcb4dfac3d9b30404840a6d8bbde4" +dependencies = [ + "bitvec", + "frame-benchmarking 38.0.0", + "frame-election-provider-support 38.0.0", + "frame-support 38.0.0", + "frame-system 38.0.0", + "impl-trait-for-tuples", + "libsecp256k1", + "log", + "pallet-asset-rate 17.0.0", + "pallet-authorship 38.0.0", + "pallet-balances 39.0.0", + "pallet-broker 0.17.0", + "pallet-election-provider-multi-phase 37.0.0", + "pallet-fast-unstake 37.0.0", + "pallet-identity 38.0.0", + "pallet-session 38.0.0", + "pallet-staking 38.0.0", + "pallet-staking-reward-fn 22.0.0", + "pallet-timestamp 37.0.0", + "pallet-transaction-payment 38.0.0", + "pallet-treasury 37.0.0", + "pallet-vesting 38.0.0", + "parity-scale-codec", + "polkadot-primitives 16.0.0", + "polkadot-runtime-parachains 17.0.1", + "rustc-hex", + "scale-info", + "serde", + "serde_derive", + "slot-range-helper 15.0.0", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-npos-elections 34.0.0", + "sp-runtime 39.0.2", + "sp-session 36.0.0", + "sp-staking 36.0.0", + "staging-xcm 14.2.0", + "staging-xcm-builder 17.0.1", + "staging-xcm-executor 17.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "static_assertions", ] @@ -15401,9 +16941,15 @@ dependencies = [ "sp-session", "sp-staking", "sp-std 14.0.0", +<<<<<<< HEAD "sp-tracing 17.0.1", "staging-xcm", "staging-xcm-executor", +======= + "sp-tracing 16.0.0", + "staging-xcm 7.0.1", + "staging-xcm-executor 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "static_assertions", "thousands", ] @@ -15438,6 +16984,7 @@ dependencies = [ "cumulus-client-parachain-inherent", "cumulus-client-pov-recovery", "cumulus-client-service", +<<<<<<< HEAD "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -15454,6 +17001,25 @@ dependencies = [ "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-timestamp", "cumulus-primitives-utility", +======= + "cumulus-pallet-aura-ext 0.7.0", + "cumulus-pallet-dmp-queue 0.7.0", + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-parachain-system-proc-macro 0.6.0", + "cumulus-pallet-session-benchmarking 9.0.0", + "cumulus-pallet-solo-to-para 0.7.0", + "cumulus-pallet-weight-reclaim", + "cumulus-pallet-xcm 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", + "cumulus-ping 0.7.0", + "cumulus-primitives-aura 0.7.0", + "cumulus-primitives-core 0.7.0", + "cumulus-primitives-parachain-inherent 0.7.0", + "cumulus-primitives-proof-size-hostfunction 0.2.0", + "cumulus-primitives-storage-weight-reclaim 1.0.0", + "cumulus-primitives-timestamp 0.7.0", + "cumulus-primitives-utility 0.7.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", "cumulus-relay-chain-minimal-node", @@ -15767,9 +17333,15 @@ dependencies = [ "staging-node-inspect", "staging-parachain-info", "staging-tracking-allocator", +<<<<<<< HEAD "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", +======= + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "subkey", "substrate-bip39 0.6.0", "substrate-build-script-utils", @@ -15783,9 +17355,247 @@ dependencies = [ "tracing-gum", "tracing-gum-proc-macro", "xcm-emulator", +<<<<<<< HEAD "xcm-procedural", "xcm-runtime-apis", "xcm-simulator", +======= + "xcm-procedural 7.0.0", + "xcm-runtime-apis 0.1.1", + "xcm-simulator 7.0.0", +] + +[[package]] +name = "polkadot-sdk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb819108697967452fa6d8d96ab4c0d48cbaa423b3156499dcb24f1cf95d6775" +dependencies = [ + "asset-test-utils 18.0.0", + "assets-common 0.18.0", + "binary-merkle-tree 15.0.1", + "bp-header-chain 0.18.1", + "bp-messages 0.18.0", + "bp-parachains 0.18.0", + "bp-polkadot 0.16.0", + "bp-polkadot-core 0.18.0", + "bp-relayers 0.18.0", + "bp-runtime 0.18.0", + "bp-test-utils 0.18.0", + "bp-xcm-bridge-hub 0.4.0", + "bp-xcm-bridge-hub-router 0.14.1", + "bridge-hub-common 0.10.0", + "bridge-hub-test-utils 0.18.0", + "bridge-runtime-common 0.18.0", + "cumulus-pallet-aura-ext 0.17.0", + "cumulus-pallet-dmp-queue 0.17.0", + "cumulus-pallet-parachain-system 0.17.1", + "cumulus-pallet-parachain-system-proc-macro 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cumulus-pallet-session-benchmarking 19.0.0", + "cumulus-pallet-solo-to-para 0.17.0", + "cumulus-pallet-xcm 0.17.0", + "cumulus-pallet-xcmp-queue 0.17.0", + "cumulus-ping 0.17.0", + "cumulus-primitives-aura 0.15.0", + "cumulus-primitives-core 0.16.0", + "cumulus-primitives-parachain-inherent 0.16.0", + "cumulus-primitives-proof-size-hostfunction 0.10.0", + "cumulus-primitives-storage-weight-reclaim 8.0.0", + "cumulus-primitives-timestamp 0.16.0", + "cumulus-primitives-utility 0.17.0", + "cumulus-test-relay-sproof-builder 0.16.0", + "frame-benchmarking 38.0.0", + "frame-benchmarking-pallet-pov 28.0.0", + "frame-election-provider-support 38.0.0", + "frame-executive 38.0.0", + "frame-metadata-hash-extension 0.6.0", + "frame-support 38.0.0", + "frame-support-procedural 30.0.4", + "frame-system 38.0.0", + "frame-system-benchmarking 38.0.0", + "frame-system-rpc-runtime-api 34.0.0", + "frame-try-runtime 0.44.0", + "pallet-alliance 37.0.0", + "pallet-asset-conversion 20.0.0", + "pallet-asset-conversion-ops 0.6.0", + "pallet-asset-conversion-tx-payment 20.0.0", + "pallet-asset-rate 17.0.0", + "pallet-asset-tx-payment 38.0.0", + "pallet-assets 40.0.0", + "pallet-assets-freezer 0.5.0", + "pallet-atomic-swap 38.0.0", + "pallet-aura 37.0.0", + "pallet-authority-discovery 38.0.0", + "pallet-authorship 38.0.0", + "pallet-babe 38.0.0", + "pallet-bags-list 37.0.0", + "pallet-balances 39.0.0", + "pallet-beefy 39.0.0", + "pallet-beefy-mmr 39.0.0", + "pallet-bounties 37.0.0", + "pallet-bridge-grandpa 0.18.0", + "pallet-bridge-messages 0.18.0", + "pallet-bridge-parachains 0.18.0", + "pallet-bridge-relayers 0.18.0", + "pallet-broker 0.17.0", + "pallet-child-bounties 37.0.0", + "pallet-collator-selection 19.0.0", + "pallet-collective 38.0.0", + "pallet-collective-content 0.16.0", + "pallet-contracts 38.0.0", + "pallet-contracts-mock-network 14.0.0", + "pallet-conviction-voting 38.0.0", + "pallet-core-fellowship 22.0.0", + "pallet-delegated-staking 5.0.0", + "pallet-democracy 38.0.0", + "pallet-dev-mode 20.0.0", + "pallet-election-provider-multi-phase 37.0.0", + "pallet-election-provider-support-benchmarking 37.0.0", + "pallet-elections-phragmen 39.0.0", + "pallet-fast-unstake 37.0.0", + "pallet-glutton 24.0.0", + "pallet-grandpa 38.0.0", + "pallet-identity 38.0.0", + "pallet-im-online 37.0.0", + "pallet-indices 38.0.0", + "pallet-insecure-randomness-collective-flip 26.0.0", + "pallet-lottery 38.0.0", + "pallet-membership 38.0.0", + "pallet-message-queue 41.0.1", + "pallet-migrations 8.0.0", + "pallet-mixnet 0.14.0", + "pallet-mmr 38.0.0", + "pallet-multisig 38.0.0", + "pallet-nft-fractionalization 21.0.0", + "pallet-nfts 32.0.0", + "pallet-nfts-runtime-api 24.0.0", + "pallet-nis 38.0.0", + "pallet-node-authorization 38.0.0", + "pallet-nomination-pools 35.0.0", + "pallet-nomination-pools-benchmarking 36.0.0", + "pallet-nomination-pools-runtime-api 33.0.0", + "pallet-offences 37.0.0", + "pallet-offences-benchmarking 38.0.0", + "pallet-paged-list 0.16.0", + "pallet-parameters 0.9.0", + "pallet-preimage 38.0.0", + "pallet-proxy 38.0.0", + "pallet-ranked-collective 38.0.0", + "pallet-recovery 38.0.0", + "pallet-referenda 38.0.0", + "pallet-remark 38.0.0", + "pallet-revive 0.2.0", + "pallet-revive-fixtures 0.2.0", + "pallet-revive-mock-network 0.2.0", + "pallet-root-offences 35.0.0", + "pallet-root-testing 14.0.0", + "pallet-safe-mode 19.0.0", + "pallet-salary 23.0.0", + "pallet-scheduler 39.0.0", + "pallet-scored-pool 38.0.0", + "pallet-session 38.0.0", + "pallet-session-benchmarking 38.0.0", + "pallet-skip-feeless-payment 13.0.0", + "pallet-society 38.0.0", + "pallet-staking 38.0.0", + "pallet-staking-reward-fn 22.0.0", + "pallet-staking-runtime-api 24.0.0", + "pallet-state-trie-migration 40.0.0", + "pallet-statement 20.0.0", + "pallet-sudo 38.0.0", + "pallet-timestamp 37.0.0", + "pallet-tips 37.0.0", + "pallet-transaction-payment 38.0.0", + "pallet-transaction-payment-rpc-runtime-api 38.0.0", + "pallet-transaction-storage 37.0.0", + "pallet-treasury 37.0.0", + "pallet-tx-pause 19.0.0", + "pallet-uniques 38.0.0", + "pallet-utility 38.0.0", + "pallet-vesting 38.0.0", + "pallet-whitelist 37.0.0", + "pallet-xcm 17.0.0", + "pallet-xcm-benchmarks 17.0.0", + "pallet-xcm-bridge-hub 0.13.0", + "pallet-xcm-bridge-hub-router 0.15.1", + "parachains-common 18.0.0", + "parachains-runtimes-test-utils 17.0.0", + "polkadot-core-primitives 15.0.0", + "polkadot-parachain-primitives 14.0.0", + "polkadot-primitives 16.0.0", + "polkadot-runtime-common 17.0.0", + "polkadot-runtime-metrics 17.0.0", + "polkadot-runtime-parachains 17.0.1", + "polkadot-sdk-frame 0.7.0", + "sc-executor 0.40.1", + "slot-range-helper 15.0.0", + "snowbridge-beacon-primitives 0.10.0", + "snowbridge-core 0.10.0", + "snowbridge-ethereum 0.9.0", + "snowbridge-outbound-queue-merkle-tree 0.9.1", + "snowbridge-outbound-queue-runtime-api 0.10.0", + "snowbridge-pallet-ethereum-client 0.10.0", + "snowbridge-pallet-ethereum-client-fixtures 0.18.0", + "snowbridge-pallet-inbound-queue 0.10.0", + "snowbridge-pallet-inbound-queue-fixtures 0.18.0", + "snowbridge-pallet-outbound-queue 0.10.0", + "snowbridge-pallet-system 0.10.0", + "snowbridge-router-primitives 0.16.0", + "snowbridge-runtime-common 0.10.0", + "snowbridge-runtime-test-common 0.10.0", + "snowbridge-system-runtime-api 0.10.0", + "sp-api 34.0.0", + "sp-api-proc-macro 20.0.0", + "sp-application-crypto 38.0.0", + "sp-arithmetic 26.0.0", + "sp-authority-discovery 34.0.0", + "sp-block-builder 34.0.0", + "sp-consensus-aura 0.40.0", + "sp-consensus-babe 0.40.0", + "sp-consensus-beefy 22.1.0", + "sp-consensus-grandpa 21.0.0", + "sp-consensus-pow 0.40.0", + "sp-consensus-slots 0.40.1", + "sp-core 34.0.0", + "sp-core-hashing 16.0.0", + "sp-crypto-ec-utils 0.14.0", + "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.29.0", + "sp-genesis-builder 0.15.1", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-keyring 39.0.0", + "sp-keystore 0.40.0", + "sp-metadata-ir 0.7.0", + "sp-mixnet 0.12.0", + "sp-mmr-primitives 34.1.0", + "sp-npos-elections 34.0.0", + "sp-offchain 34.0.0", + "sp-runtime 39.0.2", + "sp-runtime-interface 28.0.0", + "sp-session 36.0.0", + "sp-staking 36.0.0", + "sp-state-machine 0.43.0", + "sp-statement-store 18.0.0", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-storage 21.0.0", + "sp-timestamp 34.0.0", + "sp-tracing 17.0.1", + "sp-transaction-pool 34.0.0", + "sp-transaction-storage-proof 34.0.0", + "sp-trie 37.0.0", + "sp-version 37.0.0", + "sp-wasm-interface 21.0.1", + "sp-weights 31.0.0", + "staging-parachain-info 0.17.0", + "staging-xcm 14.2.0", + "staging-xcm-builder 17.0.1", + "staging-xcm-executor 17.0.0", + "substrate-bip39 0.6.0", + "testnet-parachains-constants 10.0.0", + "xcm-runtime-apis 0.4.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -15878,10 +17688,17 @@ dependencies = [ "sp-weights 31.0.0", "staging-chain-spec-builder", "staging-node-cli", +<<<<<<< HEAD "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", +======= + "staging-parachain-info 0.7.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "subkey", "substrate-wasm-builder", "xcm-docs", @@ -15953,7 +17770,11 @@ dependencies = [ [[package]] name = "polkadot-service" +<<<<<<< HEAD version = "22.0.1" +======= +version = "7.0.1" +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) dependencies = [ "assert_matches", "async-trait", @@ -16040,6 +17861,7 @@ dependencies = [ "sp-block-builder", "sp-blockchain", "sp-consensus", +<<<<<<< HEAD "sp-consensus-babe", "sp-consensus-beefy", "sp-consensus-grandpa", @@ -16058,13 +17880,38 @@ dependencies = [ "sp-version 38.0.0", "sp-weights 31.0.0", "staging-xcm", +======= + "sp-consensus-babe 0.32.0", + "sp-consensus-beefy 13.0.0", + "sp-consensus-grandpa 13.0.0", + "sp-core 28.0.0", + "sp-genesis-builder 0.8.0", + "sp-inherents 26.0.0", + "sp-io 30.0.0", + "sp-keyring 31.0.0", + "sp-mmr-primitives 26.0.0", + "sp-offchain 26.0.0", + "sp-runtime 31.0.1", + "sp-session 27.0.0", + "sp-timestamp 26.0.0", + "sp-tracing 16.0.0", + "sp-transaction-pool 26.0.0", + "sp-version 29.0.0", + "sp-weights 27.0.0", + "staging-xcm 7.0.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "substrate-prometheus-endpoint", "tempfile", "thiserror 1.0.65", "tracing-gum", "westend-runtime", +<<<<<<< HEAD "westend-runtime-constants", "xcm-runtime-apis", +======= + "westend-runtime-constants 7.0.0", + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -16283,6 +18130,7 @@ dependencies = [ "scale-info", "serde", "serde_json", +<<<<<<< HEAD "sp-api 35.0.0", "sp-authority-discovery", "sp-block-builder", @@ -16305,6 +18153,30 @@ dependencies = [ "staging-xcm-builder", "staging-xcm-executor", "substrate-wasm-builder", +======= + "sp-api 26.0.0", + "sp-authority-discovery 26.0.0", + "sp-block-builder 26.0.0", + "sp-consensus-babe 0.32.0", + "sp-consensus-beefy 13.0.0", + "sp-core 28.0.0", + "sp-genesis-builder 0.8.0", + "sp-inherents 26.0.0", + "sp-io 30.0.0", + "sp-keyring 31.0.0", + "sp-mmr-primitives 26.0.0", + "sp-offchain 26.0.0", + "sp-runtime 31.0.1", + "sp-session 27.0.0", + "sp-staking 26.0.0", + "sp-transaction-pool 26.0.0", + "sp-trie 29.0.0", + "sp-version 29.0.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "test-runtime-constants", "tiny-keccak", ] @@ -17720,9 +19592,15 @@ dependencies = [ "sp-rpc", "sp-runtime 40.1.0", "sp-std 14.0.0", +<<<<<<< HEAD "sp-trie 38.0.0", "sp-version 38.0.0", "staging-xcm", +======= + "sp-trie 29.0.0", + "sp-version 29.0.0", + "staging-xcm 7.0.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "thiserror 1.0.65", "tokio", ] @@ -17968,6 +19846,7 @@ dependencies = [ name = "rococo-parachain-runtime" version = "0.18.0" dependencies = [ +<<<<<<< HEAD "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", "cumulus-pallet-xcm", @@ -17992,10 +19871,37 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-xcm", "parachains-common", +======= + "cumulus-pallet-aura-ext 0.7.0", + "cumulus-pallet-parachain-system 0.7.0", + "cumulus-pallet-weight-reclaim", + "cumulus-pallet-xcm 0.7.0", + "cumulus-pallet-xcmp-queue 0.7.1", + "cumulus-ping 0.7.0", + "cumulus-primitives-aura 0.7.0", + "cumulus-primitives-core 0.7.0", + "cumulus-primitives-utility 0.7.0", + "frame-benchmarking 28.0.0", + "frame-executive 28.0.0", + "frame-support 28.0.0", + "frame-system 28.0.0", + "frame-system-rpc-runtime-api 26.0.0", + "pallet-assets 29.1.0", + "pallet-aura 27.0.0", + "pallet-balances 28.0.0", + "pallet-message-queue 31.0.0", + "pallet-sudo 28.0.0", + "pallet-timestamp 27.0.0", + "pallet-transaction-payment 28.0.0", + "pallet-transaction-payment-rpc-runtime-api 28.0.0", + "pallet-xcm 7.0.0", + "parachains-common 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "parity-scale-codec", "polkadot-parachain-primitives", "polkadot-runtime-common", "scale-info", +<<<<<<< HEAD "sp-api 35.0.0", "sp-block-builder", "sp-consensus-aura", @@ -18013,6 +19919,25 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", +======= + "sp-api 26.0.0", + "sp-block-builder 26.0.0", + "sp-consensus-aura 0.32.0", + "sp-core 28.0.0", + "sp-genesis-builder 0.8.0", + "sp-inherents 26.0.0", + "sp-offchain 26.0.0", + "sp-runtime 31.0.1", + "sp-session 27.0.0", + "sp-transaction-pool 26.0.0", + "sp-version 29.0.0", + "staging-parachain-info 0.7.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", + "testnet-parachains-constants 1.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -18090,6 +20015,7 @@ dependencies = [ "serde_derive", "serde_json", "smallvec", +<<<<<<< HEAD "sp-api 35.0.0", "sp-arithmetic 26.0.0", "sp-authority-discovery", @@ -18115,11 +20041,42 @@ dependencies = [ "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", +======= + "sp-api 26.0.0", + "sp-arithmetic 23.0.0", + "sp-authority-discovery 26.0.0", + "sp-block-builder 26.0.0", + "sp-consensus-babe 0.32.0", + "sp-consensus-beefy 13.0.0", + "sp-consensus-grandpa 13.0.0", + "sp-core 28.0.0", + "sp-genesis-builder 0.8.0", + "sp-inherents 26.0.0", + "sp-io 30.0.0", + "sp-keyring 31.0.0", + "sp-mmr-primitives 26.0.0", + "sp-offchain 26.0.0", + "sp-runtime 31.0.1", + "sp-session 27.0.0", + "sp-staking 26.0.0", + "sp-storage 19.0.0", + "sp-tracing 16.0.0", + "sp-transaction-pool 26.0.0", + "sp-trie 29.0.0", + "sp-version 29.0.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "static_assertions", "substrate-wasm-builder", "tiny-keccak", "tokio", +<<<<<<< HEAD "xcm-runtime-apis", +======= + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -18130,8 +20087,30 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime-common", "smallvec", +<<<<<<< HEAD "sp-core 35.0.0", "sp-runtime 40.1.0", +======= + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "sp-weights 27.0.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", +] + +[[package]] +name = "rococo-runtime-constants" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1ec6683a2e52fe3be2eaf942a80619abd99eb36e973c5ab4489a2f3b100db5c" +dependencies = [ + "frame-support 38.0.0", + "polkadot-primitives 16.0.0", + "polkadot-runtime-common 17.0.0", + "smallvec", + "sp-core 34.0.0", + "sp-runtime 39.0.2", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "sp-weights 31.0.0", "staging-xcm", "staging-xcm-builder", @@ -21202,7 +23181,36 @@ dependencies = [ "polkadot-parachain-primitives", "scale-info", "serde", +<<<<<<< HEAD "snowbridge-beacon-primitives", +======= + "snowbridge-beacon-primitives 0.2.0", + "sp-arithmetic 23.0.0", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-std 14.0.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", +] + +[[package]] +name = "snowbridge-core" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6be61e4db95d1e253a1d5e722953b2d2f6605e5f9761f0a919e5d3fbdbff9da9" +dependencies = [ + "ethabi-decode 1.0.0", + "frame-support 38.0.0", + "frame-system 38.0.0", + "hex-literal", + "parity-scale-codec", + "polkadot-parachain-primitives 14.0.0", + "scale-info", + "serde", + "snowbridge-beacon-primitives 0.10.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "sp-arithmetic 26.0.0", "sp-core 35.0.0", "sp-io 39.0.0", @@ -21340,8 +23348,41 @@ dependencies = [ "sp-keyring", "sp-runtime 40.1.0", "sp-std 14.0.0", +<<<<<<< HEAD "staging-xcm", "staging-xcm-executor", +======= + "staging-xcm 7.0.1", + "staging-xcm-executor 7.0.0", +] + +[[package]] +name = "snowbridge-pallet-inbound-queue" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2e6a9d00e60e3744e6b6f0c21fea6694b9c6401ac40e41340a96e561dcf1935" +dependencies = [ + "alloy-primitives 0.4.2", + "alloy-sol-types 0.4.2", + "frame-benchmarking 38.0.0", + "frame-support 38.0.0", + "frame-system 38.0.0", + "log", + "pallet-balances 39.0.0", + "parity-scale-codec", + "scale-info", + "serde", + "snowbridge-beacon-primitives 0.10.0", + "snowbridge-core 0.10.0", + "snowbridge-pallet-inbound-queue-fixtures 0.18.0", + "snowbridge-router-primitives 0.16.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "staging-xcm 14.2.0", + "staging-xcm-executor 17.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -21400,8 +23441,34 @@ dependencies = [ "sp-keyring", "sp-runtime 40.1.0", "sp-std 14.0.0", +<<<<<<< HEAD "staging-xcm", "staging-xcm-executor", +======= + "staging-xcm 7.0.1", + "staging-xcm-executor 7.0.0", +] + +[[package]] +name = "snowbridge-pallet-system" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674db59b3c8013382e5c07243ad9439b64d81d2e8b3c4f08d752b55aa5de697e" +dependencies = [ + "frame-benchmarking 38.0.0", + "frame-support 38.0.0", + "frame-system 38.0.0", + "log", + "parity-scale-codec", + "scale-info", + "snowbridge-core 0.10.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "staging-xcm 14.2.0", + "staging-xcm-executor 17.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -21418,8 +23485,33 @@ dependencies = [ "sp-io 39.0.0", "sp-runtime 40.1.0", "sp-std 14.0.0", +<<<<<<< HEAD "staging-xcm", "staging-xcm-executor", +======= + "staging-xcm 7.0.1", + "staging-xcm-executor 7.0.0", +] + +[[package]] +name = "snowbridge-router-primitives" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "025f1e6805753821b1db539369f1fb183fd59fd5df7023f7633a4c0cfd3e62f9" +dependencies = [ + "frame-support 38.0.0", + "hex-literal", + "log", + "parity-scale-codec", + "scale-info", + "snowbridge-core 0.10.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "staging-xcm 14.2.0", + "staging-xcm-executor 17.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -21429,6 +23521,7 @@ dependencies = [ "frame-support", "log", "parity-scale-codec", +<<<<<<< HEAD "snowbridge-core", "sp-arithmetic 26.0.0", "sp-std 14.0.0", @@ -21465,6 +23558,104 @@ dependencies = [ "staging-parachain-info", "staging-xcm", "staging-xcm-executor", +======= + "snowbridge-core 0.2.0", + "sp-arithmetic 23.0.0", + "sp-std 14.0.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", +] + +[[package]] +name = "snowbridge-runtime-common" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6093f0e73d6cfdd2eea8712155d1d75b5063fc9b1d854d2665b097b4bb29570d" +dependencies = [ + "frame-support 38.0.0", + "log", + "parity-scale-codec", + "snowbridge-core 0.10.0", + "sp-arithmetic 26.0.0", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "staging-xcm 14.2.0", + "staging-xcm-builder 17.0.1", + "staging-xcm-executor 17.0.0", +] + +[[package]] +name = "snowbridge-runtime-test-common" +version = "0.2.0" +dependencies = [ + "cumulus-pallet-parachain-system 0.7.0", + "frame-support 28.0.0", + "frame-system 28.0.0", + "pallet-balances 28.0.0", + "pallet-collator-selection 9.0.0", + "pallet-message-queue 31.0.0", + "pallet-session 28.0.0", + "pallet-timestamp 27.0.0", + "pallet-utility 28.0.0", + "pallet-xcm 7.0.0", + "parachains-runtimes-test-utils 7.0.0", + "parity-scale-codec", + "snowbridge-core 0.2.0", + "snowbridge-pallet-ethereum-client 0.2.0", + "snowbridge-pallet-ethereum-client-fixtures 0.9.0", + "snowbridge-pallet-outbound-queue 0.2.0", + "snowbridge-pallet-system 0.2.0", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-keyring 31.0.0", + "sp-runtime 31.0.1", + "staging-parachain-info 0.7.0", + "staging-xcm 7.0.1", + "staging-xcm-executor 7.0.0", +] + +[[package]] +name = "snowbridge-runtime-test-common" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "893480d6cde2489051c65efb5d27fa87efe047b3b61216d8e27bb2f0509b7faf" +dependencies = [ + "cumulus-pallet-parachain-system 0.17.1", + "frame-support 38.0.0", + "frame-system 38.0.0", + "pallet-balances 39.0.0", + "pallet-collator-selection 19.0.0", + "pallet-message-queue 41.0.1", + "pallet-session 38.0.0", + "pallet-timestamp 37.0.0", + "pallet-utility 38.0.0", + "pallet-xcm 17.0.0", + "parachains-runtimes-test-utils 17.0.0", + "parity-scale-codec", + "snowbridge-core 0.10.0", + "snowbridge-pallet-ethereum-client 0.10.0", + "snowbridge-pallet-ethereum-client-fixtures 0.18.0", + "snowbridge-pallet-outbound-queue 0.10.0", + "snowbridge-pallet-system 0.10.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-keyring 39.0.0", + "sp-runtime 39.0.2", + "staging-parachain-info 0.17.0", + "staging-xcm 14.2.0", + "staging-xcm-executor 17.0.0", +] + +[[package]] +name = "snowbridge-system-runtime-api" +version = "0.2.0" +dependencies = [ + "parity-scale-codec", + "snowbridge-core 0.2.0", + "sp-api 26.0.0", + "sp-std 14.0.0", + "staging-xcm 7.0.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -23534,7 +25725,11 @@ version = "2.0.0" [[package]] name = "staging-xcm" +<<<<<<< HEAD version = "15.0.1" +======= +version = "7.0.1" +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) dependencies = [ "array-bytes", "bounded-collections", @@ -23577,6 +25772,34 @@ dependencies = [ "polkadot-test-runtime", "primitive-types 0.13.1", "scale-info", +<<<<<<< HEAD +======= + "sp-arithmetic 23.0.0", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-weights 27.0.0", + "staging-xcm 7.0.1", + "staging-xcm-executor 7.0.0", + "tracing", +] + +[[package]] +name = "staging-xcm-builder" +version = "17.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3746adbbae27b1e6763f0cca622e15482ebcb94835a9e078c212dd7be896e35" +dependencies = [ + "frame-support 38.0.0", + "frame-system 38.0.0", + "impl-trait-for-tuples", + "log", + "pallet-asset-conversion 20.0.0", + "pallet-transaction-payment 38.0.0", + "parity-scale-codec", + "polkadot-parachain-primitives 14.0.0", + "scale-info", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "sp-arithmetic 26.0.0", "sp-core 35.0.0", "sp-io 39.0.0", @@ -23591,8 +25814,34 @@ name = "staging-xcm-executor" version = "18.0.1" dependencies = [ "environmental", +<<<<<<< HEAD "frame-benchmarking", "frame-support", +======= + "frame-benchmarking 28.0.0", + "frame-support 28.0.0", + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", + "sp-arithmetic 23.0.0", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-weights 27.0.0", + "staging-xcm 7.0.1", + "tracing", +] + +[[package]] +name = "staging-xcm-executor" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79dd0c5332a5318e58f0300b20768b71cf9427c906f94a743c9dc7c3ee9e7fa9" +dependencies = [ + "environmental", + "frame-benchmarking 38.0.0", + "frame-support 38.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "impl-trait-for-tuples", "parity-scale-codec", "scale-info", @@ -24754,9 +27003,31 @@ dependencies = [ "polkadot-core-primitives", "rococo-runtime-constants", "smallvec", +<<<<<<< HEAD "sp-runtime 40.1.0", "staging-xcm", "westend-runtime-constants", +======= + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", + "westend-runtime-constants 7.0.0", +] + +[[package]] +name = "testnet-parachains-constants" +version = "10.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94bceae6f7c89d47daff6c7e05f712551a01379f61b07d494661941144878589" +dependencies = [ + "cumulus-primitives-core 0.16.0", + "frame-support 38.0.0", + "polkadot-core-primitives 15.0.0", + "rococo-runtime-constants 17.0.0", + "smallvec", + "sp-runtime 39.0.2", + "staging-xcm 14.2.0", + "westend-runtime-constants 17.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -26570,6 +28841,7 @@ dependencies = [ "parachains-common", "polkadot-primitives", "sc-consensus-grandpa", +<<<<<<< HEAD "sp-authority-discovery", "sp-consensus-babe", "sp-consensus-beefy", @@ -26579,6 +28851,17 @@ dependencies = [ "westend-runtime", "westend-runtime-constants", "xcm-runtime-apis", +======= + "sp-authority-discovery 26.0.0", + "sp-consensus-babe 0.32.0", + "sp-consensus-beefy 13.0.0", + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "staging-xcm 7.0.1", + "westend-runtime", + "westend-runtime-constants 7.0.0", + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -26662,6 +28945,7 @@ dependencies = [ "serde_derive", "serde_json", "smallvec", +<<<<<<< HEAD "sp-api 35.0.0", "sp-application-crypto 39.0.0", "sp-arithmetic 26.0.0", @@ -26693,6 +28977,39 @@ dependencies = [ "tokio", "westend-runtime-constants", "xcm-runtime-apis", +======= + "sp-api 26.0.0", + "sp-application-crypto 30.0.0", + "sp-arithmetic 23.0.0", + "sp-authority-discovery 26.0.0", + "sp-block-builder 26.0.0", + "sp-consensus-babe 0.32.0", + "sp-consensus-beefy 13.0.0", + "sp-consensus-grandpa 13.0.0", + "sp-core 28.0.0", + "sp-genesis-builder 0.8.0", + "sp-inherents 26.0.0", + "sp-io 30.0.0", + "sp-keyring 31.0.0", + "sp-mmr-primitives 26.0.0", + "sp-npos-elections 26.0.0", + "sp-offchain 26.0.0", + "sp-runtime 31.0.1", + "sp-session 27.0.0", + "sp-staking 26.0.0", + "sp-storage 19.0.0", + "sp-tracing 16.0.0", + "sp-transaction-pool 26.0.0", + "sp-version 29.0.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "substrate-wasm-builder 17.0.0", + "tiny-keccak", + "tokio", + "westend-runtime-constants 7.0.0", + "xcm-runtime-apis 0.1.1", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -26703,8 +29020,30 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime-common", "smallvec", +<<<<<<< HEAD "sp-core 35.0.0", "sp-runtime 40.1.0", +======= + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "sp-weights 27.0.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", +] + +[[package]] +name = "westend-runtime-constants" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06861bf945aadac59f4be23b44c85573029520ea9bd3d6c9ab21c8b306e81cdc" +dependencies = [ + "frame-support 38.0.0", + "polkadot-primitives 16.0.0", + "polkadot-runtime-common 17.0.0", + "smallvec", + "sp-core 34.0.0", + "sp-runtime 39.0.2", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "sp-weights 31.0.0", "staging-xcm", "staging-xcm-builder", @@ -27173,9 +29512,15 @@ dependencies = [ "sp-io 39.0.0", "sp-runtime 40.1.0", "sp-std 14.0.0", +<<<<<<< HEAD "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", +======= + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "test-log", "xcm-simulator", ] @@ -27208,9 +29553,15 @@ dependencies = [ "sp-io 39.0.0", "sp-runtime 40.1.0", "sp-std 14.0.0", +<<<<<<< HEAD "sp-tracing 17.0.1", "staging-xcm", "staging-xcm-executor", +======= + "sp-tracing 16.0.0", + "staging-xcm 7.0.1", + "staging-xcm-executor 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -27229,6 +29580,7 @@ dependencies = [ "polkadot-test-runtime", "polkadot-test-service", "sp-consensus", +<<<<<<< HEAD "sp-core 35.0.0", "sp-keyring", "sp-runtime 40.1.0", @@ -27236,6 +29588,15 @@ dependencies = [ "sp-tracing 17.0.1", "staging-xcm", "staging-xcm-executor", +======= + "sp-core 28.0.0", + "sp-keyring 31.0.0", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", + "sp-tracing 16.0.0", + "staging-xcm 7.0.1", + "staging-xcm-executor 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -27243,17 +29604,29 @@ name = "xcm-procedural" version = "11.0.0" dependencies = [ "Inflector", +<<<<<<< HEAD "frame-support", "proc-macro2 1.0.86", "quote 1.0.37", "staging-xcm", "syn 2.0.87", +======= + "frame-support 28.0.0", + "proc-macro2 1.0.93", + "quote 1.0.38", + "staging-xcm 7.0.1", + "syn 2.0.98", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "trybuild", ] [[package]] name = "xcm-runtime-apis" +<<<<<<< HEAD version = "0.5.0" +======= +version = "0.1.1" +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) dependencies = [ "frame-executive", "frame-support", @@ -27265,9 +29638,31 @@ dependencies = [ "pallet-xcm", "parity-scale-codec", "scale-info", +<<<<<<< HEAD "sp-api 35.0.0", "sp-io 39.0.0", "sp-tracing 17.0.1", +======= + "sp-api 26.0.0", + "sp-io 30.0.0", + "sp-tracing 16.0.0", + "sp-weights 27.0.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", +] + +[[package]] +name = "xcm-runtime-apis" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d4473a5d157e4d437d9ebcb1b99f9693a64983877ee57d97005f0167869935" +dependencies = [ + "frame-support 38.0.0", + "parity-scale-codec", + "scale-info", + "sp-api 34.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) "sp-weights 31.0.0", "staging-xcm", "staging-xcm-builder", @@ -27290,9 +29685,38 @@ dependencies = [ "sp-io 39.0.0", "sp-runtime 40.1.0", "sp-std 14.0.0", +<<<<<<< HEAD "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", +======= + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", +] + +[[package]] +name = "xcm-simulator" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "058e21bfc3e1180bbd83cad3690d0e63f34f43ab309e338afe988160aa776fcf" +dependencies = [ + "frame-support 38.0.0", + "frame-system 38.0.0", + "parity-scale-codec", + "paste", + "polkadot-core-primitives 15.0.0", + "polkadot-parachain-primitives 14.0.0", + "polkadot-primitives 16.0.0", + "polkadot-runtime-parachains 17.0.1", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "staging-xcm 14.2.0", + "staging-xcm-builder 17.0.1", + "staging-xcm-executor 17.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -27315,11 +29739,19 @@ dependencies = [ "sp-io 39.0.0", "sp-runtime 40.1.0", "sp-std 14.0.0", +<<<<<<< HEAD "sp-tracing 17.0.1", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", "xcm-simulator", +======= + "sp-tracing 16.0.0", + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "xcm-simulator 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] @@ -27344,10 +29776,17 @@ dependencies = [ "sp-io 39.0.0", "sp-runtime 40.1.0", "sp-std 14.0.0", +<<<<<<< HEAD "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", "xcm-simulator", +======= + "staging-xcm 7.0.1", + "staging-xcm-builder 7.0.0", + "staging-xcm-executor 7.0.0", + "xcm-simulator 7.0.0", +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) ] [[package]] diff --git a/cumulus/pallets/xcmp-queue/Cargo.toml b/cumulus/pallets/xcmp-queue/Cargo.toml index 643cb9d887050..69b7c6441297b 100644 --- a/cumulus/pallets/xcmp-queue/Cargo.toml +++ b/cumulus/pallets/xcmp-queue/Cargo.toml @@ -1,6 +1,10 @@ [package] name = "cumulus-pallet-xcmp-queue" +<<<<<<< HEAD version = "0.18.1" +======= +version = "0.7.1" +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) authors.workspace = true edition.workspace = true description = "Pallet to queue outbound and inbound XCMP messages." diff --git a/cumulus/pallets/xcmp-queue/src/lib.rs b/cumulus/pallets/xcmp-queue/src/lib.rs index 91f71558b54a2..a970a0b785ce5 100644 --- a/cumulus/pallets/xcmp-queue/src/lib.rs +++ b/cumulus/pallets/xcmp-queue/src/lib.rs @@ -1011,6 +1011,12 @@ impl InspectMessageQueues for Pallet { fn clear_messages() { // Best effort. let _ = OutboundXcmpMessages::::clear(u32::MAX, None); + OutboundXcmpStatus::::mutate(|details_vec| { + for details in details_vec { + details.first_index = 0; + details.last_index = 0; + } + }); } fn get_messages() -> Vec<(VersionedLocation, Vec>)> { diff --git a/cumulus/parachains/integration-tests/emulated/common/src/macros.rs b/cumulus/parachains/integration-tests/emulated/common/src/macros.rs index 5b40f681616b2..9b28ce418648e 100644 --- a/cumulus/parachains/integration-tests/emulated/common/src/macros.rs +++ b/cumulus/parachains/integration-tests/emulated/common/src/macros.rs @@ -490,7 +490,7 @@ macro_rules! test_can_estimate_and_pay_exact_fees { (Parent, 100_000_000_000u128), ); let origin = OriginCaller::system(RawOrigin::Signed(sender.clone())); - let result = Runtime::dry_run_call(origin, call).unwrap(); + let result = Runtime::dry_run_call(origin, call, xcm::prelude::XCM_VERSION).unwrap(); let local_xcm = result.local_xcm.unwrap().clone(); let local_xcm_weight = Runtime::query_xcm_weight(local_xcm).unwrap(); local_execution_fees = Runtime::query_weight_to_asset_fee( @@ -635,7 +635,7 @@ macro_rules! test_dry_run_transfer_across_pk_bridge { use frame_support::{dispatch::RawOrigin, traits::fungible}; use sp_runtime::AccountId32; use xcm::prelude::*; - use xcm_runtime_apis::dry_run::runtime_decl_for_dry_run_api::DryRunApiV1; + use xcm_runtime_apis::dry_run::runtime_decl_for_dry_run_api::DryRunApiV2; let who = AccountId32::new([1u8; 32]); let transfer_amount = 10_000_000_000_000u128; @@ -665,7 +665,7 @@ macro_rules! test_dry_run_transfer_across_pk_bridge { fee_asset_item: 0, weight_limit: Unlimited, }); - let result = Runtime::dry_run_call(OriginCaller::system(RawOrigin::Signed(who)), call).unwrap(); + let result = Runtime::dry_run_call(OriginCaller::system(RawOrigin::Signed(who)), call, XCM_VERSION).unwrap(); // We assert the dry run succeeds and sends only one message to the local bridge hub. assert!(result.execution_result.is_ok()); assert_eq!(result.forwarded_xcms.len(), 1); diff --git a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/xcm_fee_estimation.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/xcm_fee_estimation.rs index ea210d4f3b65e..36a3786cd364a 100644 --- a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/xcm_fee_estimation.rs +++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/xcm_fee_estimation.rs @@ -19,7 +19,7 @@ use crate::imports::*; use emulated_integration_tests_common::test_can_estimate_and_pay_exact_fees; use frame_support::dispatch::RawOrigin; use xcm_runtime_apis::{ - dry_run::runtime_decl_for_dry_run_api::DryRunApiV1, + dry_run::runtime_decl_for_dry_run_api::DryRunApiV2, fees::runtime_decl_for_xcm_payment_api::XcmPaymentApiV1, }; @@ -146,7 +146,7 @@ fn multi_hop_works() { let call = transfer_assets_para_to_para_through_ah_call(test.clone()); let origin = OriginCaller::system(RawOrigin::Signed(sender.clone())); - let result = Runtime::dry_run_call(origin, call).unwrap(); + let result = Runtime::dry_run_call(origin, call, xcm::prelude::XCM_VERSION).unwrap(); // We filter the result to get only the messages we are interested in. let (destination_to_query, messages_to_query) = &result .forwarded_xcms diff --git a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/xcm_fee_estimation.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/xcm_fee_estimation.rs index ec05a074c5acf..822de21fa4f64 100644 --- a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/xcm_fee_estimation.rs +++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/xcm_fee_estimation.rs @@ -20,7 +20,7 @@ use crate::imports::*; use emulated_integration_tests_common::test_can_estimate_and_pay_exact_fees; use frame_support::dispatch::RawOrigin; use xcm_runtime_apis::{ - dry_run::runtime_decl_for_dry_run_api::DryRunApiV1, + dry_run::runtime_decl_for_dry_run_api::DryRunApiV2, fees::runtime_decl_for_xcm_payment_api::XcmPaymentApiV1, }; @@ -148,7 +148,7 @@ fn multi_hop_works() { let call = transfer_assets_para_to_para_through_ah_call(test.clone()); let origin = OriginCaller::system(RawOrigin::Signed(sender.clone())); - let result = Runtime::dry_run_call(origin, call).unwrap(); + let result = Runtime::dry_run_call(origin, call, xcm::prelude::XCM_VERSION).unwrap(); // We filter the result to get only the messages we are interested in. let (destination_to_query, messages_to_query) = &result .forwarded_xcms diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs index f9629e126a405..6835267e93680 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs @@ -104,7 +104,8 @@ use xcm::latest::prelude::{ }; use xcm::{ latest::prelude::{AssetId, BodyId}, - VersionedAsset, VersionedAssetId, VersionedAssets, VersionedLocation, VersionedXcm, + Version as XcmVersion, VersionedAsset, VersionedAssetId, VersionedAssets, VersionedLocation, + VersionedXcm, }; use xcm_runtime_apis::{ dry_run::{CallDryRunEffects, Error as XcmDryRunApiError, XcmDryRunEffects}, @@ -1470,8 +1471,8 @@ impl_runtime_apis! { } impl xcm_runtime_apis::dry_run::DryRunApi for Runtime { - fn dry_run_call(origin: OriginCaller, call: RuntimeCall) -> Result, XcmDryRunApiError> { - PolkadotXcm::dry_run_call::(origin, call) + fn dry_run_call(origin: OriginCaller, call: RuntimeCall, result_xcms_version: XcmVersion) -> Result, XcmDryRunApiError> { + PolkadotXcm::dry_run_call::(origin, call, result_xcms_version) } fn dry_run_xcm(origin_location: VersionedLocation, xcm: VersionedXcm) -> Result, XcmDryRunApiError> { diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs index fcd7c4696c95b..514187e12ceb6 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs @@ -99,6 +99,7 @@ use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate}; use xcm::{ latest::prelude::AssetId, prelude::{VersionedAsset, VersionedAssetId, VersionedAssets, VersionedLocation, VersionedXcm}, + Version as XcmVersion, }; #[cfg(feature = "runtime-benchmarks")] @@ -1587,8 +1588,8 @@ impl_runtime_apis! { } impl xcm_runtime_apis::dry_run::DryRunApi for Runtime { - fn dry_run_call(origin: OriginCaller, call: RuntimeCall) -> Result, XcmDryRunApiError> { - PolkadotXcm::dry_run_call::(origin, call) + fn dry_run_call(origin: OriginCaller, call: RuntimeCall, result_xcms_version: XcmVersion) -> Result, XcmDryRunApiError> { + PolkadotXcm::dry_run_call::(origin, call, result_xcms_version) } fn dry_run_xcm(origin_location: VersionedLocation, xcm: VersionedXcm) -> Result, XcmDryRunApiError> { diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs index 3d03d204f7a48..961ecf1c6edae 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs @@ -95,7 +95,7 @@ use snowbridge_core::{ outbound::{Command, Fee}, AgentId, PricingParameters, }; -use xcm::{latest::prelude::*, prelude::*}; +use xcm::{latest::prelude::*, prelude::*, Version as XcmVersion}; use xcm_runtime_apis::{ dry_run::{CallDryRunEffects, Error as XcmDryRunApiError, XcmDryRunEffects}, fees::Error as XcmPaymentApiError, @@ -872,8 +872,8 @@ impl_runtime_apis! { } impl xcm_runtime_apis::dry_run::DryRunApi for Runtime { - fn dry_run_call(origin: OriginCaller, call: RuntimeCall) -> Result, XcmDryRunApiError> { - PolkadotXcm::dry_run_call::(origin, call) + fn dry_run_call(origin: OriginCaller, call: RuntimeCall, result_xcms_version: XcmVersion) -> Result, XcmDryRunApiError> { + PolkadotXcm::dry_run_call::(origin, call, result_xcms_version) } fn dry_run_xcm(origin_location: VersionedLocation, xcm: VersionedXcm) -> Result, XcmDryRunApiError> { diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs index 5d0069393a63f..90cf2e85aa40e 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs @@ -103,7 +103,7 @@ use snowbridge_core::{ AgentId, PricingParameters, }; use testnet_parachains_constants::westend::{consensus::*, currency::*, fee::WeightToFee, time::*}; -use xcm::VersionedLocation; +use xcm::{Version as XcmVersion, VersionedLocation}; use westend_runtime_constants::system_parachain::{ASSET_HUB_ID, BRIDGE_HUB_ID}; @@ -804,8 +804,8 @@ impl_runtime_apis! { } impl xcm_runtime_apis::dry_run::DryRunApi for Runtime { - fn dry_run_call(origin: OriginCaller, call: RuntimeCall) -> Result, XcmDryRunApiError> { - PolkadotXcm::dry_run_call::(origin, call) + fn dry_run_call(origin: OriginCaller, call: RuntimeCall, result_xcms_version: XcmVersion) -> Result, XcmDryRunApiError> { + PolkadotXcm::dry_run_call::(origin, call, result_xcms_version) } fn dry_run_xcm(origin_location: VersionedLocation, xcm: VersionedXcm) -> Result, XcmDryRunApiError> { diff --git a/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs index d4365713072c4..f1763445d470c 100644 --- a/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs @@ -107,7 +107,7 @@ use pallet_xcm::{EnsureXcm, IsVoiceOfBody}; use polkadot_runtime_common::{ impls::VersionedLocatableAsset, BlockHashCount, SlowAdjustingFeeUpdate, }; -use xcm::prelude::*; +use xcm::{prelude::*, Version as XcmVersion}; use xcm_runtime_apis::{ dry_run::{CallDryRunEffects, Error as XcmDryRunApiError, XcmDryRunEffects}, fees::Error as XcmPaymentApiError, @@ -987,8 +987,8 @@ impl_runtime_apis! { } impl xcm_runtime_apis::dry_run::DryRunApi for Runtime { - fn dry_run_call(origin: OriginCaller, call: RuntimeCall) -> Result, XcmDryRunApiError> { - PolkadotXcm::dry_run_call::(origin, call) + fn dry_run_call(origin: OriginCaller, call: RuntimeCall, result_xcms_version: XcmVersion) -> Result, XcmDryRunApiError> { + PolkadotXcm::dry_run_call::(origin, call, result_xcms_version) } fn dry_run_xcm(origin_location: VersionedLocation, xcm: VersionedXcm) -> Result, XcmDryRunApiError> { diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs index f84f04edf5a1b..6d6c57d554510 100644 --- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs @@ -64,7 +64,7 @@ use parachains_common::{ }; pub use parachains_common::{AuraId, Balance}; use testnet_parachains_constants::rococo::{consensus::*, currency::*, fee::WeightToFee, time::*}; -use xcm::prelude::*; +use xcm::{prelude::*, Version as XcmVersion}; use xcm_config::CollatorSelectionUpdateOrigin; use xcm_runtime_apis::{ dry_run::{CallDryRunEffects, Error as XcmDryRunApiError, XcmDryRunEffects}, @@ -630,8 +630,8 @@ impl_runtime_apis! { } impl xcm_runtime_apis::dry_run::DryRunApi for Runtime { - fn dry_run_call(origin: OriginCaller, call: RuntimeCall) -> Result, XcmDryRunApiError> { - PolkadotXcm::dry_run_call::(origin, call) + fn dry_run_call(origin: OriginCaller, call: RuntimeCall, result_xcms_version: XcmVersion) -> Result, XcmDryRunApiError> { + PolkadotXcm::dry_run_call::(origin, call, result_xcms_version) } fn dry_run_xcm(origin_location: VersionedLocation, xcm: VersionedXcm) -> Result, XcmDryRunApiError> { diff --git a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs index 8f71336495c51..d9e73d0694ad1 100644 --- a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs @@ -77,7 +77,7 @@ use sp_version::NativeVersion; use sp_version::RuntimeVersion; use testnet_parachains_constants::rococo::{consensus::*, currency::*, fee::WeightToFee, time::*}; use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight}; -use xcm::prelude::*; +use xcm::{prelude::*, Version as XcmVersion}; use xcm_config::{ FellowshipLocation, GovernanceLocation, RocRelayLocation, XcmOriginToTransactDispatchOrigin, }; @@ -839,8 +839,8 @@ impl_runtime_apis! { } impl xcm_runtime_apis::dry_run::DryRunApi for Runtime { - fn dry_run_call(origin: OriginCaller, call: RuntimeCall) -> Result, XcmDryRunApiError> { - PolkadotXcm::dry_run_call::(origin, call) + fn dry_run_call(origin: OriginCaller, call: RuntimeCall, result_xcms_version: XcmVersion) -> Result, XcmDryRunApiError> { + PolkadotXcm::dry_run_call::(origin, call, result_xcms_version) } fn dry_run_xcm(origin_location: VersionedLocation, xcm: VersionedXcm) -> Result, XcmDryRunApiError> { diff --git a/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs b/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs index dfa72379f657a..47dd9ba5627b9 100644 --- a/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs @@ -77,7 +77,7 @@ use sp_version::NativeVersion; use sp_version::RuntimeVersion; use testnet_parachains_constants::westend::{consensus::*, currency::*, fee::WeightToFee, time::*}; use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight}; -use xcm::prelude::*; +use xcm::{prelude::*, Version as XcmVersion}; use xcm_config::{ FellowshipLocation, GovernanceLocation, TokenRelayLocation, XcmOriginToTransactDispatchOrigin, }; @@ -831,8 +831,8 @@ impl_runtime_apis! { } impl xcm_runtime_apis::dry_run::DryRunApi for Runtime { - fn dry_run_call(origin: OriginCaller, call: RuntimeCall) -> Result, XcmDryRunApiError> { - PolkadotXcm::dry_run_call::(origin, call) + fn dry_run_call(origin: OriginCaller, call: RuntimeCall, result_xcms_version: XcmVersion) -> Result, XcmDryRunApiError> { + PolkadotXcm::dry_run_call::(origin, call, result_xcms_version) } fn dry_run_xcm(origin_location: VersionedLocation, xcm: VersionedXcm) -> Result, XcmDryRunApiError> { diff --git a/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs b/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs index 6c8b9e514bdfb..7358402a9f781 100644 --- a/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs @@ -69,7 +69,7 @@ use sp_version::NativeVersion; use sp_version::RuntimeVersion; use testnet_parachains_constants::rococo::{consensus::*, currency::*, fee::WeightToFee, time::*}; use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight}; -use xcm::prelude::*; +use xcm::{prelude::*, Version as XcmVersion}; use xcm_config::{ FellowshipLocation, GovernanceLocation, PriceForSiblingParachainDelivery, XcmConfig, XcmOriginToTransactDispatchOrigin, @@ -807,8 +807,8 @@ impl_runtime_apis! { } impl xcm_runtime_apis::dry_run::DryRunApi for Runtime { - fn dry_run_call(origin: OriginCaller, call: RuntimeCall) -> Result, XcmDryRunApiError> { - PolkadotXcm::dry_run_call::(origin, call) + fn dry_run_call(origin: OriginCaller, call: RuntimeCall, result_xcms_version: XcmVersion) -> Result, XcmDryRunApiError> { + PolkadotXcm::dry_run_call::(origin, call, result_xcms_version) } fn dry_run_xcm(origin_location: VersionedLocation, xcm: VersionedXcm) -> Result, XcmDryRunApiError> { diff --git a/cumulus/parachains/runtimes/people/people-westend/src/lib.rs b/cumulus/parachains/runtimes/people/people-westend/src/lib.rs index 1c0ad10c581a6..7e1aceb8bcc07 100644 --- a/cumulus/parachains/runtimes/people/people-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/people/people-westend/src/lib.rs @@ -69,7 +69,7 @@ use sp_version::NativeVersion; use sp_version::RuntimeVersion; use testnet_parachains_constants::westend::{consensus::*, currency::*, fee::WeightToFee, time::*}; use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight}; -use xcm::prelude::*; +use xcm::{prelude::*, Version as XcmVersion}; use xcm_config::{ FellowshipLocation, GovernanceLocation, PriceForSiblingParachainDelivery, XcmConfig, XcmOriginToTransactDispatchOrigin, @@ -805,8 +805,8 @@ impl_runtime_apis! { } impl xcm_runtime_apis::dry_run::DryRunApi for Runtime { - fn dry_run_call(origin: OriginCaller, call: RuntimeCall) -> Result, XcmDryRunApiError> { - PolkadotXcm::dry_run_call::(origin, call) + fn dry_run_call(origin: OriginCaller, call: RuntimeCall, result_xcms_version: XcmVersion) -> Result, XcmDryRunApiError> { + PolkadotXcm::dry_run_call::(origin, call, result_xcms_version) } fn dry_run_xcm(origin_location: VersionedLocation, xcm: VersionedXcm) -> Result, XcmDryRunApiError> { diff --git a/cumulus/parachains/runtimes/testing/penpal/src/lib.rs b/cumulus/parachains/runtimes/testing/penpal/src/lib.rs index b51670c792d6b..2e51eb8c03669 100644 --- a/cumulus/parachains/runtimes/testing/penpal/src/lib.rs +++ b/cumulus/parachains/runtimes/testing/penpal/src/lib.rs @@ -40,7 +40,6 @@ use assets_common::{ local_and_foreign_assets::{LocalFromLeft, TargetFromLeft}, AssetIdForTrustBackedAssetsConvert, }; -use codec::Encode; use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; use cumulus_primitives_core::{AggregateMessageOrigin, ClaimQueueOffset, CoreSelector, ParaId}; use frame_support::{ @@ -75,7 +74,7 @@ pub use sp_consensus_aura::sr25519::AuthorityId as AuraId; use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; use sp_runtime::{ generic, impl_opaque_keys, - traits::{AccountIdConversion, AccountIdLookup, BlakeTwo256, Block as BlockT, Dispatchable}, + traits::{AccountIdConversion, AccountIdLookup, BlakeTwo256, Block as BlockT}, transaction_validity::{TransactionSource, TransactionValidity}, ApplyExtrinsicResult, }; @@ -93,7 +92,8 @@ use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate}; use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight}; use xcm::{ latest::prelude::{AssetId as AssetLocationId, BodyId}, - VersionedAsset, VersionedAssetId, VersionedAssets, VersionedLocation, VersionedXcm, + Version as XcmVersion, VersionedAsset, VersionedAssetId, VersionedAssets, VersionedLocation, + VersionedXcm, }; use xcm_runtime_apis::{ dry_run::{CallDryRunEffects, Error as XcmDryRunApiError, XcmDryRunEffects}, @@ -1023,61 +1023,12 @@ impl_runtime_apis! { } impl xcm_runtime_apis::dry_run::DryRunApi for Runtime { - fn dry_run_call(origin: OriginCaller, call: RuntimeCall) -> Result, XcmDryRunApiError> { - use xcm_builder::InspectMessageQueues; - use xcm_executor::RecordXcm; - use xcm::prelude::*; - pallet_xcm::Pallet::::set_record_xcm(true); - frame_system::Pallet::::reset_events(); // To make sure we only record events from current call. - let result = call.dispatch(origin.into()); - pallet_xcm::Pallet::::set_record_xcm(false); - let local_xcm = pallet_xcm::Pallet::::recorded_xcm(); - let forwarded_xcms = xcm_config::XcmRouter::get_messages(); - let events: Vec = System::read_events_no_consensus().map(|record| record.event.clone()).collect(); - Ok(CallDryRunEffects { - local_xcm: local_xcm.map(VersionedXcm::<()>::from), - forwarded_xcms, - emitted_events: events, - execution_result: result, - }) + fn dry_run_call(origin: OriginCaller, call: RuntimeCall, result_xcms_version: XcmVersion) -> Result, XcmDryRunApiError> { + PolkadotXcm::dry_run_call::(origin, call, result_xcms_version) } - fn dry_run_xcm(origin_location: VersionedLocation, program: VersionedXcm) -> Result, XcmDryRunApiError> { - use xcm_builder::InspectMessageQueues; - use xcm::prelude::*; - - let origin_location: Location = origin_location.try_into().map_err(|error| { - log::error!( - target: "xcm::DryRunApi::dry_run_xcm", - "Location version conversion failed with error: {:?}", - error, - ); - XcmDryRunApiError::VersionedConversionFailed - })?; - let program: Xcm = program.try_into().map_err(|error| { - log::error!( - target: "xcm::DryRunApi::dry_run_xcm", - "Xcm version conversion failed with error {:?}", - error, - ); - XcmDryRunApiError::VersionedConversionFailed - })?; - let mut hash = program.using_encoded(sp_core::hashing::blake2_256); - frame_system::Pallet::::reset_events(); // To make sure we only record events from current call. - let result = xcm_executor::XcmExecutor::::prepare_and_execute( - origin_location, - program, - &mut hash, - Weight::MAX, // Max limit. - Weight::zero(), - ); - let forwarded_xcms = xcm_config::XcmRouter::get_messages(); - let events: Vec = System::read_events_no_consensus().map(|record| record.event.clone()).collect(); - Ok(XcmDryRunEffects { - forwarded_xcms, - emitted_events: events, - execution_result: result, - }) + fn dry_run_xcm(origin_location: VersionedLocation, xcm: VersionedXcm) -> Result, XcmDryRunApiError> { + PolkadotXcm::dry_run_xcm::(origin_location, xcm) } } diff --git a/polkadot/node/service/Cargo.toml b/polkadot/node/service/Cargo.toml index e4bf51c15e3de..04146b4f53aae 100644 --- a/polkadot/node/service/Cargo.toml +++ b/polkadot/node/service/Cargo.toml @@ -1,7 +1,11 @@ [package] name = "polkadot-service" rust-version = "1.60" +<<<<<<< HEAD version = "22.0.1" +======= +version = "7.0.1" +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/polkadot/node/service/src/fake_runtime_api.rs b/polkadot/node/service/src/fake_runtime_api.rs index d8f147a9cf7b5..4e31c72d334f7 100644 --- a/polkadot/node/service/src/fake_runtime_api.rs +++ b/polkadot/node/service/src/fake_runtime_api.rs @@ -44,7 +44,9 @@ use sp_runtime::{ use sp_version::RuntimeVersion; use sp_weights::Weight; use std::collections::BTreeMap; -use xcm::{VersionedAssetId, VersionedAssets, VersionedLocation, VersionedXcm}; +use xcm::{ + Version as XcmVersion, VersionedAssetId, VersionedAssets, VersionedLocation, VersionedXcm, +}; sp_api::decl_runtime_apis! { /// This runtime API is only implemented for the test runtime! pub trait GetLastTimestamp { @@ -447,7 +449,7 @@ sp_api::impl_runtime_apis! { } impl xcm_runtime_apis::dry_run::DryRunApi for Runtime { - fn dry_run_call(_: (), _: ()) -> Result, xcm_runtime_apis::dry_run::Error> { + fn dry_run_call(_: (), _: (), _: XcmVersion) -> Result, xcm_runtime_apis::dry_run::Error> { unimplemented!() } diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs index 4a9d429a01ccb..a16d993cda546 100644 --- a/polkadot/runtime/rococo/src/lib.rs +++ b/polkadot/runtime/rococo/src/lib.rs @@ -113,8 +113,8 @@ use sp_staking::SessionIndex; use sp_version::NativeVersion; use sp_version::RuntimeVersion; use xcm::{ - latest::prelude::*, VersionedAsset, VersionedAssetId, VersionedAssets, VersionedLocation, - VersionedXcm, + latest::prelude::*, Version as XcmVersion, VersionedAsset, VersionedAssetId, VersionedAssets, + VersionedLocation, VersionedXcm, }; use xcm_builder::PayOverXcm; @@ -1895,8 +1895,8 @@ sp_api::impl_runtime_apis! { } impl xcm_runtime_apis::dry_run::DryRunApi for Runtime { - fn dry_run_call(origin: OriginCaller, call: RuntimeCall) -> Result, XcmDryRunApiError> { - XcmPallet::dry_run_call::(origin, call) + fn dry_run_call(origin: OriginCaller, call: RuntimeCall, result_xcms_version: XcmVersion) -> Result, XcmDryRunApiError> { + XcmPallet::dry_run_call::(origin, call, result_xcms_version) } fn dry_run_xcm(origin_location: VersionedLocation, xcm: VersionedXcm) -> Result, XcmDryRunApiError> { diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs index 25e7e653d220a..800886fe6a0c3 100644 --- a/polkadot/runtime/westend/src/lib.rs +++ b/polkadot/runtime/westend/src/lib.rs @@ -109,8 +109,8 @@ use sp_staking::SessionIndex; use sp_version::NativeVersion; use sp_version::RuntimeVersion; use xcm::{ - latest::prelude::*, VersionedAsset, VersionedAssetId, VersionedAssets, VersionedLocation, - VersionedXcm, + latest::prelude::*, Version as XcmVersion, VersionedAsset, VersionedAssetId, VersionedAssets, + VersionedLocation, VersionedXcm, }; use xcm_builder::PayOverXcm; @@ -2465,8 +2465,8 @@ sp_api::impl_runtime_apis! { } impl xcm_runtime_apis::dry_run::DryRunApi for Runtime { - fn dry_run_call(origin: OriginCaller, call: RuntimeCall) -> Result, XcmDryRunApiError> { - XcmPallet::dry_run_call::(origin, call) + fn dry_run_call(origin: OriginCaller, call: RuntimeCall, result_xcms_version: XcmVersion) -> Result, XcmDryRunApiError> { + XcmPallet::dry_run_call::(origin, call, result_xcms_version) } fn dry_run_xcm(origin_location: VersionedLocation, xcm: VersionedXcm) -> Result, XcmDryRunApiError> { diff --git a/polkadot/xcm/Cargo.toml b/polkadot/xcm/Cargo.toml index 87910cd4a456b..292a8d701b79f 100644 --- a/polkadot/xcm/Cargo.toml +++ b/polkadot/xcm/Cargo.toml @@ -1,7 +1,11 @@ [package] name = "staging-xcm" description = "The basic XCM datastructures." +<<<<<<< HEAD version = "15.0.1" +======= +version = "7.0.1" +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/polkadot/xcm/pallet-xcm/src/lib.rs b/polkadot/xcm/pallet-xcm/src/lib.rs index 5a75e4a1d0d3b..4f7ec0daf3ef7 100644 --- a/polkadot/xcm/pallet-xcm/src/lib.rs +++ b/polkadot/xcm/pallet-xcm/src/lib.rs @@ -2513,6 +2513,7 @@ impl Pallet { pub fn dry_run_call( origin: OriginCaller, call: RuntimeCall, + result_xcms_version: XcmVersion, ) -> Result::RuntimeEvent>, XcmDryRunApiError> where Runtime: crate::Config, @@ -2527,9 +2528,28 @@ impl Pallet { frame_system::Pallet::::reset_events(); let result = call.dispatch(origin.into()); crate::Pallet::::set_record_xcm(false); - let local_xcm = crate::Pallet::::recorded_xcm(); + let local_xcm = crate::Pallet::::recorded_xcm() + .map(|xcm| VersionedXcm::<()>::from(xcm).into_version(result_xcms_version)) + .transpose() + .map_err(|()| { + tracing::error!( + target: "xcm::DryRunApi::dry_run_call", + "Local xcm version conversion failed" + ); + + XcmDryRunApiError::VersionedConversionFailed + })?; + // Should only get messages from this call since we cleared previous ones. - let forwarded_xcms = Router::get_messages(); + let forwarded_xcms = + Self::convert_forwarded_xcms(result_xcms_version, Router::get_messages()).inspect_err( + |error| { + tracing::error!( + target: "xcm::DryRunApi::dry_run_call", + ?error, "Forwarded xcms version conversion failed with error" + ); + }, + )?; let events: Vec<::RuntimeEvent> = frame_system::Pallet::::read_events_no_consensus() .map(|record| record.event.clone()) @@ -2562,6 +2582,7 @@ impl Pallet { ); XcmDryRunApiError::VersionedConversionFailed })?; + let xcm_version = xcm.identify_version(); let xcm: Xcm = xcm.try_into().map_err(|error| { tracing::error!( target: "xcm::DryRunApi::dry_run_xcm", @@ -2570,7 +2591,11 @@ impl Pallet { XcmDryRunApiError::VersionedConversionFailed })?; let mut hash = xcm.using_encoded(sp_io::hashing::blake2_256); - frame_system::Pallet::::reset_events(); // To make sure we only record events from current call. + + // To make sure we only record events from current call. + Router::clear_messages(); + frame_system::Pallet::::reset_events(); + let result = xcm_executor::XcmExecutor::::prepare_and_execute( origin_location, xcm, @@ -2578,7 +2603,13 @@ impl Pallet { Weight::MAX, // Max limit available for execution. Weight::zero(), ); - let forwarded_xcms = Router::get_messages(); + let forwarded_xcms = Self::convert_forwarded_xcms(xcm_version, Router::get_messages()) + .inspect_err(|error| { + tracing::error!( + target: "xcm::DryRunApi::dry_run_xcm", + ?error, "Forwarded xcms version conversion failed with error" + ); + })?; let events: Vec<::RuntimeEvent> = frame_system::Pallet::::read_events_no_consensus() .map(|record| record.event.clone()) @@ -2586,6 +2617,31 @@ impl Pallet { Ok(XcmDryRunEffects { forwarded_xcms, emitted_events: events, execution_result: result }) } + fn convert_xcms( + xcm_version: XcmVersion, + xcms: Vec>, + ) -> Result>, ()> { + xcms.into_iter() + .map(|xcm| xcm.into_version(xcm_version)) + .collect::, ()>>() + } + + fn convert_forwarded_xcms( + xcm_version: XcmVersion, + forwarded_xcms: Vec<(VersionedLocation, Vec>)>, + ) -> Result>)>, XcmDryRunApiError> { + forwarded_xcms + .into_iter() + .map(|(dest, forwarded_xcms)| { + let dest = dest.into_version(xcm_version)?; + let forwarded_xcms = Self::convert_xcms(xcm_version, forwarded_xcms)?; + + Ok((dest, forwarded_xcms)) + }) + .collect::, ()>>() + .map_err(|()| XcmDryRunApiError::VersionedConversionFailed) + } + /// Given a list of asset ids, returns the correct API response for /// `XcmPaymentApi::query_acceptable_payment_assets`. /// diff --git a/polkadot/xcm/src/lib.rs b/polkadot/xcm/src/lib.rs index a41a8e797b0f7..b88b65ad6c768 100644 --- a/polkadot/xcm/src/lib.rs +++ b/polkadot/xcm/src/lib.rs @@ -522,6 +522,9 @@ pub mod prelude { VersionedAssetId, VersionedAssets, VersionedInteriorLocation, VersionedLocation, VersionedResponse, VersionedXcm, WrapVersion, }; + + /// The minimal supported XCM version + pub const MIN_XCM_VERSION: XcmVersion = 3; } pub mod opaque { diff --git a/polkadot/xcm/xcm-runtime-apis/Cargo.toml b/polkadot/xcm/xcm-runtime-apis/Cargo.toml index c00b8ee0b853b..ae4a9d9a897d8 100644 --- a/polkadot/xcm/xcm-runtime-apis/Cargo.toml +++ b/polkadot/xcm/xcm-runtime-apis/Cargo.toml @@ -1,6 +1,10 @@ [package] name = "xcm-runtime-apis" +<<<<<<< HEAD version = "0.5.0" +======= +version = "0.1.1" +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) authors.workspace = true edition.workspace = true license = "Apache-2.0" diff --git a/polkadot/xcm/xcm-runtime-apis/src/dry_run.rs b/polkadot/xcm/xcm-runtime-apis/src/dry_run.rs index f0a70b0dacfe1..87ec94db54e93 100644 --- a/polkadot/xcm/xcm-runtime-apis/src/dry_run.rs +++ b/polkadot/xcm/xcm-runtime-apis/src/dry_run.rs @@ -57,13 +57,18 @@ sp_api::decl_runtime_apis! { /// Calls or XCMs might fail when executed, this doesn't mean the result of these calls will be an `Err`. /// In those cases, there might still be a valid result, with the execution error inside it. /// The only reasons why these calls might return an error are listed in the [`Error`] enum. + #[api_version(2)] pub trait DryRunApi where Call: Encode, Event: Decode, OriginCaller: Encode { - /// Dry run call. + /// Dry run call V2. + fn dry_run_call(origin: OriginCaller, call: Call, result_xcms_version: XcmVersion) -> Result, Error>; + + /// Dry run call V1. + #[changed_in(2)] fn dry_run_call(origin: OriginCaller, call: Call) -> Result, Error>; /// Dry run XCM program diff --git a/polkadot/xcm/xcm-runtime-apis/tests/fee_estimation.rs b/polkadot/xcm/xcm-runtime-apis/tests/fee_estimation.rs index 2d14b4e571c67..edf82ae3c36c4 100644 --- a/polkadot/xcm/xcm-runtime-apis/tests/fee_estimation.rs +++ b/polkadot/xcm/xcm-runtime-apis/tests/fee_estimation.rs @@ -20,7 +20,10 @@ use frame_support::sp_runtime::testing::H256; use frame_system::RawOrigin; use sp_api::ProvideRuntimeApi; use xcm::prelude::*; -use xcm_runtime_apis::{dry_run::DryRunApi, fees::XcmPaymentApi}; +use xcm_runtime_apis::{ + dry_run::{CallDryRunEffects, DryRunApi}, + fees::XcmPaymentApi, +}; mod mock; use mock::{ @@ -62,8 +65,10 @@ fn fee_estimation_for_teleport() { weight_limit: Unlimited, }); let origin = OriginCaller::system(RawOrigin::Signed(who)); - let dry_run_effects = - runtime_api.dry_run_call(H256::zero(), origin, call).unwrap().unwrap(); + let dry_run_effects = runtime_api + .dry_run_call(H256::zero(), origin, call, XCM_VERSION) + .unwrap() + .unwrap(); assert_eq!( dry_run_effects.local_xcm, @@ -193,8 +198,11 @@ fn fee_estimation_for_teleport() { // Reserve Asset Transfer Relay Token // Reserve Asset Transfer Relay Token for fees // Parachain(2000) -------------------------------------------> Parachain(1000) -#[test] -fn dry_run_reserve_asset_transfer() { +fn dry_run_reserve_asset_transfer_common( + input_xcm_version: XcmVersion, + expected_result_xcms_version: XcmVersion, + dry_run_call: impl FnOnce(&TestClient, OriginCaller, RuntimeCall) -> CallDryRunEffects, +) { sp_tracing::init_for_tests(); let who = 1; // AccountId = u64. // Native token used for fees. @@ -202,30 +210,40 @@ fn dry_run_reserve_asset_transfer() { // Relay token is the one we want to transfer. let assets = vec![(1, who, 100)]; // id, account_id, balance. new_test_ext_with_balances_and_assets(balances, assets).execute_with(|| { - let client = TestClient; - let runtime_api = client.runtime_api(); let call = RuntimeCall::XcmPallet(pallet_xcm::Call::transfer_assets { - dest: Box::new(VersionedLocation::from((Parent, Parachain(1000)))), - beneficiary: Box::new(VersionedLocation::from(AccountId32 { - id: [0u8; 32], - network: None, - })), - assets: Box::new(VersionedAssets::from((Parent, 100u128))), + dest: Box::new( + VersionedLocation::from((Parent, Parachain(1000))) + .into_version(input_xcm_version) + .unwrap(), + ), + beneficiary: Box::new( + VersionedLocation::from(AccountId32 { id: [0u8; 32], network: None }) + .into_version(input_xcm_version) + .unwrap(), + ), + assets: Box::new( + VersionedAssets::from((Parent, 100u128)) + .into_version(input_xcm_version) + .unwrap(), + ), fee_asset_item: 0, weight_limit: Unlimited, }); let origin = OriginCaller::system(RawOrigin::Signed(who)); - let dry_run_effects = - runtime_api.dry_run_call(H256::zero(), origin, call).unwrap().unwrap(); + let dry_run_effects = dry_run_call(&TestClient, origin, call); assert_eq!( dry_run_effects.local_xcm, - Some(VersionedXcm::from( - Xcm::builder_unsafe() - .withdraw_asset((Parent, 100u128)) - .burn_asset((Parent, 100u128)) - .build() - )), + Some( + VersionedXcm::from( + Xcm::builder_unsafe() + .withdraw_asset((Parent, 100u128)) + .burn_asset((Parent, 100u128)) + .build() + ) + .into_version(expected_result_xcms_version) + .unwrap() + ), ); // In this case, the transfer type is `DestinationReserve`, so the remote xcm just withdraws @@ -240,8 +258,12 @@ fn dry_run_reserve_asset_transfer() { assert_eq!( dry_run_effects.forwarded_xcms, vec![( - VersionedLocation::from(send_destination.clone()), - vec![VersionedXcm::from(send_message.clone())], + VersionedLocation::from(send_destination.clone()) + .into_version(expected_result_xcms_version) + .unwrap(), + vec![VersionedXcm::from(send_message.clone()) + .into_version(expected_result_xcms_version) + .unwrap()], ),], ); @@ -273,7 +295,49 @@ fn dry_run_reserve_asset_transfer() { } #[test] -fn dry_run_xcm() { +fn dry_run_reserve_asset_transfer_xcm_versions() { + let tested_versions = MIN_XCM_VERSION..=XCM_VERSION; + + for version in tested_versions { + let input_version = version; + let expected_result_xcms_version = version; + dry_run_reserve_asset_transfer_common( + input_version, + expected_result_xcms_version, + |client, origin, call| { + client + .runtime_api() + .dry_run_call(H256::zero(), origin, call, expected_result_xcms_version) + .unwrap() + .unwrap() + }, + ); + } +} + +#[test] +fn dry_run_before_api_v2_reserve_asset_transfer() { + let tested_versions = MIN_XCM_VERSION..=XCM_VERSION; + + for version in tested_versions { + let input_version = version; + let expected_result_xcms_version = XCM_VERSION; + dry_run_reserve_asset_transfer_common( + input_version, + expected_result_xcms_version, + |client, origin, call| { + #[allow(deprecated)] + client + .runtime_api() + .dry_run_call_before_version_2(H256::zero(), origin, call) + .unwrap() + .unwrap() + }, + ); + } +} + +fn dry_run_xcm_common(xcm_version: XcmVersion) { sp_tracing::init_for_tests(); let who = 1; // AccountId = u64. let transfer_amount = 100u128; @@ -291,14 +355,19 @@ fn dry_run_xcm() { let client = TestClient; let runtime_api = client.runtime_api(); let xcm_weight = runtime_api - .query_xcm_weight(H256::zero(), VersionedXcm::from(xcm_to_weigh.clone().into())) + .query_xcm_weight( + H256::zero(), + VersionedXcm::from(xcm_to_weigh.clone().into()) + .into_version(xcm_version) + .unwrap(), + ) .unwrap() .unwrap(); let execution_fees = runtime_api .query_weight_to_asset_fee( H256::zero(), xcm_weight, - VersionedAssetId::from(AssetId(Here.into())), + VersionedAssetId::from(AssetId(Here.into())).into_version(xcm_version).unwrap(), ) .unwrap() .unwrap(); @@ -316,15 +385,19 @@ fn dry_run_xcm() { let dry_run_effects = runtime_api .dry_run_xcm( H256::zero(), - VersionedLocation::from([AccountIndex64 { index: 1, network: None }]), - VersionedXcm::from(xcm), + VersionedLocation::from([AccountIndex64 { index: 1, network: None }]) + .into_version(xcm_version) + .unwrap(), + VersionedXcm::from(xcm).into_version(xcm_version).unwrap(), ) .unwrap() .unwrap(); assert_eq!( dry_run_effects.forwarded_xcms, vec![( - VersionedLocation::from((Parent, Parachain(2100))), + VersionedLocation::from((Parent, Parachain(2100))) + .into_version(xcm_version) + .unwrap(), vec![VersionedXcm::from( Xcm::<()>::builder_unsafe() .reserve_asset_deposited(( @@ -335,7 +408,9 @@ fn dry_run_xcm() { .buy_execution((Here, 1u128), Unlimited) .deposit_asset(AllCounted(1), [0u8; 32]) .build() - )], + ) + .into_version(xcm_version) + .unwrap()], ),] ); @@ -353,3 +428,38 @@ fn dry_run_xcm() { ); }); } +<<<<<<< HEAD +======= + +#[test] +fn dry_run_xcm_versions() { + let tested_versions = [XCM_VERSION, 5, 4, 3]; + + for version in tested_versions { + dry_run_xcm_common(version); + } +} + +#[test] +fn calling_payment_api_with_a_lower_version_works() { + let transfer_amount = 100u128; + let xcm_to_weigh = Xcm::::builder_unsafe() + .withdraw_asset((Here, transfer_amount)) + .buy_execution((Here, transfer_amount), Unlimited) + .deposit_asset(AllCounted(1), [1u8; 32]) + .build(); + let versioned_xcm_to_weigh = VersionedXcm::from(xcm_to_weigh.clone().into()); + let lower_version_xcm_to_weigh = versioned_xcm_to_weigh.into_version(XCM_VERSION - 1).unwrap(); + let client = TestClient; + let runtime_api = client.runtime_api(); + let xcm_weight = + runtime_api.query_xcm_weight(H256::zero(), lower_version_xcm_to_weigh).unwrap(); + assert!(xcm_weight.is_ok()); + let native_token = VersionedAssetId::from(AssetId(Here.into())); + let lower_version_native_token = native_token.into_version(XCM_VERSION - 1).unwrap(); + let execution_fees = runtime_api + .query_weight_to_asset_fee(H256::zero(), xcm_weight.unwrap(), lower_version_native_token) + .unwrap(); + assert!(execution_fees.is_ok()); +} +>>>>>>> 963f0d73 (Fix DryRunApi client-facing XCM versions (#7438)) diff --git a/polkadot/xcm/xcm-runtime-apis/tests/mock.rs b/polkadot/xcm/xcm-runtime-apis/tests/mock.rs index f0a5be908f693..75d9f09c80417 100644 --- a/polkadot/xcm/xcm-runtime-apis/tests/mock.rs +++ b/polkadot/xcm/xcm-runtime-apis/tests/mock.rs @@ -22,7 +22,7 @@ use core::{cell::RefCell, marker::PhantomData}; use frame_support::{ construct_runtime, derive_impl, parameter_types, sp_runtime, sp_runtime::{ - traits::{Dispatchable, Get, IdentityLookup, MaybeEquivalence, TryConvert}, + traits::{Get, IdentityLookup, MaybeEquivalence, TryConvert}, BuildStorage, SaturatedConversion, }, traits::{ @@ -36,8 +36,8 @@ use pallet_xcm::TestWeightInfo; use xcm::{prelude::*, Version as XcmVersion}; use xcm_builder::{ AllowTopLevelPaidExecutionFrom, ConvertedConcreteId, EnsureXcmOrigin, FixedRateOfFungible, - FixedWeightBounds, FungibleAdapter, FungiblesAdapter, IsConcrete, MintLocation, NoChecking, - TakeWeightCredit, + FixedWeightBounds, FungibleAdapter, FungiblesAdapter, InspectMessageQueues, IsConcrete, + MintLocation, NoChecking, TakeWeightCredit, }; use xcm_executor::{ traits::{ConvertLocation, JustTry}, @@ -110,10 +110,6 @@ thread_local! { pub static SENT_XCM: RefCell)>> = const { RefCell::new(Vec::new()) }; } -pub(crate) fn sent_xcm() -> Vec<(Location, Xcm<()>)> { - SENT_XCM.with(|q| (*q.borrow()).clone()) -} - pub struct TestXcmSender; impl SendXcm for TestXcmSender { type Ticket = (Location, Xcm<()>); @@ -131,6 +127,26 @@ impl SendXcm for TestXcmSender { Ok(hash) } } +impl InspectMessageQueues for TestXcmSender { + fn clear_messages() { + SENT_XCM.with(|q| q.borrow_mut().clear()); + } + + fn get_messages() -> Vec<(VersionedLocation, Vec>)> { + SENT_XCM.with(|q| { + (*q.borrow()) + .clone() + .iter() + .map(|(location, message)| { + ( + VersionedLocation::from(location.clone()), + vec![VersionedXcm::from(message.clone())], + ) + }) + .collect() + }) + } +} pub(crate) fn fake_message_hash(message: &Xcm) -> XcmHash { message.using_encoded(sp_io::hashing::blake2_256) @@ -480,64 +496,23 @@ sp_api::mock_impl_runtime_apis! { } impl DryRunApi for RuntimeApi { - fn dry_run_call(origin: OriginCaller, call: RuntimeCall) -> Result, XcmDryRunApiError> { - use xcm_executor::RecordXcm; - pallet_xcm::Pallet::::set_record_xcm(true); - let result = call.dispatch(origin.into()); - pallet_xcm::Pallet::::set_record_xcm(false); - let local_xcm = pallet_xcm::Pallet::::recorded_xcm(); - let forwarded_xcms = sent_xcm() - .into_iter() - .map(|(location, message)| ( - VersionedLocation::from(location), - vec![VersionedXcm::from(message)], - )).collect(); - let events: Vec = System::read_events_no_consensus().map(|record| record.event.clone()).collect(); - Ok(CallDryRunEffects { - local_xcm: local_xcm.map(VersionedXcm::<()>::from), - forwarded_xcms, - emitted_events: events, - execution_result: result, - }) + fn dry_run_call( + origin: OriginCaller, + call: RuntimeCall, + result_xcms_version: XcmVersion, + ) -> Result, XcmDryRunApiError> { + pallet_xcm::Pallet::::dry_run_call::(origin, call, result_xcms_version) + } + + fn dry_run_call_before_version_2( + origin: OriginCaller, + call: RuntimeCall, + ) -> Result, XcmDryRunApiError> { + pallet_xcm::Pallet::::dry_run_call::(origin, call, xcm::latest::VERSION) } fn dry_run_xcm(origin_location: VersionedLocation, xcm: VersionedXcm) -> Result, XcmDryRunApiError> { - let origin_location: Location = origin_location.try_into().map_err(|error| { - log::error!( - target: "xcm::DryRunApi::dry_run_xcm", - "Location version conversion failed with error: {:?}", - error, - ); - XcmDryRunApiError::VersionedConversionFailed - })?; - let xcm: Xcm = xcm.try_into().map_err(|error| { - log::error!( - target: "xcm::DryRunApi::dry_run_xcm", - "Xcm version conversion failed with error {:?}", - error, - ); - XcmDryRunApiError::VersionedConversionFailed - })?; - let mut hash = fake_message_hash(&xcm); - let result = XcmExecutor::::prepare_and_execute( - origin_location, - xcm, - &mut hash, - Weight::MAX, // Max limit available for execution. - Weight::zero(), - ); - let forwarded_xcms = sent_xcm() - .into_iter() - .map(|(location, message)| ( - VersionedLocation::from(location), - vec![VersionedXcm::from(message)], - )).collect(); - let events: Vec = System::events().iter().map(|record| record.event.clone()).collect(); - Ok(XcmDryRunEffects { - forwarded_xcms, - emitted_events: events, - execution_result: result, - }) + pallet_xcm::Pallet::::dry_run_xcm::(origin_location, xcm) } } } diff --git a/prdoc/pr_7438.prdoc b/prdoc/pr_7438.prdoc new file mode 100644 index 0000000000000..10eab04eb699b --- /dev/null +++ b/prdoc/pr_7438.prdoc @@ -0,0 +1,22 @@ +title: Fix DryRunApi client-facing XCM versions + +doc: + - audience: Runtime Dev + description: |- + Fixes https://github.com/paritytech/polkadot-sdk/issues/7413 + + This PR updates the DryRunApi. The signature of the dry_run_call is changed, and the XCM version of the return values of dry_run_xcm now follows the version of the input XCM program. + + It also fixes xcmp-queue's Router's `clear_messages`: the channel details `first_index` and `last_index` are reset when clearing. + +crates: +- name: xcm-runtime-apis + bump: patch +- name: staging-xcm + bump: patch +- name: pallet-xcm + bump: patch +- name: polkadot-service + bump: patch +- name: cumulus-pallet-xcmp-queue + bump: patch