From 16521a7da79a9e7069cb1856b8997a19e23b9102 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Wed, 28 Feb 2024 15:17:05 +0100 Subject: [PATCH] [pallet_xcm] Apply patch for benchmarks https://github.com/paritytech/polkadot-sdk/pull/3465 --- Cargo.lock | 195 +++++++++--------- integration-tests/emulated/helpers/Cargo.toml | 2 +- .../tests/assets/asset-hub-kusama/Cargo.toml | 4 +- .../assets/asset-hub-polkadot/Cargo.toml | 6 +- .../bridges/bridge-hub-kusama/Cargo.toml | 2 +- .../bridges/bridge-hub-polkadot/Cargo.toml | 2 +- relay/kusama/Cargo.toml | 8 +- relay/kusama/constants/Cargo.toml | 4 +- relay/kusama/src/lib.rs | 42 ++-- relay/polkadot/Cargo.toml | 8 +- relay/polkadot/constants/Cargo.toml | 4 +- relay/polkadot/src/lib.rs | 42 ++-- .../asset-hubs/asset-hub-kusama/Cargo.toml | 12 +- .../asset-hubs/asset-hub-kusama/src/lib.rs | 36 ++-- .../asset-hubs/asset-hub-polkadot/Cargo.toml | 12 +- .../asset-hubs/asset-hub-polkadot/src/lib.rs | 36 ++-- .../bridge-hubs/bridge-hub-kusama/Cargo.toml | 12 +- .../bridge-hubs/bridge-hub-kusama/src/lib.rs | 20 +- .../bridge-hub-polkadot/Cargo.toml | 12 +- .../bridge-hub-polkadot/src/lib.rs | 20 +- .../collectives-polkadot/Cargo.toml | 10 +- .../collectives-polkadot/src/lib.rs | 13 ++ .../gluttons/glutton-kusama/Cargo.toml | 4 +- 23 files changed, 295 insertions(+), 211 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d0e611b922..496a1d0aa6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -455,7 +455,7 @@ dependencies = [ "assert_matches", "asset-hub-kusama-runtime", "asset-test-utils", - "cumulus-pallet-parachain-system 0.8.0", + "cumulus-pallet-parachain-system 0.8.1", "emulated-integration-tests-common", "frame-support 29.0.0", "integration-tests-helpers", @@ -464,7 +464,7 @@ dependencies = [ "pallet-assets 30.0.0", "pallet-balances 29.0.0", "pallet-message-queue 32.0.0", - "pallet-xcm 8.0.0", + "pallet-xcm 8.0.1", "parachains-common 8.0.0", "parity-scale-codec", "sp-runtime 32.0.0", @@ -486,12 +486,12 @@ dependencies = [ "bp-bridge-hub-polkadot", "cumulus-pallet-aura-ext 0.8.0", "cumulus-pallet-dmp-queue 0.8.0", - "cumulus-pallet-parachain-system 0.8.0", + "cumulus-pallet-parachain-system 0.8.1", "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm 0.8.0", "cumulus-pallet-xcmp-queue 0.8.0", "cumulus-primitives-core 0.8.0", - "cumulus-primitives-utility 0.8.0", + "cumulus-primitives-utility 0.8.1", "frame-benchmarking 29.0.0", "frame-executive 29.0.0", "frame-support 29.0.0", @@ -522,15 +522,15 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api 29.0.0", "pallet-uniques", "pallet-utility 29.0.0", - "pallet-xcm 8.0.0", - "pallet-xcm-benchmarks 8.0.1", + "pallet-xcm 8.0.1", + "pallet-xcm-benchmarks 8.0.2", "pallet-xcm-bridge-hub-router", "parachains-common 8.0.0", "parachains-runtimes-test-utils", "parity-scale-codec", "polkadot-core-primitives 8.0.0", "polkadot-parachain-primitives 7.0.0", - "polkadot-runtime-common 8.0.0", + "polkadot-runtime-common 8.0.1", "polkadot-runtime-constants", "primitive-types", "scale-info", @@ -551,7 +551,7 @@ dependencies = [ "sp-weights 28.0.0", "staging-parachain-info 0.8.0", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", "staging-xcm-executor 8.0.1", "substrate-wasm-builder 18.0.0", "system-parachains-constants", @@ -577,7 +577,7 @@ dependencies = [ "assert_matches", "asset-hub-polkadot-runtime", "asset-test-utils", - "cumulus-pallet-parachain-system 0.8.0", + "cumulus-pallet-parachain-system 0.8.1", "cumulus-pallet-xcmp-queue 0.8.0", "emulated-integration-tests-common", "frame-support 29.0.0", @@ -586,11 +586,11 @@ dependencies = [ "pallet-balances 29.0.0", "pallet-message-queue 32.0.0", "pallet-treasury 28.0.0", - "pallet-xcm 8.0.0", + "pallet-xcm 8.0.1", "parachains-common 8.0.0", "parity-scale-codec", "polkadot-runtime", - "polkadot-runtime-common 8.0.0", + "polkadot-runtime-common 8.0.1", "polkadot-system-emulated-network", "sp-runtime 32.0.0", "staging-xcm 8.0.0", @@ -610,12 +610,12 @@ dependencies = [ "bp-bridge-hub-polkadot", "cumulus-pallet-aura-ext 0.8.0", "cumulus-pallet-dmp-queue 0.8.0", - "cumulus-pallet-parachain-system 0.8.0", + "cumulus-pallet-parachain-system 0.8.1", "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm 0.8.0", "cumulus-pallet-xcmp-queue 0.8.0", "cumulus-primitives-core 0.8.0", - "cumulus-primitives-utility 0.8.0", + "cumulus-primitives-utility 0.8.1", "frame-benchmarking 29.0.0", "frame-executive 29.0.0", "frame-support 29.0.0", @@ -643,15 +643,15 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api 29.0.0", "pallet-uniques", "pallet-utility 29.0.0", - "pallet-xcm 8.0.0", - "pallet-xcm-benchmarks 8.0.1", + "pallet-xcm 8.0.1", + "pallet-xcm-benchmarks 8.0.2", "pallet-xcm-bridge-hub-router", "parachains-common 8.0.0", "parachains-runtimes-test-utils", "parity-scale-codec", "polkadot-core-primitives 8.0.0", "polkadot-parachain-primitives 7.0.0", - "polkadot-runtime-common 8.0.0", + "polkadot-runtime-common 8.0.1", "polkadot-runtime-constants", "scale-info", "sp-api 27.0.0", @@ -671,7 +671,7 @@ dependencies = [ "sp-weights 28.0.0", "staging-parachain-info 0.8.0", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", "staging-xcm-executor 8.0.1", "substrate-wasm-builder 18.0.0", "system-parachains-constants", @@ -683,7 +683,7 @@ version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d78501ca6b4c848efe233672124ebab9293d8efefc44a728d70f3245a8ef595" dependencies = [ - "cumulus-pallet-parachain-system 0.8.0", + "cumulus-pallet-parachain-system 0.8.1", "cumulus-pallet-xcmp-queue 0.8.0", "cumulus-primitives-core 0.8.0", "frame-support 29.0.0", @@ -692,7 +692,7 @@ dependencies = [ "pallet-balances 29.0.0", "pallet-collator-selection 10.0.0", "pallet-session 29.0.0", - "pallet-xcm 8.0.0", + "pallet-xcm 8.0.1", "pallet-xcm-bridge-hub-router", "parachains-common 8.0.0", "parachains-runtimes-test-utils", @@ -702,7 +702,7 @@ dependencies = [ "sp-std", "staging-parachain-info 0.8.0", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", "staging-xcm-executor 8.0.1", "substrate-wasm-builder 18.0.0", ] @@ -718,7 +718,7 @@ dependencies = [ "impl-trait-for-tuples", "log", "pallet-asset-conversion", - "pallet-xcm 8.0.0", + "pallet-xcm 8.0.1", "parachains-common 8.0.0", "parity-scale-codec", "scale-info", @@ -726,7 +726,7 @@ dependencies = [ "sp-runtime 32.0.0", "sp-std", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", "staging-xcm-executor 8.0.1", "substrate-wasm-builder 18.0.0", ] @@ -1367,7 +1367,7 @@ dependencies = [ "pallet-balances 29.0.0", "pallet-bridge-messages", "pallet-message-queue 32.0.0", - "pallet-xcm 8.0.0", + "pallet-xcm 8.0.1", "parachains-common 8.0.0", "sp-runtime 32.0.0", "staging-xcm 8.0.0", @@ -1394,12 +1394,12 @@ dependencies = [ "bridge-runtime-common", "cumulus-pallet-aura-ext 0.8.0", "cumulus-pallet-dmp-queue 0.8.0", - "cumulus-pallet-parachain-system 0.8.0", + "cumulus-pallet-parachain-system 0.8.1", "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm 0.8.0", "cumulus-pallet-xcmp-queue 0.8.0", "cumulus-primitives-core 0.8.0", - "cumulus-primitives-utility 0.8.0", + "cumulus-primitives-utility 0.8.1", "frame-benchmarking 29.0.0", "frame-executive 29.0.0", "frame-support 29.0.0", @@ -1425,14 +1425,14 @@ dependencies = [ "pallet-transaction-payment 29.0.0", "pallet-transaction-payment-rpc-runtime-api 29.0.0", "pallet-utility 29.0.0", - "pallet-xcm 8.0.0", - "pallet-xcm-benchmarks 8.0.1", + "pallet-xcm 8.0.1", + "pallet-xcm-benchmarks 8.0.2", "pallet-xcm-bridge-hub", "parachains-common 8.0.0", "parity-scale-codec", "polkadot-core-primitives 8.0.0", "polkadot-parachain-primitives 7.0.0", - "polkadot-runtime-common 8.0.0", + "polkadot-runtime-common 8.0.1", "polkadot-runtime-constants", "scale-info", "serde", @@ -1453,7 +1453,7 @@ dependencies = [ "sp-version 30.0.0", "staging-parachain-info 0.8.0", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", "staging-xcm-executor 8.0.1", "static_assertions", "substrate-wasm-builder 18.0.0", @@ -1487,7 +1487,7 @@ dependencies = [ "pallet-balances 29.0.0", "pallet-bridge-messages", "pallet-message-queue 32.0.0", - "pallet-xcm 8.0.0", + "pallet-xcm 8.0.1", "parachains-common 8.0.0", "sp-runtime 32.0.0", "staging-xcm 8.0.0", @@ -1514,12 +1514,12 @@ dependencies = [ "bridge-runtime-common", "cumulus-pallet-aura-ext 0.8.0", "cumulus-pallet-dmp-queue 0.8.0", - "cumulus-pallet-parachain-system 0.8.0", + "cumulus-pallet-parachain-system 0.8.1", "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm 0.8.0", "cumulus-pallet-xcmp-queue 0.8.0", "cumulus-primitives-core 0.8.0", - "cumulus-primitives-utility 0.8.0", + "cumulus-primitives-utility 0.8.1", "frame-benchmarking 29.0.0", "frame-executive 29.0.0", "frame-support 29.0.0", @@ -1545,14 +1545,14 @@ dependencies = [ "pallet-transaction-payment 29.0.0", "pallet-transaction-payment-rpc-runtime-api 29.0.0", "pallet-utility 29.0.0", - "pallet-xcm 8.0.0", - "pallet-xcm-benchmarks 8.0.1", + "pallet-xcm 8.0.1", + "pallet-xcm-benchmarks 8.0.2", "pallet-xcm-bridge-hub", "parachains-common 8.0.0", "parity-scale-codec", "polkadot-core-primitives 8.0.0", "polkadot-parachain-primitives 7.0.0", - "polkadot-runtime-common 8.0.0", + "polkadot-runtime-common 8.0.1", "polkadot-runtime-constants", "scale-info", "serde", @@ -1573,7 +1573,7 @@ dependencies = [ "sp-version 30.0.0", "staging-parachain-info 0.8.0", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", "staging-xcm-executor 8.0.1", "static_assertions", "substrate-wasm-builder 18.0.0", @@ -1594,7 +1594,7 @@ dependencies = [ "bp-runtime", "bp-test-utils", "bridge-runtime-common", - "cumulus-pallet-parachain-system 0.8.0", + "cumulus-pallet-parachain-system 0.8.1", "cumulus-pallet-xcmp-queue 0.8.0", "frame-support 29.0.0", "frame-system 29.0.0", @@ -1616,7 +1616,7 @@ dependencies = [ "sp-std", "sp-tracing", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", "staging-xcm-executor 8.0.1", ] @@ -1653,7 +1653,7 @@ dependencies = [ "sp-std", "sp-trie 30.0.0", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", "static_assertions", ] @@ -2025,12 +2025,12 @@ version = "1.0.0" dependencies = [ "cumulus-pallet-aura-ext 0.8.0", "cumulus-pallet-dmp-queue 0.8.0", - "cumulus-pallet-parachain-system 0.8.0", + "cumulus-pallet-parachain-system 0.8.1", "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm 0.8.0", "cumulus-pallet-xcmp-queue 0.8.0", "cumulus-primitives-core 0.8.0", - "cumulus-primitives-utility 0.8.0", + "cumulus-primitives-utility 0.8.1", "frame-benchmarking 29.0.0", "frame-executive 29.0.0", "frame-support 29.0.0", @@ -2062,12 +2062,12 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api 29.0.0", "pallet-treasury 28.0.0", "pallet-utility 29.0.0", - "pallet-xcm 8.0.0", + "pallet-xcm 8.0.1", "parachains-common 8.0.0", "parity-scale-codec", "polkadot-core-primitives 8.0.0", "polkadot-parachain-primitives 7.0.0", - "polkadot-runtime-common 8.0.0", + "polkadot-runtime-common 8.0.1", "polkadot-runtime-constants", "scale-info", "sp-api 27.0.0", @@ -2086,7 +2086,7 @@ dependencies = [ "sp-version 30.0.0", "staging-parachain-info 0.8.0", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", "staging-xcm-executor 8.0.1", "substrate-wasm-builder 18.0.0", "system-parachains-constants", @@ -2483,7 +2483,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8e78b18548ae3454bc8a46e2bc2e3f521ea547844cbaecc9344d4741f4b1ef" dependencies = [ - "cumulus-pallet-parachain-system 0.8.0", + "cumulus-pallet-parachain-system 0.8.1", "frame-support 29.0.0", "frame-system 29.0.0", "pallet-aura 28.0.0", @@ -2571,9 +2571,9 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c253dcebafba5fa2e98f9d7afc313686ab0f54ab90785347a9de2b62b323f7" +checksum = "1a215fe4d66d23e8f3956bd21b9d80d2b33239f3b150b36d56fa238cfc9421a5" dependencies = [ "bytes", "cumulus-pallet-parachain-system-proc-macro", @@ -2589,6 +2589,7 @@ dependencies = [ "pallet-message-queue 32.0.0", "parity-scale-codec", "polkadot-parachain-primitives 7.0.0", + "polkadot-runtime-common 8.0.1", "polkadot-runtime-parachains 8.0.0", "scale-info", "sp-core 29.0.0", @@ -2706,7 +2707,7 @@ dependencies = [ "log", "pallet-message-queue 32.0.0", "parity-scale-codec", - "polkadot-runtime-common 8.0.0", + "polkadot-runtime-common 8.0.1", "polkadot-runtime-parachains 8.0.0", "scale-info", "sp-core 29.0.0", @@ -2830,23 +2831,22 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "610400dd0bbafde20db3dfccc50540f7ace05e169d93acce2b86008984ea70f7" +checksum = "e65466e56d642f979b556d098a03755ae51972fff5fa0f9b1cdcfdb3df062ea3" dependencies = [ "cumulus-primitives-core 0.8.0", "frame-support 29.0.0", "log", "pallet-asset-conversion", - "pallet-xcm-benchmarks 8.0.1", "parity-scale-codec", - "polkadot-runtime-common 8.0.0", + "polkadot-runtime-common 8.0.1", "polkadot-runtime-parachains 8.0.0", "sp-io 31.0.0", "sp-runtime 32.0.0", "sp-std", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", "staging-xcm-executor 8.0.1", ] @@ -3299,7 +3299,7 @@ dependencies = [ "asset-test-utils", "bp-messages", "bridge-runtime-common", - "cumulus-pallet-parachain-system 0.8.0", + "cumulus-pallet-parachain-system 0.8.1", "cumulus-pallet-xcmp-queue 0.8.0", "cumulus-primitives-core 0.8.0", "frame-support 29.0.0", @@ -3307,7 +3307,7 @@ dependencies = [ "pallet-balances 29.0.0", "pallet-bridge-messages", "pallet-message-queue 32.0.0", - "pallet-xcm 8.0.0", + "pallet-xcm 8.0.1", "parachains-common 8.0.0", "parity-scale-codec", "paste", @@ -4582,7 +4582,7 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" name = "glutton-kusama-runtime" version = "1.0.0" dependencies = [ - "cumulus-pallet-parachain-system 0.8.0", + "cumulus-pallet-parachain-system 0.8.1", "cumulus-pallet-xcm 0.8.0", "cumulus-primitives-core 0.8.0", "frame-benchmarking 29.0.0", @@ -4612,7 +4612,7 @@ dependencies = [ "sp-version 30.0.0", "staging-parachain-info 0.8.0", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", "staging-xcm-executor 8.0.1", "substrate-wasm-builder 18.0.0", "system-parachains-constants", @@ -5109,7 +5109,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue 0.8.0", "pallet-balances 29.0.0", "pallet-message-queue 32.0.0", - "pallet-xcm 8.0.0", + "pallet-xcm 8.0.1", "paste", "staging-xcm 8.0.0", "xcm-emulator", @@ -5421,12 +5421,12 @@ version = "1.0.0" dependencies = [ "frame-support 29.0.0", "polkadot-primitives 8.0.0", - "polkadot-runtime-common 8.0.0", + "polkadot-runtime-common 8.0.1", "smallvec", "sp-core 29.0.0", "sp-runtime 32.0.0", "sp-weights 28.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", ] [[package]] @@ -8928,9 +8928,9 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "8.0.0" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16bda69e8f69123ff81a6d60479fd91b9794f07a24959ced406f5fccbf77482c" +checksum = "2b0bade2eb6ce40af35a5af150692b4e150638f7f68c15735ab9cdf79650d68e" dependencies = [ "bounded-collections 0.2.0", "frame-benchmarking 29.0.0", @@ -8946,7 +8946,7 @@ dependencies = [ "sp-runtime 32.0.0", "sp-std", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", "staging-xcm-executor 8.0.1", ] @@ -8972,9 +8972,9 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "8.0.1" +version = "8.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23fd87994bbe3333ba81436e68b7574e598fe568a06bc59b53a6178c5ce8d71d" +checksum = "3c10e1c92086ce2069a3d2387d9431f48660b6ec92054c4d0a4e30a9f54e7ad3" dependencies = [ "frame-benchmarking 29.0.0", "frame-support 29.0.0", @@ -8986,7 +8986,7 @@ dependencies = [ "sp-runtime 32.0.0", "sp-std", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", "staging-xcm-executor 8.0.1", ] @@ -9010,7 +9010,7 @@ dependencies = [ "sp-runtime 32.0.0", "sp-std", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", "staging-xcm-executor 8.0.1", ] @@ -9031,7 +9031,7 @@ dependencies = [ "sp-runtime 32.0.0", "sp-std", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", ] [[package]] @@ -9079,7 +9079,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34aa00981a24a2b772afaa49e258f9bcd6bb372db060a05614becc1c74d4456" dependencies = [ "cumulus-primitives-core 0.8.0", - "cumulus-primitives-utility 0.8.0", + "cumulus-primitives-utility 0.8.1", "frame-support 29.0.0", "frame-system 29.0.0", "log", @@ -9089,7 +9089,7 @@ dependencies = [ "pallet-balances 29.0.0", "pallet-collator-selection 10.0.0", "pallet-message-queue 32.0.0", - "pallet-xcm 8.0.0", + "pallet-xcm 8.0.1", "parity-scale-codec", "polkadot-primitives 8.0.0", "scale-info", @@ -9110,7 +9110,7 @@ version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d295b9c391ce15f68ddcd7b0d428eb2d3338643a4d1f471b3dd8a15538865e17" dependencies = [ - "cumulus-pallet-parachain-system 0.8.0", + "cumulus-pallet-parachain-system 0.8.1", "cumulus-pallet-xcmp-queue 0.8.0", "cumulus-primitives-core 0.8.0", "cumulus-primitives-parachain-inherent 0.8.0", @@ -9120,7 +9120,7 @@ dependencies = [ "pallet-balances 29.0.0", "pallet-collator-selection 10.0.0", "pallet-session 29.0.0", - "pallet-xcm 8.0.0", + "pallet-xcm 8.0.1", "parity-scale-codec", "polkadot-parachain-primitives 7.0.0", "sp-consensus-aura 0.33.0", @@ -9336,12 +9336,12 @@ checksum = "c804f33306e47153a4bad6a9cd33bbd537fa4b5f9434d505c8a6fc321a0bb71a" dependencies = [ "assets-common", "cumulus-pallet-aura-ext 0.8.0", - "cumulus-pallet-parachain-system 0.8.0", + "cumulus-pallet-parachain-system 0.8.1", "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm 0.8.0", "cumulus-pallet-xcmp-queue 0.8.0", "cumulus-primitives-core 0.8.0", - "cumulus-primitives-utility 0.8.0", + "cumulus-primitives-utility 0.8.1", "frame-benchmarking 29.0.0", "frame-executive 29.0.0", "frame-support 29.0.0", @@ -9362,12 +9362,12 @@ dependencies = [ "pallet-timestamp 28.0.0", "pallet-transaction-payment 29.0.0", "pallet-transaction-payment-rpc-runtime-api 29.0.0", - "pallet-xcm 8.0.0", + "pallet-xcm 8.0.1", "parachains-common 8.0.0", "parity-scale-codec", "polkadot-parachain-primitives 7.0.0", "polkadot-primitives 8.0.0", - "polkadot-runtime-common 8.0.0", + "polkadot-runtime-common 8.0.1", "scale-info", "smallvec", "sp-api 27.0.0", @@ -9385,7 +9385,7 @@ dependencies = [ "sp-version 30.0.0", "staging-parachain-info 0.8.0", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", "staging-xcm-executor 8.0.1", "substrate-wasm-builder 18.0.0", "testnet-parachains-constants", @@ -10459,11 +10459,11 @@ dependencies = [ "pallet-utility 29.0.0", "pallet-vesting 29.0.0", "pallet-whitelist", - "pallet-xcm 8.0.0", - "pallet-xcm-benchmarks 8.0.1", + "pallet-xcm 8.0.1", + "pallet-xcm-benchmarks 8.0.2", "parity-scale-codec", "polkadot-primitives 8.0.0", - "polkadot-runtime-common 8.0.0", + "polkadot-runtime-common 8.0.1", "polkadot-runtime-constants", "polkadot-runtime-parachains 8.0.0", "scale-info", @@ -10494,7 +10494,7 @@ dependencies = [ "sp-trie 30.0.0", "sp-version 30.0.0", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", "staging-xcm-executor 8.0.1", "substrate-wasm-builder 18.0.0", "tokio", @@ -10555,9 +10555,9 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "8.0.0" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4332f736bf9859c2f66d4db0f68f686a764c1e185392ecfc5e98efb53af05af" +checksum = "06afbb3bd10245ad1907242a98ddffc3c0c1e209738b8382bc5bcfc1f28c0429" dependencies = [ "bitvec", "frame-benchmarking 29.0.0", @@ -10582,7 +10582,6 @@ dependencies = [ "pallet-transaction-payment 29.0.0", "pallet-treasury 28.0.0", "pallet-vesting 29.0.0", - "pallet-xcm-benchmarks 8.0.1", "parity-scale-codec", "polkadot-primitives 8.0.0", "polkadot-runtime-parachains 8.0.0", @@ -10601,7 +10600,7 @@ dependencies = [ "sp-staking 27.0.0", "sp-std", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", "staging-xcm-executor 8.0.1", "static_assertions", ] @@ -10612,12 +10611,12 @@ version = "1.0.0" dependencies = [ "frame-support 29.0.0", "polkadot-primitives 8.0.0", - "polkadot-runtime-common 8.0.0", + "polkadot-runtime-common 8.0.1", "smallvec", "sp-core 29.0.0", "sp-runtime 32.0.0", "sp-weights 28.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", ] [[package]] @@ -11641,13 +11640,13 @@ checksum = "0b45c21ccb0f8777512a65510c106aeee4b59682944b9a5cb31cd7b8ed4ccb47" dependencies = [ "frame-support 29.0.0", "polkadot-primitives 8.0.0", - "polkadot-runtime-common 8.0.0", + "polkadot-runtime-common 8.0.1", "smallvec", "sp-core 29.0.0", "sp-runtime 32.0.0", "sp-weights 28.0.0", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", ] [[package]] @@ -14938,11 +14937,11 @@ dependencies = [ "pallet-utility 29.0.0", "pallet-vesting 29.0.0", "pallet-whitelist", - "pallet-xcm 8.0.0", - "pallet-xcm-benchmarks 8.0.1", + "pallet-xcm 8.0.1", + "pallet-xcm-benchmarks 8.0.2", "parity-scale-codec", "polkadot-primitives 8.0.0", - "polkadot-runtime-common 8.0.0", + "polkadot-runtime-common 8.0.1", "polkadot-runtime-parachains 8.0.0", "scale-info", "separator", @@ -14971,7 +14970,7 @@ dependencies = [ "sp-trie 30.0.0", "sp-version 30.0.0", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", "staging-xcm-executor 8.0.1", "substrate-wasm-builder 18.0.0", "tokio", @@ -15070,9 +15069,9 @@ dependencies = [ [[package]] name = "staging-xcm-builder" -version = "8.0.0" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e8c74e3d5b47173a22ad468ab28aeb88cfb92b742fa91a95fe1a8230c2365f" +checksum = "a8f6cfc27c1d45f9a67e20ed3f7e60296299688825350291606add10bf3bbff2" dependencies = [ "frame-support 29.0.0", "frame-system 29.0.0", @@ -16644,13 +16643,13 @@ checksum = "3b080c193714605ce1033311d85035247adca170181cd68a3ad7e3ca87755a14" dependencies = [ "frame-support 29.0.0", "polkadot-primitives 8.0.0", - "polkadot-runtime-common 8.0.0", + "polkadot-runtime-common 8.0.1", "smallvec", "sp-core 29.0.0", "sp-runtime 32.0.0", "sp-weights 28.0.0", "staging-xcm 8.0.0", - "staging-xcm-builder 8.0.0", + "staging-xcm-builder 8.0.1", ] [[package]] @@ -17013,7 +17012,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b49681988880dd6d08a4d5f6b7cb612a0f12172270349655c1e2f870b3526fd" dependencies = [ - "cumulus-pallet-parachain-system 0.8.0", + "cumulus-pallet-parachain-system 0.8.1", "cumulus-pallet-xcmp-queue 0.8.0", "cumulus-primitives-core 0.8.0", "cumulus-primitives-parachain-inherent 0.8.0", diff --git a/integration-tests/emulated/helpers/Cargo.toml b/integration-tests/emulated/helpers/Cargo.toml index e1d6990e1b..b486f9c160 100644 --- a/integration-tests/emulated/helpers/Cargo.toml +++ b/integration-tests/emulated/helpers/Cargo.toml @@ -16,7 +16,7 @@ pallet-message-queue = { version = "32.0.0" } # Polkadot xcm = { package = "staging-xcm", version = "8.0.0" } -pallet-xcm = { version = "8.0.0" } +pallet-xcm = { version = "8.0.1" } # Cumulus xcm-emulator = { version = "0.6.0" } diff --git a/integration-tests/emulated/tests/assets/asset-hub-kusama/Cargo.toml b/integration-tests/emulated/tests/assets/asset-hub-kusama/Cargo.toml index 9fec2e7c04..866b6c5840 100644 --- a/integration-tests/emulated/tests/assets/asset-hub-kusama/Cargo.toml +++ b/integration-tests/emulated/tests/assets/asset-hub-kusama/Cargo.toml @@ -22,13 +22,13 @@ pallet-message-queue = { version = "32.0.0" } # Polkadot xcm = { package = "staging-xcm", version = "8.0.0" } xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" } -pallet-xcm = { version = "8.0.0" } +pallet-xcm = { version = "8.0.1" } # Cumulus parachains-common = { version = "8.0.0" } emulated-integration-tests-common = { version = "4.0.0" } asset-test-utils = { version = "8.0.1" } -cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook"], version = "0.8.0" } +cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook"], version = "0.8.1" } # Local asset-hub-kusama-runtime = { path = "../../../../../system-parachains/asset-hubs/asset-hub-kusama" } diff --git a/integration-tests/emulated/tests/assets/asset-hub-polkadot/Cargo.toml b/integration-tests/emulated/tests/assets/asset-hub-polkadot/Cargo.toml index 7550cb8d47..77b977f577 100644 --- a/integration-tests/emulated/tests/assets/asset-hub-polkadot/Cargo.toml +++ b/integration-tests/emulated/tests/assets/asset-hub-polkadot/Cargo.toml @@ -20,9 +20,9 @@ pallet-treasury = { version = "28.0.0" } pallet-message-queue = { version = "32.0.0" } # Polkadot -polkadot-runtime-common = { version = "8.0.0" } +polkadot-runtime-common = { version = "8.0.1" } xcm = { package = "staging-xcm", version = "8.0.0" } -pallet-xcm = { version = "8.0.0" } +pallet-xcm = { version = "8.0.1" } xcm-executor = { package = "staging-xcm-executor", version = "8.0.1" } # Cumulus @@ -30,7 +30,7 @@ asset-test-utils = { version = "8.0.1" } emulated-integration-tests-common = { version = "4.0.0" } parachains-common = { version = "8.0.0" } cumulus-pallet-xcmp-queue = { version = "0.8.0" } -cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook"], version = "0.8.0" } +cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook"], version = "0.8.1" } # Local asset-hub-polkadot-runtime = { path = "../../../../../system-parachains/asset-hubs/asset-hub-polkadot" } diff --git a/integration-tests/emulated/tests/bridges/bridge-hub-kusama/Cargo.toml b/integration-tests/emulated/tests/bridges/bridge-hub-kusama/Cargo.toml index 66af41fbff..bf134f8400 100644 --- a/integration-tests/emulated/tests/bridges/bridge-hub-kusama/Cargo.toml +++ b/integration-tests/emulated/tests/bridges/bridge-hub-kusama/Cargo.toml @@ -18,7 +18,7 @@ pallet-message-queue = { version = "32.0.0" } # Polkadot xcm = { package = "staging-xcm", version = "8.0.0" } -pallet-xcm = { version = "8.0.0" } +pallet-xcm = { version = "8.0.1" } xcm-executor = { package = "staging-xcm-executor", version = "8.0.1" } # Cumulus diff --git a/integration-tests/emulated/tests/bridges/bridge-hub-polkadot/Cargo.toml b/integration-tests/emulated/tests/bridges/bridge-hub-polkadot/Cargo.toml index 07a87e6e12..18026e77e3 100644 --- a/integration-tests/emulated/tests/bridges/bridge-hub-polkadot/Cargo.toml +++ b/integration-tests/emulated/tests/bridges/bridge-hub-polkadot/Cargo.toml @@ -18,7 +18,7 @@ pallet-message-queue = { version = "32.0.0" } # Polkadot xcm = { package = "staging-xcm", version = "8.0.0" } -pallet-xcm = { version = "8.0.0" } +pallet-xcm = { version = "8.0.1" } xcm-executor = { package = "staging-xcm-executor", version = "8.0.1" } # Cumulus diff --git a/relay/kusama/Cargo.toml b/relay/kusama/Cargo.toml index e9979ae479..a594b4d05c 100644 --- a/relay/kusama/Cargo.toml +++ b/relay/kusama/Cargo.toml @@ -81,8 +81,8 @@ pallet-treasury = { default-features = false , version = "28.0.0" } pallet-utility = { default-features = false , version = "29.0.0" } pallet-vesting = { default-features = false , version = "29.0.0" } pallet-whitelist = { default-features = false , version = "28.0.0" } -pallet-xcm = { default-features = false , version = "8.0.0" } -pallet-xcm-benchmarks = { default-features = false, optional = true , version = "8.0.1" } +pallet-xcm = { default-features = false , version = "8.0.1" } +pallet-xcm-benchmarks = { default-features = false, optional = true , version = "8.0.2" } frame-election-provider-support = { default-features = false , version = "29.0.0" } frame-benchmarking = { default-features = false, optional = true , version = "29.0.0" } @@ -94,13 +94,13 @@ frame-system-benchmarking = { default-features = false, optional = true , versio pallet-election-provider-support-benchmarking = { default-features = false, optional = true , version = "28.0.0" } hex-literal = "0.4.1" -runtime-common = { package = "polkadot-runtime-common", default-features = false, version = "8.0.0" } +runtime-common = { package = "polkadot-runtime-common", default-features = false, version = "8.0.1" } runtime-parachains = { package = "polkadot-runtime-parachains", default-features = false , version = "8.0.0" } primitives = { package = "polkadot-primitives", default-features = false , version = "8.0.0" } xcm = { package = "staging-xcm", default-features = false , version = "8.0.0" } xcm-executor = { package = "staging-xcm-executor", default-features = false , version = "8.0.1" } -xcm-builder = { package = "staging-xcm-builder", default-features = false , version = "8.0.0" } +xcm-builder = { package = "staging-xcm-builder", default-features = false , version = "8.0.1" } sp-debug-derive = { default-features = false, version = "14.0.0" } diff --git a/relay/kusama/constants/Cargo.toml b/relay/kusama/constants/Cargo.toml index f1087781d3..6cc9536760 100644 --- a/relay/kusama/constants/Cargo.toml +++ b/relay/kusama/constants/Cargo.toml @@ -11,12 +11,12 @@ smallvec = "1.13.1" frame-support = { default-features = false , version = "29.0.0" } primitives = { package = "polkadot-primitives", default-features = false , version = "8.0.0" } -runtime-common = { package = "polkadot-runtime-common", default-features = false , version = "8.0.0" } +runtime-common = { package = "polkadot-runtime-common", default-features = false , version = "8.0.1" } sp-runtime = { default-features = false , version = "32.0.0" } sp-weights = { default-features = false , version = "28.0.0" } sp-core = { default-features = false , version = "29.0.0" } -xcm-builder = { package = "staging-xcm-builder", default-features = false , version = "8.0.0" } +xcm-builder = { package = "staging-xcm-builder", default-features = false , version = "8.0.1" } [features] default = [ "std" ] diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs index df98d9dd03..449f2b3300 100644 --- a/relay/kusama/src/lib.rs +++ b/relay/kusama/src/lib.rs @@ -2411,8 +2411,34 @@ sp_api::impl_runtime_apis! { impl pallet_nomination_pools_benchmarking::Config for Runtime {} impl runtime_parachains::disputes::slashing::benchmarking::Config for Runtime {} + parameter_types! { + pub ExistentialDepositAsset: Option = Some(( + TokenLocation::get(), + ExistentialDeposit::get() + ).into()); + pub AssetHubParaId: ParaId = kusama_runtime_constants::system_parachain::ASSET_HUB_ID.into(); + pub const RandomParaId: ParaId = ParaId::new(43211234); + } + use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsiscsBenchmark; impl pallet_xcm::benchmarking::Config for Runtime { + type DeliveryHelper = ( + runtime_common::xcm_sender::ToParachainDeliveryHelper< + XcmConfig, + ExistentialDepositAsset, + xcm_config::PriceForChildParachainDelivery, + AssetHubParaId, + (), + >, + runtime_common::xcm_sender::ToParachainDeliveryHelper< + XcmConfig, + ExistentialDepositAsset, + xcm_config::PriceForChildParachainDelivery, + RandomParaId, + (), + > + ); + fn reachable_dest() -> Option { Some(crate::xcm_config::AssetHubLocation::get()) } @@ -2420,7 +2446,7 @@ sp_api::impl_runtime_apis! { fn teleportable_asset_and_dest() -> Option<(Asset, Location)> { // Relay/native token can be teleported to/from AH. Some(( - Asset { fun: Fungible(EXISTENTIAL_DEPOSIT), id: AssetId(Here.into()) }, + Asset { fun: Fungible(ExistentialDeposit::get()), id: AssetId(Here.into()) }, crate::xcm_config::AssetHubLocation::get(), )) } @@ -2429,10 +2455,10 @@ sp_api::impl_runtime_apis! { // Relay can reserve transfer native token to some random parachain. Some(( Asset { - fun: Fungible(EXISTENTIAL_DEPOSIT), + fun: Fungible(ExistentialDeposit::get()), id: AssetId(Here.into()) }, - crate::Junction::Parachain(43211234).into(), + Parachain(RandomParaId::get().into()).into(), )) } @@ -2451,14 +2477,6 @@ sp_api::impl_runtime_apis! { } } - parameter_types! { - pub ExistentialDepositAsset: Option = Some(( - TokenLocation::get(), - ExistentialDeposit::get() - ).into()); - pub ToParachain: ParaId = kusama_runtime_constants::system_parachain::ASSET_HUB_ID.into(); - } - impl pallet_xcm_benchmarks::Config for Runtime { type XcmConfig = XcmConfig; type AccountIdConverter = SovereignAccountOf; @@ -2466,7 +2484,7 @@ sp_api::impl_runtime_apis! { XcmConfig, ExistentialDepositAsset, xcm_config::PriceForChildParachainDelivery, - ToParachain, + AssetHubParaId, (), >; fn valid_destination() -> Result { diff --git a/relay/polkadot/Cargo.toml b/relay/polkadot/Cargo.toml index a8084b97d2..c7aeb5c806 100644 --- a/relay/polkadot/Cargo.toml +++ b/relay/polkadot/Cargo.toml @@ -79,8 +79,8 @@ pallet-whitelist = { default-features = false , version = "28.0.0" } pallet-vesting = { default-features = false , version = "29.0.0" } pallet-utility = { default-features = false , version = "29.0.0" } frame-election-provider-support = { default-features = false , version = "29.0.0" } -pallet-xcm = { default-features = false, version = "8.0.0" } -pallet-xcm-benchmarks = { default-features = false, optional = true , version = "8.0.1" } +pallet-xcm = { default-features = false, version = "8.0.1" } +pallet-xcm-benchmarks = { default-features = false, optional = true , version = "8.0.2" } frame-benchmarking = { default-features = false, optional = true , version = "29.0.0" } frame-try-runtime = { default-features = false, optional = true , version = "0.35.0" } @@ -90,13 +90,13 @@ pallet-offences-benchmarking = { default-features = false, optional = true , ver pallet-session-benchmarking = { default-features = false, optional = true , version = "29.0.0" } pallet-nomination-pools-benchmarking = { default-features = false, optional = true , version = "27.0.0" } -runtime-common = { package = "polkadot-runtime-common", default-features = false, version = "8.0.0" } +runtime-common = { package = "polkadot-runtime-common", default-features = false, version = "8.0.1" } runtime-parachains = { package = "polkadot-runtime-parachains", default-features = false , version = "8.0.0" } primitives = { package = "polkadot-primitives", default-features = false , version = "8.0.0" } xcm = { package = "staging-xcm", default-features = false , version = "8.0.0" } xcm-executor = { package = "staging-xcm-executor", default-features = false , version = "8.0.1" } -xcm-builder = { package = "staging-xcm-builder", default-features = false , version = "8.0.0" } +xcm-builder = { package = "staging-xcm-builder", default-features = false , version = "8.0.1" } sp-debug-derive = { default-features = false, version = "14.0.0" } diff --git a/relay/polkadot/constants/Cargo.toml b/relay/polkadot/constants/Cargo.toml index 473b2e35b8..0edbbecf33 100644 --- a/relay/polkadot/constants/Cargo.toml +++ b/relay/polkadot/constants/Cargo.toml @@ -11,12 +11,12 @@ smallvec = "1.13.1" frame-support = { default-features = false , version = "29.0.0" } primitives = { package = "polkadot-primitives", default-features = false , version = "8.0.0" } -runtime-common = { package = "polkadot-runtime-common", default-features = false , version = "8.0.0" } +runtime-common = { package = "polkadot-runtime-common", default-features = false , version = "8.0.1" } sp-runtime = { default-features = false , version = "32.0.0" } sp-weights = { default-features = false , version = "28.0.0" } sp-core = { default-features = false , version = "29.0.0" } -xcm-builder = { package = "staging-xcm-builder", default-features = false , version = "8.0.0" } +xcm-builder = { package = "staging-xcm-builder", default-features = false , version = "8.0.1" } [features] default = [ "std" ] diff --git a/relay/polkadot/src/lib.rs b/relay/polkadot/src/lib.rs index 11661cd447..9059a2ddc6 100644 --- a/relay/polkadot/src/lib.rs +++ b/relay/polkadot/src/lib.rs @@ -2298,8 +2298,34 @@ sp_api::impl_runtime_apis! { impl pallet_nomination_pools_benchmarking::Config for Runtime {} impl runtime_parachains::disputes::slashing::benchmarking::Config for Runtime {} + parameter_types! { + pub ExistentialDepositAsset: Option = Some(( + TokenLocation::get(), + ExistentialDeposit::get() + ).into()); + pub AssetHubParaId: ParaId = polkadot_runtime_constants::system_parachain::ASSET_HUB_ID.into(); + pub const RandomParaId: ParaId = ParaId::new(43211234); + } + use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsiscsBenchmark; impl pallet_xcm::benchmarking::Config for Runtime { + type DeliveryHelper = ( + runtime_common::xcm_sender::ToParachainDeliveryHelper< + XcmConfig, + ExistentialDepositAsset, + xcm_config::PriceForChildParachainDelivery, + AssetHubParaId, + (), + >, + runtime_common::xcm_sender::ToParachainDeliveryHelper< + XcmConfig, + ExistentialDepositAsset, + xcm_config::PriceForChildParachainDelivery, + RandomParaId, + (), + > + ); + fn reachable_dest() -> Option { Some(crate::xcm_config::AssetHubLocation::get()) } @@ -2307,7 +2333,7 @@ sp_api::impl_runtime_apis! { fn teleportable_asset_and_dest() -> Option<(Asset, Location)> { // Relay/native token can be teleported to/from AH. Some(( - Asset { fun: Fungible(EXISTENTIAL_DEPOSIT), id: AssetId(Here.into()) }, + Asset { fun: Fungible(ExistentialDeposit::get()), id: AssetId(Here.into()) }, crate::xcm_config::AssetHubLocation::get(), )) } @@ -2316,10 +2342,10 @@ sp_api::impl_runtime_apis! { // Relay can reserve transfer native token to some random parachain. Some(( Asset { - fun: Fungible(EXISTENTIAL_DEPOSIT), + fun: Fungible(ExistentialDeposit::get()), id: AssetId(Here.into()) }, - crate::Junction::Parachain(43211234).into(), + Parachain(RandomParaId::get().into()).into(), )) } @@ -2338,14 +2364,6 @@ sp_api::impl_runtime_apis! { } } - parameter_types! { - pub ExistentialDepositAsset: Option = Some(( - TokenLocation::get(), - ExistentialDeposit::get() - ).into()); - pub ToParachain: ParaId = polkadot_runtime_constants::system_parachain::ASSET_HUB_ID.into(); - } - impl pallet_xcm_benchmarks::Config for Runtime { type XcmConfig = XcmConfig; type AccountIdConverter = SovereignAccountOf; @@ -2353,7 +2371,7 @@ sp_api::impl_runtime_apis! { XcmConfig, ExistentialDepositAsset, xcm_config::PriceForChildParachainDelivery, - ToParachain, + AssetHubParaId, (), >; fn valid_destination() -> Result { diff --git a/system-parachains/asset-hubs/asset-hub-kusama/Cargo.toml b/system-parachains/asset-hubs/asset-hub-kusama/Cargo.toml index 4ab0e63615..2a773ae560 100644 --- a/system-parachains/asset-hubs/asset-hub-kusama/Cargo.toml +++ b/system-parachains/asset-hubs/asset-hub-kusama/Cargo.toml @@ -67,24 +67,24 @@ sp-weights = { default-features = false, version = "28.0.0" } primitive-types = { version = "0.12.2", default-features = false, features = ["codec", "scale-info", "num-traits"] } # Polkadot -pallet-xcm = { default-features = false, version = "8.0.0" } -pallet-xcm-benchmarks = { default-features = false, optional = true , version = "8.0.1" } +pallet-xcm = { default-features = false, version = "8.0.1" } +pallet-xcm-benchmarks = { default-features = false, optional = true , version = "8.0.2" } polkadot-core-primitives = { default-features = false, version = "8.0.0" } polkadot-parachain-primitives = { default-features = false, version = "7.0.0" } -polkadot-runtime-common = { default-features = false, version = "8.0.0" } +polkadot-runtime-common = { default-features = false, version = "8.0.1" } xcm = { package = "staging-xcm", default-features = false, version = "8.0.0" } -xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.0" } +xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.1" } xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" } # Cumulus cumulus-pallet-aura-ext = { default-features = false , version = "0.8.0" } cumulus-pallet-dmp-queue = { default-features = false , version = "0.8.0" } -cumulus-pallet-parachain-system = { default-features = false, features = ["parameterized-consensus-hook",] , version = "0.8.0" } +cumulus-pallet-parachain-system = { default-features = false, features = ["parameterized-consensus-hook",] , version = "0.8.1" } cumulus-pallet-session-benchmarking = { default-features = false, version = "10.0.0" } cumulus-pallet-xcm = { default-features = false , version = "0.8.0" } cumulus-pallet-xcmp-queue = { default-features = false , features = ["bridging"] , version = "0.8.0" } cumulus-primitives-core = { default-features = false , version = "0.8.0" } -cumulus-primitives-utility = { default-features = false , version = "0.8.0" } +cumulus-primitives-utility = { default-features = false , version = "0.8.1" } pallet-collator-selection = { default-features = false , version = "10.0.0" } parachain-info = { package = "staging-parachain-info", default-features = false , version = "0.8.0" } parachains-common = { default-features = false , version = "8.0.0" } diff --git a/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs b/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs index 84fcfc7470..44f3bc19b4 100644 --- a/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs +++ b/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs @@ -1329,8 +1329,31 @@ impl_runtime_apis! { use xcm_config::{KsmLocation, MaxAssetsIntoHolding}; use pallet_xcm_benchmarks::asset_instance_from; + parameter_types! { + pub ExistentialDepositAsset: Option = Some(( + KsmLocation::get(), + ExistentialDeposit::get() + ).into()); + pub const RandomParaId: ParaId = ParaId::new(43211234); + } + use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsiscsBenchmark; impl pallet_xcm::benchmarking::Config for Runtime { + type DeliveryHelper = ( + cumulus_primitives_utility::ToParentDeliveryHelper< + xcm_config::XcmConfig, + ExistentialDepositAsset, + PriceForParentDelivery, + >, + polkadot_runtime_common::xcm_sender::ToParachainDeliveryHelper< + xcm_config::XcmConfig, + ExistentialDepositAsset, + PriceForSiblingParachainDelivery, + RandomParaId, + ParachainSystem, + > + ); + fn reachable_dest() -> Option { Some(Parent.into()) } @@ -1348,16 +1371,12 @@ impl_runtime_apis! { fn reserve_transferable_asset_and_dest() -> Option<(Asset, Location)> { // AH can reserve transfer native token to some random parachain. - let random_para_id = 43211234; - ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests( - random_para_id.into() - ); Some(( Asset { fun: Fungible(ExistentialDeposit::get()), id: AssetId(Parent.into()) }, - ParentThen(Parachain(random_para_id).into()).into(), + ParentThen(Parachain(RandomParaId::get().into()).into()).into(), )) } @@ -1411,13 +1430,6 @@ impl_runtime_apis! { } } - parameter_types! { - pub ExistentialDepositAsset: Option = Some(( - KsmLocation::get(), - ExistentialDeposit::get() - ).into()); - } - impl pallet_xcm_benchmarks::Config for Runtime { type XcmConfig = xcm_config::XcmConfig; type AccountIdConverter = xcm_config::LocationToAccountId; diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/Cargo.toml b/system-parachains/asset-hubs/asset-hub-polkadot/Cargo.toml index fe509fb4bd..62e8223ff0 100644 --- a/system-parachains/asset-hubs/asset-hub-polkadot/Cargo.toml +++ b/system-parachains/asset-hubs/asset-hub-polkadot/Cargo.toml @@ -62,24 +62,24 @@ sp-version = { default-features = false, version = "30.0.0" } sp-weights = { default-features = false, version = "28.0.0" } # Polkadot -pallet-xcm = { default-features = false, version = "8.0.0" } -pallet-xcm-benchmarks = { default-features = false, optional = true , version = "8.0.1" } +pallet-xcm = { default-features = false, version = "8.0.1" } +pallet-xcm-benchmarks = { default-features = false, optional = true , version = "8.0.2" } polkadot-core-primitives = { default-features = false, version = "8.0.0" } polkadot-parachain-primitives = { default-features = false, version = "7.0.0" } -polkadot-runtime-common = { default-features = false, version = "8.0.0" } +polkadot-runtime-common = { default-features = false, version = "8.0.1" } xcm = { package = "staging-xcm", default-features = false, version = "8.0.0" } -xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.0" } +xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.1" } xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" } # Cumulus cumulus-pallet-aura-ext = { default-features = false , version = "0.8.0" } cumulus-pallet-dmp-queue = { default-features = false , version = "0.8.0" } -cumulus-pallet-parachain-system = { default-features = false, features = ["parameterized-consensus-hook",] , version = "0.8.0" } +cumulus-pallet-parachain-system = { default-features = false, features = ["parameterized-consensus-hook",] , version = "0.8.1" } cumulus-pallet-session-benchmarking = { default-features = false, version = "10.0.0" } cumulus-pallet-xcm = { default-features = false , version = "0.8.0" } cumulus-pallet-xcmp-queue = { default-features = false , features = ["bridging"] , version = "0.8.0" } cumulus-primitives-core = { default-features = false , version = "0.8.0" } -cumulus-primitives-utility = { default-features = false , version = "0.8.0" } +cumulus-primitives-utility = { default-features = false , version = "0.8.1" } pallet-collator-selection = { default-features = false , version = "10.0.0" } parachain-info = { package = "staging-parachain-info", default-features = false , version = "0.8.0" } parachains-common = { default-features = false , version = "8.0.0" } diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs b/system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs index a966b24ddf..7897012857 100644 --- a/system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs +++ b/system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs @@ -1199,8 +1199,31 @@ impl_runtime_apis! { use xcm_config::{DotLocation, MaxAssetsIntoHolding}; use pallet_xcm_benchmarks::asset_instance_from; + parameter_types! { + pub ExistentialDepositAsset: Option = Some(( + DotLocation::get(), + ExistentialDeposit::get() + ).into()); + pub const RandomParaId: ParaId = ParaId::new(43211234); + } + use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsiscsBenchmark; impl pallet_xcm::benchmarking::Config for Runtime { + type DeliveryHelper = ( + cumulus_primitives_utility::ToParentDeliveryHelper< + xcm_config::XcmConfig, + ExistentialDepositAsset, + PriceForParentDelivery, + >, + polkadot_runtime_common::xcm_sender::ToParachainDeliveryHelper< + xcm_config::XcmConfig, + ExistentialDepositAsset, + PriceForSiblingParachainDelivery, + RandomParaId, + ParachainSystem, + > + ); + fn reachable_dest() -> Option { Some(Parent.into()) } @@ -1218,16 +1241,12 @@ impl_runtime_apis! { fn reserve_transferable_asset_and_dest() -> Option<(Asset, Location)> { // AH can reserve transfer native token to some random parachain. - let random_para_id = 43211234; - ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests( - random_para_id.into() - ); Some(( Asset { fun: Fungible(ExistentialDeposit::get()), id: AssetId(Parent.into()) }, - ParentThen(Parachain(random_para_id).into()).into(), + ParentThen(Parachain(RandomParaId::get().into()).into()).into(), )) } @@ -1281,13 +1300,6 @@ impl_runtime_apis! { } } - parameter_types! { - pub ExistentialDepositAsset: Option = Some(( - DotLocation::get(), - ExistentialDeposit::get() - ).into()); - } - impl pallet_xcm_benchmarks::Config for Runtime { type XcmConfig = xcm_config::XcmConfig; type AccountIdConverter = xcm_config::LocationToAccountId; diff --git a/system-parachains/bridge-hubs/bridge-hub-kusama/Cargo.toml b/system-parachains/bridge-hubs/bridge-hub-kusama/Cargo.toml index a7c3fbe6ca..c8dcfc8aca 100644 --- a/system-parachains/bridge-hubs/bridge-hub-kusama/Cargo.toml +++ b/system-parachains/bridge-hubs/bridge-hub-kusama/Cargo.toml @@ -60,24 +60,24 @@ sp-transaction-pool = { default-features = false, version = "27.0.0" } sp-version = { default-features = false, version = "30.0.0" } # Polkadot -pallet-xcm = { default-features = false, version = "8.0.0" } -pallet-xcm-benchmarks = { default-features = false, optional = true , version = "8.0.1" } +pallet-xcm = { default-features = false, version = "8.0.1" } +pallet-xcm-benchmarks = { default-features = false, optional = true , version = "8.0.2" } polkadot-core-primitives = { default-features = false, version = "8.0.0" } polkadot-parachain-primitives = { default-features = false, version = "7.0.0" } -polkadot-runtime-common = { default-features = false, version = "8.0.0" } +polkadot-runtime-common = { default-features = false, version = "8.0.1" } xcm = { package = "staging-xcm", default-features = false, version = "8.0.0" } -xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.0" } +xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.1" } xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" } # Cumulus cumulus-pallet-aura-ext = { default-features = false , version = "0.8.0" } cumulus-pallet-dmp-queue = { default-features = false , version = "0.8.0" } -cumulus-pallet-parachain-system = { default-features = false, features = ["parameterized-consensus-hook",] , version = "0.8.0" } +cumulus-pallet-parachain-system = { default-features = false, features = ["parameterized-consensus-hook",] , version = "0.8.1" } cumulus-pallet-session-benchmarking = { default-features = false, version = "10.0.0" } cumulus-pallet-xcm = { default-features = false , version = "0.8.0" } cumulus-pallet-xcmp-queue = { default-features = false , features = ["bridging"] , version = "0.8.0" } cumulus-primitives-core = { default-features = false , version = "0.8.0" } -cumulus-primitives-utility = { default-features = false , version = "0.8.0" } +cumulus-primitives-utility = { default-features = false , version = "0.8.1" } pallet-collator-selection = { default-features = false , version = "10.0.0" } parachain-info = { package = "staging-parachain-info", default-features = false , version = "0.8.0" } parachains-common = { default-features = false , version = "8.0.0" } diff --git a/system-parachains/bridge-hubs/bridge-hub-kusama/src/lib.rs b/system-parachains/bridge-hubs/bridge-hub-kusama/src/lib.rs index 32f08ba2a0..773f242dd0 100644 --- a/system-parachains/bridge-hubs/bridge-hub-kusama/src/lib.rs +++ b/system-parachains/bridge-hubs/bridge-hub-kusama/src/lib.rs @@ -819,8 +819,21 @@ impl_runtime_apis! { use xcm::latest::prelude::*; use xcm_config::KsmRelayLocation; + parameter_types! { + pub ExistentialDepositAsset: Option = Some(( + KsmRelayLocation::get(), + ExistentialDeposit::get() + ).into()); + } + use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsiscsBenchmark; impl pallet_xcm::benchmarking::Config for Runtime { + type DeliveryHelper = cumulus_primitives_utility::ToParentDeliveryHelper< + xcm_config::XcmConfig, + ExistentialDepositAsset, + PriceForParentDelivery, + >; + fn reachable_dest() -> Option { Some(Parent.into()) } @@ -854,13 +867,6 @@ impl_runtime_apis! { } } - parameter_types! { - pub ExistentialDepositAsset: Option = Some(( - KsmRelayLocation::get(), - ExistentialDeposit::get() - ).into()); - } - impl pallet_xcm_benchmarks::Config for Runtime { type XcmConfig = xcm_config::XcmConfig; type AccountIdConverter = xcm_config::LocationToAccountId; diff --git a/system-parachains/bridge-hubs/bridge-hub-polkadot/Cargo.toml b/system-parachains/bridge-hubs/bridge-hub-polkadot/Cargo.toml index 6cbaedf00a..3d5dcdf978 100644 --- a/system-parachains/bridge-hubs/bridge-hub-polkadot/Cargo.toml +++ b/system-parachains/bridge-hubs/bridge-hub-polkadot/Cargo.toml @@ -60,24 +60,24 @@ sp-transaction-pool = { default-features = false, version = "27.0.0" } sp-version = { default-features = false, version = "30.0.0" } # Polkadot -pallet-xcm = { default-features = false, version = "8.0.0" } -pallet-xcm-benchmarks = { default-features = false, optional = true , version = "8.0.1" } +pallet-xcm = { default-features = false, version = "8.0.1" } +pallet-xcm-benchmarks = { default-features = false, optional = true , version = "8.0.2" } polkadot-core-primitives = { default-features = false, version = "8.0.0" } polkadot-parachain-primitives = { default-features = false, version = "7.0.0" } -polkadot-runtime-common = { default-features = false, version = "8.0.0" } +polkadot-runtime-common = { default-features = false, version = "8.0.1" } xcm = { package = "staging-xcm", default-features = false, version = "8.0.0" } -xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.0" } +xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.1" } xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" } # Cumulus cumulus-pallet-aura-ext = { default-features = false , version = "0.8.0" } cumulus-pallet-dmp-queue = { default-features = false , version = "0.8.0" } -cumulus-pallet-parachain-system = { default-features = false, features = ["parameterized-consensus-hook",] , version = "0.8.0" } +cumulus-pallet-parachain-system = { default-features = false, features = ["parameterized-consensus-hook",] , version = "0.8.1" } cumulus-pallet-session-benchmarking = { default-features = false, version = "10.0.0" } cumulus-pallet-xcm = { default-features = false , version = "0.8.0" } cumulus-pallet-xcmp-queue = { default-features = false , features = ["bridging"] , version = "0.8.0" } cumulus-primitives-core = { default-features = false , version = "0.8.0" } -cumulus-primitives-utility = { default-features = false , version = "0.8.0" } +cumulus-primitives-utility = { default-features = false , version = "0.8.1" } pallet-collator-selection = { default-features = false , version = "10.0.0" } parachain-info = { package = "staging-parachain-info", default-features = false , version = "0.8.0" } parachains-common = { default-features = false , version = "8.0.0" } diff --git a/system-parachains/bridge-hubs/bridge-hub-polkadot/src/lib.rs b/system-parachains/bridge-hubs/bridge-hub-polkadot/src/lib.rs index 7ad452ab27..7ea0b32089 100644 --- a/system-parachains/bridge-hubs/bridge-hub-polkadot/src/lib.rs +++ b/system-parachains/bridge-hubs/bridge-hub-polkadot/src/lib.rs @@ -820,8 +820,21 @@ impl_runtime_apis! { use xcm::latest::prelude::*; use xcm_config::DotRelayLocation; + parameter_types! { + pub ExistentialDepositAsset: Option = Some(( + DotRelayLocation::get(), + ExistentialDeposit::get() + ).into()); + } + use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsiscsBenchmark; impl pallet_xcm::benchmarking::Config for Runtime { + type DeliveryHelper = cumulus_primitives_utility::ToParentDeliveryHelper< + xcm_config::XcmConfig, + ExistentialDepositAsset, + PriceForParentDelivery, + >; + fn reachable_dest() -> Option { Some(Parent.into()) } @@ -855,13 +868,6 @@ impl_runtime_apis! { } } - parameter_types! { - pub ExistentialDepositAsset: Option = Some(( - DotRelayLocation::get(), - ExistentialDeposit::get() - ).into()); - } - impl pallet_xcm_benchmarks::Config for Runtime { type XcmConfig = xcm_config::XcmConfig; type AccountIdConverter = xcm_config::LocationToAccountId; diff --git a/system-parachains/collectives/collectives-polkadot/Cargo.toml b/system-parachains/collectives/collectives-polkadot/Cargo.toml index e0d75cc5dd..703fe81fc0 100644 --- a/system-parachains/collectives/collectives-polkadot/Cargo.toml +++ b/system-parachains/collectives/collectives-polkadot/Cargo.toml @@ -59,24 +59,24 @@ sp-transaction-pool = { default-features = false, version = "27.0.0" } sp-version = { default-features = false, version = "30.0.0" } # Polkadot -pallet-xcm = { default-features = false, version = "8.0.0" } +pallet-xcm = { default-features = false, version = "8.0.1" } polkadot-core-primitives = { default-features = false, version = "8.0.0" } polkadot-parachain-primitives = { default-features = false, version = "7.0.0" } -polkadot-runtime-common = { default-features = false, version = "8.0.0" } +polkadot-runtime-common = { default-features = false, version = "8.0.1" } polkadot-runtime-constants = { path = "../../../relay/polkadot/constants", default-features = false} xcm = { package = "staging-xcm", default-features = false, version = "8.0.0" } -xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.0" } +xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.1" } xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" } # Cumulus cumulus-pallet-aura-ext = { default-features = false , version = "0.8.0" } cumulus-pallet-dmp-queue = { default-features = false , version = "0.8.0" } -cumulus-pallet-parachain-system = { default-features = false, features = ["parameterized-consensus-hook",] , version = "0.8.0" } +cumulus-pallet-parachain-system = { default-features = false, features = ["parameterized-consensus-hook",] , version = "0.8.1" } cumulus-pallet-session-benchmarking = { default-features = false, version = "10.0.0" } cumulus-pallet-xcm = { default-features = false , version = "0.8.0" } cumulus-pallet-xcmp-queue = { default-features = false , version = "0.8.0" } cumulus-primitives-core = { default-features = false , version = "0.8.0" } -cumulus-primitives-utility = { default-features = false , version = "0.8.0" } +cumulus-primitives-utility = { default-features = false , version = "0.8.1" } pallet-collator-selection = { default-features = false , version = "10.0.0" } parachain-info = { package = "staging-parachain-info", default-features = false , version = "0.8.0" } parachains-common = { default-features = false , version = "8.0.0" } diff --git a/system-parachains/collectives/collectives-polkadot/src/lib.rs b/system-parachains/collectives/collectives-polkadot/src/lib.rs index 273b995962..05e9f550c6 100644 --- a/system-parachains/collectives/collectives-polkadot/src/lib.rs +++ b/system-parachains/collectives/collectives-polkadot/src/lib.rs @@ -975,8 +975,21 @@ impl_runtime_apis! { use xcm::latest::prelude::*; + parameter_types! { + pub ExistentialDepositAsset: Option = Some(( + xcm_config::DotLocation::get(), + ExistentialDeposit::get() + ).into()); + } + use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsiscsBenchmark; impl pallet_xcm::benchmarking::Config for Runtime { + type DeliveryHelper = cumulus_primitives_utility::ToParentDeliveryHelper< + xcm_config::XcmConfig, + ExistentialDepositAsset, + PriceForParentDelivery, + >; + fn reachable_dest() -> Option { Some(Parent.into()) } diff --git a/system-parachains/gluttons/glutton-kusama/Cargo.toml b/system-parachains/gluttons/glutton-kusama/Cargo.toml index 731cdfc4b7..7a0dd078ca 100644 --- a/system-parachains/gluttons/glutton-kusama/Cargo.toml +++ b/system-parachains/gluttons/glutton-kusama/Cargo.toml @@ -38,11 +38,11 @@ sp-version = { default-features = false, version = "30.0.0" } # Polkadot xcm = { package = "staging-xcm", default-features = false, version = "8.0.0" } -xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.0" } +xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.1" } xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" } # Cumulus -cumulus-pallet-parachain-system = { default-features = false, features = ["parameterized-consensus-hook",] , version = "0.8.0" } +cumulus-pallet-parachain-system = { default-features = false, features = ["parameterized-consensus-hook",] , version = "0.8.1" } cumulus-pallet-xcm = { default-features = false , version = "0.8.0" } cumulus-primitives-core = { default-features = false , version = "0.8.0" } parachain-info = { package = "staging-parachain-info", default-features = false , version = "0.8.0" }