From 8e73c005e9618efd348f437095204d8626cab535 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Fri, 11 Mar 2022 18:45:17 +0100 Subject: [PATCH] Fixes --- Cargo.lock | 152 +++++++++--------- .../canvas-kusama/src/xcm_config.rs | 8 +- .../statemint/src/xcm_config.rs | 2 +- .../westmint/src/xcm_config.rs | 10 +- 4 files changed, 84 insertions(+), 88 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c05122fe15..9a49377747 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -732,7 +732,6 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "finality-grandpa", "frame-support", @@ -748,7 +747,6 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bp-runtime", "frame-support", @@ -760,7 +758,6 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bitvec", "bp-runtime", @@ -776,7 +773,6 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bp-messages", "bp-runtime", @@ -794,7 +790,6 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -811,7 +806,6 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "frame-support", "hash-db", @@ -829,7 +823,6 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -844,7 +837,6 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -859,7 +851,6 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bp-message-dispatch", "bp-messages", @@ -4182,7 +4173,6 @@ dependencies = [ [[package]] name = "kusama-runtime" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "beefy-primitives", "bitvec", @@ -4270,7 +4260,6 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "frame-support", "polkadot-primitives", @@ -5134,7 +5123,6 @@ dependencies = [ [[package]] name = "metered-channel" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "derive_more", "futures 0.3.21", @@ -5791,7 +5779,6 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -5808,7 +5795,6 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bp-header-chain", "bp-runtime", @@ -5830,7 +5816,6 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bitvec", "bp-message-dispatch", @@ -6606,15 +6591,16 @@ dependencies = [ [[package]] name = "pallet-xcm" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "frame-support", "frame-system", + "impl-trait-for-tuples", "log", "parity-scale-codec", "scale-info", "serde", "sp-core", + "sp-io", "sp-runtime", "sp-std", "xcm", @@ -6624,7 +6610,6 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "frame-benchmarking", "frame-support", @@ -6632,6 +6617,7 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", + "sp-io", "sp-runtime", "sp-std", "xcm", @@ -7186,7 +7172,6 @@ dependencies = [ [[package]] name = "polkadot-approval-distribution" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -7200,7 +7185,6 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -7213,7 +7197,6 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "derive_more", "fatality", @@ -7236,7 +7219,6 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "fatality", "futures 0.3.21", @@ -7257,7 +7239,6 @@ dependencies = [ [[package]] name = "polkadot-cli" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "clap 3.1.6", "frame-benchmarking-cli", @@ -7280,7 +7261,6 @@ dependencies = [ [[package]] name = "polkadot-client" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -7386,7 +7366,6 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "always-assert", "fatality", @@ -7407,7 +7386,6 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -7420,7 +7398,6 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "derive_more", "fatality", @@ -7443,7 +7420,6 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -7457,7 +7433,6 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "futures 0.3.21", "futures-timer", @@ -7477,7 +7452,6 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "async-trait", "futures 0.3.21", @@ -7496,7 +7470,6 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "futures 0.3.21", "parity-scale-codec", @@ -7514,7 +7487,6 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bitvec", "derive_more", @@ -7542,7 +7514,6 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bitvec", "futures 0.3.21", @@ -7562,7 +7533,6 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bitvec", "futures 0.3.21", @@ -7580,7 +7550,6 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -7595,7 +7564,6 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "async-trait", "futures 0.3.21", @@ -7613,7 +7581,6 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -7628,7 +7595,6 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "futures 0.3.21", "futures-timer", @@ -7645,7 +7611,6 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "fatality", "futures 0.3.21", @@ -7664,7 +7629,6 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "async-trait", "futures 0.3.21", @@ -7681,7 +7645,6 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bitvec", "futures 0.3.21", @@ -7698,7 +7661,6 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "always-assert", "assert_matches", @@ -7728,7 +7690,6 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "futures 0.3.21", "polkadot-node-primitives", @@ -7744,7 +7705,6 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "futures 0.3.21", "memory-lru", @@ -7762,7 +7722,6 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "async-std", "lazy_static", @@ -7780,7 +7739,6 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bs58", "futures 0.3.21", @@ -7799,7 +7757,6 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "async-trait", "fatality", @@ -7817,7 +7774,6 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bounded-vec", "futures 0.3.21", @@ -7839,7 +7795,6 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7849,7 +7804,6 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-test-helpers" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "async-trait", "futures 0.3.21", @@ -7867,7 +7821,6 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "derive_more", "futures 0.3.21", @@ -7886,7 +7839,6 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "async-trait", "derive_more", @@ -7919,7 +7871,6 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "futures 0.3.21", "futures-timer", @@ -7940,7 +7891,6 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "async-trait", "futures 0.3.21", @@ -7957,7 +7907,6 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen-proc-macro" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "expander 0.0.6", "proc-macro-crate 1.1.3", @@ -7969,7 +7918,6 @@ dependencies = [ [[package]] name = "polkadot-parachain" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "derive_more", "frame-support", @@ -7986,7 +7934,6 @@ dependencies = [ [[package]] name = "polkadot-performance-test" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "env_logger", "kusama-runtime", @@ -8001,7 +7948,6 @@ dependencies = [ [[package]] name = "polkadot-primitives" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bitvec", "frame-system", @@ -8031,7 +7977,6 @@ dependencies = [ [[package]] name = "polkadot-rpc" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -8062,7 +8007,6 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "beefy-primitives", "bitvec", @@ -8146,7 +8090,6 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "beefy-primitives", "bitvec", @@ -8193,7 +8136,6 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "frame-support", "polkadot-primitives", @@ -8205,7 +8147,6 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bs58", "parity-scale-codec", @@ -8217,7 +8158,6 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "bitflags", "bitvec", @@ -8259,7 +8199,6 @@ dependencies = [ [[package]] name = "polkadot-service" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "async-trait", "beefy-gadget", @@ -8360,7 +8299,6 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "arrayvec 0.5.2", "fatality", @@ -8381,7 +8319,6 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -8391,7 +8328,6 @@ dependencies = [ [[package]] name = "polkadot-test-client" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "parity-scale-codec", "polkadot-node-subsystem", @@ -8416,7 +8352,6 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "beefy-primitives", "bitvec", @@ -8478,7 +8413,6 @@ dependencies = [ [[package]] name = "polkadot-test-service" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "frame-benchmarking", "frame-system", @@ -9137,7 +9071,6 @@ dependencies = [ [[package]] name = "rococo-runtime" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "beefy-primitives", "bp-messages", @@ -9212,7 +9145,6 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "frame-support", "polkadot-primitives", @@ -10801,7 +10733,6 @@ checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "slot-range-helper" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "enumn", "parity-scale-codec", @@ -12054,7 +11985,6 @@ checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b" [[package]] name = "test-runtime-constants" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "frame-support", "polkadot-primitives", @@ -13052,7 +12982,6 @@ dependencies = [ [[package]] name = "westend-runtime" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "beefy-primitives", "bitvec", @@ -13138,7 +13067,6 @@ dependencies = [ [[package]] name = "westend-runtime-constants" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "frame-support", "polkadot-primitives", @@ -13358,23 +13286,23 @@ dependencies = [ [[package]] name = "xcm" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "derivative", "impl-trait-for-tuples", "log", "parity-scale-codec", "scale-info", + "sp-io", "xcm-procedural", ] [[package]] name = "xcm-builder" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "frame-support", "frame-system", + "impl-trait-for-tuples", "log", "pallet-transaction-payment", "parity-scale-codec", @@ -13391,7 +13319,6 @@ dependencies = [ [[package]] name = "xcm-executor" version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "frame-benchmarking", "frame-support", @@ -13409,7 +13336,6 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e6fa871e39bab8ccec27070b3b93a2e5e50ff0a4" dependencies = [ "Inflector", "proc-macro2", @@ -13480,3 +13406,71 @@ dependencies = [ "cc", "libc", ] + +[[patch.unused]] +name = "polkadot" +version = "0.9.18" + +[[patch.unused]] +name = "polkadot-primitives-test-helpers" +version = "0.9.18" + +[[patch.unused]] +name = "polkadot-test-malus" +version = "0.9.18" + +[[patch.unused]] +name = "polkadot-voter-bags" +version = "0.9.18" + +[[patch.unused]] +name = "remote-ext-tests-bags-list" +version = "0.9.18" + +[[patch.unused]] +name = "staking-miner" +version = "0.9.18" + +[[patch.unused]] +name = "test-parachain-adder" +version = "0.9.18" + +[[patch.unused]] +name = "test-parachain-adder-collator" +version = "0.9.18" + +[[patch.unused]] +name = "test-parachain-halt" +version = "0.9.18" + +[[patch.unused]] +name = "test-parachain-undying" +version = "0.9.18" + +[[patch.unused]] +name = "test-parachain-undying-collator" +version = "0.9.18" + +[[patch.unused]] +name = "test-parachains" +version = "0.9.18" + +[[patch.unused]] +name = "xcm-executor-integration-tests" +version = "0.9.18" + +[[patch.unused]] +name = "xcm-simulator" +version = "0.9.18" + +[[patch.unused]] +name = "xcm-simulator-example" +version = "0.9.18" + +[[patch.unused]] +name = "xcm-simulator-fuzzer" +version = "0.9.18" + +[[patch.unused]] +name = "zombienet-backchannel" +version = "0.9.18" diff --git a/polkadot-parachains/canvas-kusama/src/xcm_config.rs b/polkadot-parachains/canvas-kusama/src/xcm_config.rs index 33d563f165..6249410b1a 100644 --- a/polkadot-parachains/canvas-kusama/src/xcm_config.rs +++ b/polkadot-parachains/canvas-kusama/src/xcm_config.rs @@ -19,7 +19,7 @@ use super::{ }; use frame_support::{ match_types, parameter_types, - traits::{EnsureOneOf, Everything, Nothing}, + traits::{EnsureOneOf, Everything, Nothing, ConstU32}, weights::Weight, }; use frame_system::EnsureRoot; @@ -38,10 +38,10 @@ use xcm_executor::XcmExecutor; parameter_types! { pub const RelayLocation: MultiLocation = MultiLocation::parent(); - pub const RelayNetwork: NetworkId = NetworkId::Any; + pub const RelayNetwork: Option = None; pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into(); pub UniversalLocation: InteriorMultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); - pub const Local: MultiLocation = Here.into(); + pub const Local: MultiLocation = Here.into_location(); pub CheckingAccount: AccountId = PolkadotXcm::check_account(); pub const ExecutiveBody: BodyId = BodyId::Executive; } @@ -144,6 +144,8 @@ impl xcm_executor::Config for XcmConfig { type AssetTrap = PolkadotXcm; type AssetClaims = PolkadotXcm; type SubscriptionService = PolkadotXcm; + type PalletInstancesInfo = super::AllPalletsWithSystem; + type MaxAssetsIntoHolding = ConstU32<8>; type AssetLocker = (); type AssetExchanger = (); type FeeManager = (); diff --git a/polkadot-parachains/statemint/src/xcm_config.rs b/polkadot-parachains/statemint/src/xcm_config.rs index 52a7e84573..b0d6e6328f 100644 --- a/polkadot-parachains/statemint/src/xcm_config.rs +++ b/polkadot-parachains/statemint/src/xcm_config.rs @@ -42,7 +42,7 @@ parameter_types! { pub const RelayNetwork: NetworkId = NetworkId::Polkadot; pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into(); pub UniversalLocation: InteriorMultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); - pub const Local: MultiLocation = Here.into(); + pub const Local: MultiLocation = MultiLocation::here(); pub AssetsPalletLocation: MultiLocation = PalletInstance(::index() as u8).into(); pub CheckingAccount: AccountId = PolkadotXcm::check_account(); diff --git a/polkadot-parachains/westmint/src/xcm_config.rs b/polkadot-parachains/westmint/src/xcm_config.rs index 5785254b34..8d01605703 100644 --- a/polkadot-parachains/westmint/src/xcm_config.rs +++ b/polkadot-parachains/westmint/src/xcm_config.rs @@ -19,7 +19,7 @@ use super::{ }; use frame_support::{ match_types, parameter_types, - traits::{Everything, PalletInfoAccess}, + traits::{Everything, PalletInfoAccess, ConstU32, Nothing}, weights::Weight, }; use pallet_xcm::XcmPassthrough; @@ -29,8 +29,8 @@ use xcm::latest::prelude::*; use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, AsPrefixedGeneralIndex, - ConvertedConcreteId, CurrencyAdapter, EnsureXcmOrigin, FixedWeightBounds, FungiblesAdapter, - IsConcrete, LocationInverter, NativeAsset, ParentAsSuperuser, ParentIsPreset, + ConvertedConcreteId, CurrencyAdapter, EnsureXcmOrigin, FixedWeightBounds, + FungiblesAdapter, IsConcrete, LocationInverter, NativeAsset, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, @@ -39,10 +39,10 @@ use xcm_executor::{traits::JustTry, XcmExecutor}; parameter_types! { pub const WestendLocation: MultiLocation = MultiLocation::parent(); - pub RelayNetwork: NetworkId = NetworkId::Named(b"Westend".to_vec()); + pub RelayNetwork: NetworkId = NetworkId::Westend; pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into(); pub UniversalLocation: InteriorMultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); - pub const Local: MultiLocation = Here.into(); + pub const Local: MultiLocation = Here.into_location(); pub AssetsPalletLocation: MultiLocation = PalletInstance(::index() as u8).into(); pub CheckingAccount: AccountId = PolkadotXcm::check_account();