From 89ec2f0c4573ede17ea9b1140f2664751a279641 Mon Sep 17 00:00:00 2001 From: Keith Yeung Date: Wed, 11 Aug 2021 13:10:57 -0700 Subject: [PATCH 1/2] Use new MultiLocation syntax everywhere --- Cargo.lock | 604 +++++++++++--------- pallets/dmp-queue/src/lib.rs | 4 +- pallets/xcm/src/lib.rs | 6 +- pallets/xcmp-queue/src/lib.rs | 4 +- polkadot-parachains/pallets/ping/src/lib.rs | 6 +- polkadot-parachains/rococo/src/lib.rs | 9 +- polkadot-parachains/shell/src/lib.rs | 4 +- polkadot-parachains/statemine/src/lib.rs | 6 +- polkadot-parachains/statemint/src/lib.rs | 6 +- polkadot-parachains/westmint/src/lib.rs | 6 +- primitives/utility/src/lib.rs | 19 +- test/service/src/lib.rs | 4 +- 12 files changed, 356 insertions(+), 322 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f89eb7e5fa6..40f976cd4a8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -495,7 +495,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6735156962c61f4ea520779874ad46d006d27b6b" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#267ea4530647376704cc116b6d524857c1a596b0" dependencies = [ "beefy-primitives", "fnv", @@ -525,7 +525,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6735156962c61f4ea520779874ad46d006d27b6b" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#267ea4530647376704cc116b6d524857c1a596b0" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -546,12 +546,12 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6735156962c61f4ea520779874ad46d006d27b6b" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#267ea4530647376704cc116b6d524857c1a596b0" [[package]] name = "beefy-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6735156962c61f4ea520779874ad46d006d27b6b" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#267ea4530647376704cc116b6d524857c1a596b0" dependencies = [ "parity-scale-codec", "sp-api", @@ -573,9 +573,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.57.0" +version = "0.59.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d" +checksum = "453c49e5950bb0eb63bb3df640e31618846c89d5b7faa54040d76e98e0134375" dependencies = [ "bitflags", "cexpr", @@ -596,6 +596,18 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +[[package]] +name = "bitvec" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" +dependencies = [ + "funty", + "radium 0.5.3", + "tap", + "wyz", +] + [[package]] name = "bitvec" version = "0.20.1" @@ -603,7 +615,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5011ffc90248764d7005b0e10c7294f5aa1bd87d9dd7248f4ad475b347c294d" dependencies = [ "funty", - "radium", + "radium 0.6.2", "tap", "wyz", ] @@ -729,7 +741,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "finality-grandpa", "frame-support", @@ -744,7 +756,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "bp-runtime", "frame-support", @@ -755,9 +767,9 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ - "bitvec", + "bitvec 0.20.1", "bp-runtime", "frame-support", "frame-system", @@ -770,7 +782,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "bp-messages", "bp-runtime", @@ -787,7 +799,7 @@ dependencies = [ [[package]] name = "bp-rialto" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "bp-messages", "bp-runtime", @@ -802,7 +814,7 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -819,7 +831,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "frame-support", "hash-db", @@ -836,7 +848,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -851,7 +863,7 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -866,7 +878,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "bp-message-dispatch", "bp-messages", @@ -1005,9 +1017,9 @@ dependencies = [ [[package]] name = "cexpr" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +checksum = "db507a7679252d2276ed0dd8113c6875ec56d3089f9225b2b42c30cc1f8e5c89" dependencies = [ "nom", ] @@ -2599,7 +2611,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "parity-scale-codec", ] @@ -2617,7 +2629,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-support", "frame-system", @@ -2636,7 +2648,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "Inflector", "chrono", @@ -2662,7 +2674,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-support", "frame-system", @@ -2675,7 +2687,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-support", "frame-system", @@ -2690,7 +2702,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "14.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "parity-scale-codec", "serde", @@ -2701,7 +2713,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "bitflags", "frame-metadata", @@ -2727,7 +2739,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2739,7 +2751,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", @@ -2751,7 +2763,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", @@ -2761,7 +2773,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -2778,7 +2790,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -2792,7 +2804,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "parity-scale-codec", "sp-api", @@ -2801,7 +2813,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-support", "parity-scale-codec", @@ -3909,10 +3921,10 @@ dependencies = [ [[package]] name = "kusama-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 0.20.1", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -4022,9 +4034,9 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" -version = "0.12.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "431ca65516efab86e65d96281f750ebb54277dec656fcf6c027f3d1c0cb69e4c" +checksum = "9b1b6ea8f2536f504b645ad78419c8246550e19d2c3419a167080ce08edee35a" dependencies = [ "fs-swap", "kvdb", @@ -4518,9 +4530,9 @@ dependencies = [ [[package]] name = "librocksdb-sys" -version = "6.17.3" +version = "6.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da125e1c0f22c7cae785982115523a0738728498547f415c9054cb17c7e89f9" +checksum = "c309a9d2470844aceb9a4a098cf5286154d20596868b75a6b36357d2bb9ca25d" dependencies = [ "bindgen", "cc", @@ -4697,6 +4709,26 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "lz4" +version = "1.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c" +dependencies = [ + "libc", + "lz4-sys", +] + +[[package]] +name = "lz4-sys" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "mach" version = "0.3.2" @@ -4822,7 +4854,7 @@ dependencies = [ [[package]] name = "metered-channel" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "derive_more 0.99.14", "futures 0.3.16", @@ -5089,7 +5121,7 @@ dependencies = [ [[package]] name = "node-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d867b6b4dd099ecef7bed1a1ff5a3441f41d684" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-system", "parity-scale-codec", @@ -5112,10 +5144,12 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "nom" -version = "5.1.2" +version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6" dependencies = [ + "bitvec 0.19.5", + "funty", "memchr", "version_check", ] @@ -5257,7 +5291,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d867b6b4dd099ecef7bed1a1ff5a3441f41d684" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5270,7 +5304,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d867b6b4dd099ecef7bed1a1ff5a3441f41d684" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-support", "frame-system", @@ -5286,7 +5320,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-support", "frame-system", @@ -5301,7 +5335,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-support", "frame-system", @@ -5315,7 +5349,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5338,7 +5372,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5352,7 +5386,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6735156962c61f4ea520779874ad46d006d27b6b" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#267ea4530647376704cc116b6d524857c1a596b0" dependencies = [ "beefy-primitives", "frame-support", @@ -5368,7 +5402,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6735156962c61f4ea520779874ad46d006d27b6b" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#267ea4530647376704cc116b6d524857c1a596b0" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -5393,7 +5427,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5407,7 +5441,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -5423,7 +5457,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "bp-header-chain", "bp-runtime", @@ -5444,9 +5478,9 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ - "bitvec", + "bitvec 0.20.1", "bp-message-dispatch", "bp-messages", "bp-rialto", @@ -5489,7 +5523,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5505,7 +5539,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5520,7 +5554,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5541,7 +5575,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5558,7 +5592,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5572,7 +5606,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5594,7 +5628,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5609,7 +5643,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5628,7 +5662,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5644,7 +5678,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5659,7 +5693,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5676,7 +5710,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-support", "frame-system", @@ -5692,7 +5726,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5710,7 +5744,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5725,7 +5759,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-support", "frame-system", @@ -5738,7 +5772,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-support", "frame-system", @@ -5754,7 +5788,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5776,7 +5810,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5791,7 +5825,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d867b6b4dd099ecef7bed1a1ff5a3441f41d684" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-support", "frame-system", @@ -5804,7 +5838,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "enumflags2", "frame-support", @@ -5818,7 +5852,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5833,7 +5867,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-support", "frame-system", @@ -5853,7 +5887,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5869,7 +5903,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-support", "frame-system", @@ -5882,7 +5916,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5906,7 +5940,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", @@ -5917,7 +5951,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "log", "sp-arithmetic", @@ -5926,7 +5960,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-support", "frame-system", @@ -5939,7 +5973,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5957,7 +5991,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5972,7 +6006,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-support", "frame-system", @@ -5988,7 +6022,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -6005,7 +6039,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6016,7 +6050,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -6032,7 +6066,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d867b6b4dd099ecef7bed1a1ff5a3441f41d684" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -6046,7 +6080,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-benchmarking", "frame-support", @@ -6061,7 +6095,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "enumflags2", "frame-benchmarking", @@ -6075,7 +6109,7 @@ dependencies = [ [[package]] name = "pallet-xcm" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "frame-support", "frame-system", @@ -6101,9 +6135,9 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.2.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e337f62db341435f0da05b8f6b97e984ef4ea5800510cd07c2d624688c40b47" +checksum = "241f9c5d25063080f2c02846221f13e1d0e5e18fa00c32c234aad585b744ee55" dependencies = [ "blake2-rfc", "crc32fast", @@ -6111,9 +6145,11 @@ dependencies = [ "hex", "libc", "log", + "lz4", "memmap2", "parking_lot 0.11.1", "rand 0.8.4", + "snap", ] [[package]] @@ -6141,7 +6177,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8975095a2a03bbbdc70a74ab11a4f76a6d0b84680d87c68d722531b0ac28e8a9" dependencies = [ "arrayvec 0.7.0", - "bitvec", + "bitvec 0.20.1", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive", @@ -6376,12 +6412,6 @@ dependencies = [ "crypto-mac 0.8.0", ] -[[package]] -name = "pdqselect" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec91767ecc0a0bbe558ce8c9da33c068066c57ecc8bb8477ef8c1ad3ef77c27" - [[package]] name = "peeking_take_while" version = "0.1.2" @@ -6526,7 +6556,7 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] name = "polkadot-approval-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "futures 0.3.16", "polkadot-node-network-protocol", @@ -6540,7 +6570,7 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "futures 0.3.16", "polkadot-node-network-protocol", @@ -6553,7 +6583,7 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "futures 0.3.16", "lru", @@ -6576,7 +6606,7 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "futures 0.3.16", "lru", @@ -6595,7 +6625,7 @@ dependencies = [ [[package]] name = "polkadot-cli" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "frame-benchmarking-cli", "futures 0.3.16", @@ -6615,7 +6645,7 @@ dependencies = [ [[package]] name = "polkadot-client" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -6718,7 +6748,7 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "always-assert", "futures 0.3.16", @@ -6738,7 +6768,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -6750,7 +6780,7 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "futures 0.3.16", "lru", @@ -6774,7 +6804,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -6788,7 +6818,7 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "futures 0.3.16", "polkadot-node-network-protocol", @@ -6806,7 +6836,7 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "async-trait", "futures 0.3.16", @@ -6826,7 +6856,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "futures 0.3.16", "parity-scale-codec", @@ -6844,9 +6874,9 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ - "bitvec", + "bitvec 0.20.1", "derive_more 0.99.14", "futures 0.3.16", "futures-timer 3.0.2", @@ -6874,9 +6904,9 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ - "bitvec", + "bitvec 0.20.1", "futures 0.3.16", "futures-timer 3.0.2", "kvdb", @@ -6894,9 +6924,9 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ - "bitvec", + "bitvec 0.20.1", "futures 0.3.16", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -6912,7 +6942,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "futures 0.3.16", "polkadot-node-subsystem", @@ -6927,7 +6957,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "async-trait", "futures 0.3.16", @@ -6945,7 +6975,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "futures 0.3.16", "polkadot-node-subsystem", @@ -6960,7 +6990,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -6977,9 +7007,9 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ - "bitvec", + "bitvec 0.20.1", "derive_more 0.99.14", "futures 0.3.16", "kvdb", @@ -6996,7 +7026,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-participation" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "futures 0.3.16", "polkadot-node-primitives", @@ -7009,7 +7039,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "async-trait", "futures 0.3.16", @@ -7026,9 +7056,9 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ - "bitvec", + "bitvec 0.20.1", "futures 0.3.16", "futures-timer 3.0.2", "polkadot-node-subsystem", @@ -7041,7 +7071,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "always-assert", "assert_matches", @@ -7071,7 +7101,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "futures 0.3.16", "memory-lru", @@ -7089,7 +7119,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "async-std", "lazy_static", @@ -7107,7 +7137,7 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "async-trait", "futures 0.3.16", @@ -7123,7 +7153,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "async-trait", "futures 0.3.16", @@ -7140,7 +7170,7 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "futures 0.3.16", "parity-scale-codec", @@ -7164,7 +7194,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7174,7 +7204,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-test-helpers" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "async-trait", "futures 0.3.16", @@ -7200,7 +7230,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "async-std", "async-trait", @@ -7230,7 +7260,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "async-trait", "futures 0.3.16", @@ -7260,7 +7290,7 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "async-trait", "futures 0.3.16", @@ -7282,7 +7312,7 @@ dependencies = [ [[package]] name = "polkadot-overseer-all-subsystems-gen" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "assert_matches", "proc-macro2 1.0.28", @@ -7293,7 +7323,7 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "async-trait", "futures 0.3.16", @@ -7310,7 +7340,7 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen-proc-macro" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", @@ -7321,7 +7351,7 @@ dependencies = [ [[package]] name = "polkadot-parachain" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "derive_more 0.99.14", "frame-support", @@ -7337,9 +7367,9 @@ dependencies = [ [[package]] name = "polkadot-primitives" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ - "bitvec", + "bitvec 0.20.1", "frame-system", "hex-literal 0.3.3", "parity-scale-codec", @@ -7367,7 +7397,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -7400,10 +7430,10 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 0.20.1", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -7475,9 +7505,9 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ - "bitvec", + "bitvec 0.20.1", "frame-benchmarking", "frame-support", "frame-system", @@ -7518,10 +7548,10 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "bitflags", - "bitvec", + "bitvec 0.20.1", "derive_more 0.99.14", "frame-benchmarking", "frame-support", @@ -7557,7 +7587,7 @@ dependencies = [ [[package]] name = "polkadot-service" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "async-trait", "beefy-gadget", @@ -7653,7 +7683,7 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "arrayvec 0.5.2", "futures 0.3.16", @@ -7674,7 +7704,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -7684,7 +7714,7 @@ dependencies = [ [[package]] name = "polkadot-test-client" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "parity-scale-codec", "polkadot-node-subsystem", @@ -7709,10 +7739,10 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 0.20.1", "frame-election-provider-support", "frame-executive", "frame-support", @@ -7769,7 +7799,7 @@ dependencies = [ [[package]] name = "polkadot-test-service" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "frame-benchmarking", "frame-system", @@ -8122,6 +8152,12 @@ dependencies = [ "proc-macro2 1.0.28", ] +[[package]] +name = "radium" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" + [[package]] name = "radium" version = "0.6.2" @@ -8522,7 +8558,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "env_logger 0.8.3", "hex", @@ -8589,9 +8625,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c749134fda8bfc90d0de643d59bfc841dcb3ac8a1062e12b6754bd60235c48b3" +checksum = "7a62eca5cacf2c8261128631bed9f045598d40bfbe4b29f5163f0f802f8f44a7" dependencies = [ "libc", "librocksdb-sys", @@ -8649,7 +8685,7 @@ dependencies = [ [[package]] name = "rococo-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "beefy-primitives", "bp-messages", @@ -8874,7 +8910,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "log", "sp-core", @@ -8885,7 +8921,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -8914,7 +8950,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -8937,7 +8973,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8953,7 +8989,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8969,7 +9005,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", @@ -8980,7 +9016,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "chrono", "fdlimit", @@ -9018,7 +9054,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "derive_more 0.99.14", "fnv", @@ -9052,7 +9088,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "blake2-rfc", "hash-db", @@ -9081,7 +9117,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-trait", "futures 0.3.16", @@ -9106,7 +9142,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d867b6b4dd099ecef7bed1a1ff5a3441f41d684" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -9138,7 +9174,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -9152,7 +9188,6 @@ dependencies = [ "num-traits", "parity-scale-codec", "parking_lot 0.11.1", - "pdqselect", "rand 0.7.3", "retain_mut", "sc-client-api", @@ -9185,7 +9220,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "derive_more 0.99.14", "futures 0.3.16", @@ -9209,7 +9244,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9222,7 +9257,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-trait", "futures 0.3.16", @@ -9251,7 +9286,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "sc-client-api", "sp-authorship", @@ -9262,7 +9297,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "derive_more 0.99.14", "lazy_static", @@ -9291,7 +9326,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "derive_more 0.99.14", "parity-scale-codec", @@ -9308,7 +9343,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "log", "parity-scale-codec", @@ -9323,7 +9358,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "cfg-if 1.0.0", "libc", @@ -9343,7 +9378,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -9384,7 +9419,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "derive_more 0.99.14", "finality-grandpa", @@ -9408,7 +9443,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "ansi_term 0.12.1", "futures 0.3.16", @@ -9426,7 +9461,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -9446,7 +9481,7 @@ dependencies = [ [[package]] name = "sc-light" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "hash-db", "lazy_static", @@ -9465,7 +9500,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-std", "async-trait", @@ -9520,7 +9555,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -9537,7 +9572,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "bytes 0.5.6", "fnv", @@ -9565,7 +9600,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "futures 0.3.16", "libp2p", @@ -9578,7 +9613,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9587,7 +9622,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "futures 0.3.16", "hash-db", @@ -9622,7 +9657,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "derive_more 0.99.14", "futures 0.3.16", @@ -9647,7 +9682,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "futures 0.1.30", "jsonrpc-core", @@ -9665,7 +9700,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-trait", "directories", @@ -9733,7 +9768,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "log", "parity-scale-codec", @@ -9748,7 +9783,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -9770,7 +9805,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "chrono", "futures 0.3.16", @@ -9790,7 +9825,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "ansi_term 0.12.1", "atty", @@ -9827,7 +9862,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", @@ -9838,7 +9873,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "derive_more 0.99.14", "futures 0.3.16", @@ -9867,7 +9902,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "derive_more 0.99.14", "futures 0.3.16", @@ -9885,7 +9920,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2e62ff266e136db561a007c84569985805f84a1d5a08278e52c36aacb6e061b" dependencies = [ - "bitvec", + "bitvec 0.20.1", "cfg-if 1.0.0", "derive_more 0.99.14", "parity-scale-codec", @@ -10199,9 +10234,9 @@ dependencies = [ [[package]] name = "shlex" -version = "0.1.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" +checksum = "42a568c8f2cd051a4d283bd6eb0343ac214c1b0f1ac19f93e1175b2dee38c73d" [[package]] name = "signal-hook" @@ -10258,7 +10293,7 @@ dependencies = [ [[package]] name = "slot-range-helper" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "enumn", "parity-scale-codec", @@ -10291,6 +10326,12 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +[[package]] +name = "snap" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451" + [[package]] name = "snow" version = "0.7.2" @@ -10364,7 +10405,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "hash-db", "log", @@ -10381,7 +10422,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -10393,7 +10434,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "parity-scale-codec", "serde", @@ -10405,7 +10446,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "integer-sqrt", "num-traits", @@ -10419,7 +10460,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "parity-scale-codec", "sp-api", @@ -10431,7 +10472,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-trait", "parity-scale-codec", @@ -10443,7 +10484,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "parity-scale-codec", "sp-api", @@ -10455,7 +10496,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "futures 0.3.16", "log", @@ -10473,33 +10514,26 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-trait", "futures 0.3.16", "futures-timer 3.0.2", "log", "parity-scale-codec", - "parking_lot 0.11.1", - "serde", - "sp-api", "sp-core", "sp-inherents", "sp-runtime", "sp-state-machine", "sp-std", - "sp-trie", - "sp-utils", "sp-version", - "substrate-prometheus-endpoint", "thiserror", - "wasm-timer", ] [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d867b6b4dd099ecef7bed1a1ff5a3441f41d684" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-trait", "parity-scale-codec", @@ -10516,7 +10550,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-trait", "merlin", @@ -10538,7 +10572,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -10548,7 +10582,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -10560,7 +10594,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "base58", "blake2-rfc", @@ -10604,7 +10638,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -10613,7 +10647,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", @@ -10623,7 +10657,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "environmental", "parity-scale-codec", @@ -10634,7 +10668,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "finality-grandpa", "log", @@ -10651,7 +10685,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10665,7 +10699,7 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "futures 0.3.16", "hash-db", @@ -10690,7 +10724,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "lazy_static", "sp-core", @@ -10701,7 +10735,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -10718,7 +10752,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "ruzstd", "zstd", @@ -10727,20 +10761,20 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "parity-scale-codec", "serde", "sp-arithmetic", "sp-core", - "sp-npos-elections-compact", + "sp-npos-elections-solution-type", "sp-std", ] [[package]] -name = "sp-npos-elections-compact" +name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", @@ -10751,7 +10785,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "sp-api", "sp-core", @@ -10761,7 +10795,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "backtrace", ] @@ -10769,7 +10803,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "rustc-hash", "serde", @@ -10780,7 +10814,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "either", "hash256-std-hasher", @@ -10801,7 +10835,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10818,7 +10852,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -10830,7 +10864,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "serde", "serde_json", @@ -10839,7 +10873,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "parity-scale-codec", "sp-api", @@ -10852,7 +10886,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -10862,7 +10896,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "hash-db", "log", @@ -10885,12 +10919,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10903,7 +10937,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "log", "sp-core", @@ -10916,7 +10950,7 @@ dependencies = [ [[package]] name = "sp-test-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d867b6b4dd099ecef7bed1a1ff5a3441f41d684" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -10929,7 +10963,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -10946,7 +10980,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "erased-serde", "log", @@ -10964,7 +10998,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "sp-api", "sp-runtime", @@ -10973,7 +11007,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-trait", "log", @@ -10988,7 +11022,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "hash-db", "memory-db", @@ -11002,7 +11036,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "futures 0.3.16", "futures-core", @@ -11014,7 +11048,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11029,7 +11063,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "parity-scale-codec", "proc-macro-crate 1.0.0", @@ -11041,7 +11075,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -11344,7 +11378,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "platforms", ] @@ -11352,7 +11386,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.16", @@ -11375,7 +11409,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-std", "derive_more 0.99.14", @@ -11389,7 +11423,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "async-trait", "futures 0.1.30", @@ -11418,7 +11452,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d867b6b4dd099ecef7bed1a1ff5a3441f41d684" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "futures 0.3.16", "substrate-test-utils-derive", @@ -11428,7 +11462,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d867b6b4dd099ecef7bed1a1ff5a3441f41d684" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "proc-macro-crate 1.0.0", "quote 1.0.9", @@ -11438,7 +11472,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "ansi_term 0.12.1", "atty", @@ -12150,7 +12184,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#f2b3997004d10512aa7b412b50785e29987f883d" +source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" dependencies = [ "frame-try-runtime", "log", @@ -12179,7 +12213,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59" dependencies = [ "cfg-if 0.1.10", - "rand 0.6.5", + "rand 0.7.3", "static_assertions", ] @@ -12777,10 +12811,10 @@ dependencies = [ [[package]] name = "westend-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 0.20.1", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -13019,7 +13053,7 @@ dependencies = [ [[package]] name = "xcm" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -13030,7 +13064,7 @@ dependencies = [ [[package]] name = "xcm-builder" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "frame-support", "frame-system", @@ -13049,7 +13083,7 @@ dependencies = [ [[package]] name = "xcm-executor" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#739b882f2cf42c86703de83673fbf4b152bfa31a" +source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" dependencies = [ "frame-support", "impl-trait-for-tuples", diff --git a/pallets/dmp-queue/src/lib.rs b/pallets/dmp-queue/src/lib.rs index 9738c317490..a89931fb55f 100644 --- a/pallets/dmp-queue/src/lib.rs +++ b/pallets/dmp-queue/src/lib.rs @@ -26,7 +26,7 @@ use cumulus_primitives_core::relay_chain::BlockNumber as RelayBlockNumber; use cumulus_primitives_core::DmpMessageHandler; use codec::{Encode, Decode}; use sp_runtime::RuntimeDebug; -use xcm::{VersionedXcm, latest::{Xcm, Junction, Outcome, ExecuteXcm, Error as XcmError}}; +use xcm::{VersionedXcm, latest::{Xcm, Outcome, Parent, ExecuteXcm, Error as XcmError}}; use frame_support::{traits::EnsureOrigin, dispatch::Weight, weights::constants::WEIGHT_PER_MILLIS}; pub use pallet::*; @@ -245,7 +245,7 @@ pub mod pallet { Ok(0) }, Ok(Ok(x)) => { - let outcome = T::XcmExecutor::execute_xcm(Junction::Parent.into(), x, limit); + let outcome = T::XcmExecutor::execute_xcm(Parent.into(), x, limit); match outcome { Outcome::Error(XcmError::WeightLimitReached(required)) => Err((id, required)), outcome => { diff --git a/pallets/xcm/src/lib.rs b/pallets/xcm/src/lib.rs index 922c27bc017..294a3583762 100644 --- a/pallets/xcm/src/lib.rs +++ b/pallets/xcm/src/lib.rs @@ -25,7 +25,7 @@ use cumulus_primitives_core::{ParaId, DmpMessageHandler}; use cumulus_primitives_core::relay_chain::BlockNumber as RelayBlockNumber; use codec::{Encode, Decode}; use sp_runtime::traits::BadOrigin; -use xcm::{VersionedXcm, latest::{Xcm, Junction, Outcome, ExecuteXcm}}; +use xcm::{VersionedXcm, latest::{Xcm, Outcome, Parent, ExecuteXcm}}; use frame_support::dispatch::Weight; pub use pallet::*; @@ -118,7 +118,7 @@ impl DmpMessageHandler for UnlimitedDmpExecution { Err(_) => Pallet::::deposit_event(Event::InvalidFormat(id)), Ok(Err(())) => Pallet::::deposit_event(Event::UnsupportedVersion(id)), Ok(Ok(x)) => { - let outcome = T::XcmExecutor::execute_xcm(Junction::Parent.into(), x, limit); + let outcome = T::XcmExecutor::execute_xcm(Parent.into(), x, limit); used += outcome.weight_used(); Pallet::::deposit_event(Event::ExecutedDownward(id, outcome)); } @@ -149,7 +149,7 @@ impl DmpMessageHandler for LimitAndDropDmpExecution { Ok(Err(())) => Pallet::::deposit_event(Event::UnsupportedVersion(id)), Ok(Ok(x)) => { let weight_limit = limit.saturating_sub(used); - let outcome = T::XcmExecutor::execute_xcm(Junction::Parent.into(), x, weight_limit); + let outcome = T::XcmExecutor::execute_xcm(Parent.into(), x, weight_limit); used += outcome.weight_used(); Pallet::::deposit_event(Event::ExecutedDownward(id, outcome)); } diff --git a/pallets/xcmp-queue/src/lib.rs b/pallets/xcmp-queue/src/lib.rs index f090f3ab890..3cf197e6ea2 100644 --- a/pallets/xcmp-queue/src/lib.rs +++ b/pallets/xcmp-queue/src/lib.rs @@ -351,7 +351,7 @@ impl Pallet { log::debug!("Processing XCMP-XCM: {:?}", &hash); let (result, event) = match Xcm::::try_from(xcm) { Ok(xcm) => { - let location = (Parent, Parachain(sender.into())); + let location = (1, Parachain(sender.into())); match T::XcmExecutor::execute_xcm(location.into(), xcm, max_weight) { Outcome::Error(e) => (Err(e.clone()), Event::Fail(Some(hash), e)), Outcome::Complete(w) => (Ok(w), Event::Success(Some(hash))), @@ -777,7 +777,7 @@ impl SendXcm for Pallet { fn send_xcm(dest: MultiLocation, msg: Xcm<()>) -> Result<(), XcmError> { match &dest { // An HRMP message for a sibling parachain. - X2(Parent, Parachain(id)) => { + MultiLocation { parents: 1, interior: X1(Parachain(id)) } => { let versioned_xcm = T::VersionWrapper::wrap_version(&dest, msg) .map_err(|()| XcmError::DestinationUnsupported)?; let hash = T::Hashing::hash_of(&versioned_xcm); diff --git a/polkadot-parachains/pallets/ping/src/lib.rs b/polkadot-parachains/pallets/ping/src/lib.rs index d4f0ce28d23..9ebfd2d79ff 100644 --- a/polkadot-parachains/pallets/ping/src/lib.rs +++ b/polkadot-parachains/pallets/ping/src/lib.rs @@ -23,7 +23,7 @@ use sp_runtime::traits::Saturating; use frame_system::Config as SystemConfig; use cumulus_primitives_core::ParaId; use cumulus_pallet_xcm::{Origin as CumulusOrigin, ensure_sibling_para}; -use xcm::latest::{Xcm, Error as XcmError, SendXcm, OriginKind, MultiLocation, Junction}; +use xcm::latest::{Xcm, Error as XcmError, SendXcm, OriginKind, Junction}; pub use pallet::*; @@ -101,7 +101,7 @@ pub mod pallet { for (para, payload) in Targets::::get().into_iter() { let seq = PingCount::::mutate(|seq| { *seq += 1; *seq }); match T::XcmSender::send_xcm( - MultiLocation::X2(Junction::Parent, Junction::Parachain(para.into())), + (1, Junction::Parachain(para.into())).into(), Xcm::Transact { origin_type: OriginKind::Native, require_weight_at_most: 1_000, @@ -163,7 +163,7 @@ pub mod pallet { Self::deposit_event(Event::Pinged(para, seq, payload.clone())); match T::XcmSender::send_xcm( - MultiLocation::X2(Junction::Parent, Junction::Parachain(para.into())), + (1, Junction::Parachain(para.into())).into(), Xcm::Transact { origin_type: OriginKind::Native, require_weight_at_most: 1_000, diff --git a/polkadot-parachains/rococo/src/lib.rs b/polkadot-parachains/rococo/src/lib.rs index 36cbc6b4e4a..6050c8f94d3 100644 --- a/polkadot-parachains/rococo/src/lib.rs +++ b/polkadot-parachains/rococo/src/lib.rs @@ -257,10 +257,10 @@ impl parachain_info::Config for Runtime {} impl cumulus_pallet_aura_ext::Config for Runtime {} parameter_types! { - pub const RocLocation: MultiLocation = X1(Parent); + pub const RocLocation: MultiLocation = MultiLocation::parent(); pub const RococoNetwork: NetworkId = NetworkId::Polkadot; pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into(); - pub Ancestry: MultiLocation = X1(Parachain(ParachainInfo::parachain_id().into())); + pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); } /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used @@ -317,12 +317,13 @@ parameter_types! { // One XCM operation is 1_000_000 weight - almost certainly a conservative estimate. pub UnitWeightCost: Weight = 1_000_000; // One ROC buys 1 second of weight. - pub const WeightPrice: (MultiLocation, u128) = (X1(Parent), ROC); + pub const WeightPrice: (MultiLocation, u128) = (MultiLocation::parent(), ROC); } match_type! { pub type ParentOrParentsUnitPlurality: impl Contains = { - X1(Parent) | X2(Parent, Plurality { id: BodyId::Unit, .. }) + MultiLocation { parents: 1, interior: Here } | + MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) } }; } diff --git a/polkadot-parachains/shell/src/lib.rs b/polkadot-parachains/shell/src/lib.rs index d8c32f12ccc..a3bbf0ac0ba 100644 --- a/polkadot-parachains/shell/src/lib.rs +++ b/polkadot-parachains/shell/src/lib.rs @@ -172,7 +172,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime { impl parachain_info::Config for Runtime {} parameter_types! { - pub const RococoLocation: MultiLocation = X1(Parent); + pub const RococoLocation: MultiLocation = MultiLocation::parent(); pub const RococoNetwork: NetworkId = NetworkId::Polkadot; pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); } @@ -191,7 +191,7 @@ pub type XcmOriginToTransactDispatchOrigin = ( ); match_type! { - pub type JustTheParent: impl Contains = { X1(Parent) }; + pub type JustTheParent: impl Contains = { MultiLocation { parents:1, interior: Here } }; } parameter_types! { diff --git a/polkadot-parachains/statemine/src/lib.rs b/polkadot-parachains/statemine/src/lib.rs index 01d4be78300..65e0f1c8c7b 100644 --- a/polkadot-parachains/statemine/src/lib.rs +++ b/polkadot-parachains/statemine/src/lib.rs @@ -464,7 +464,7 @@ impl parachain_info::Config for Runtime {} impl cumulus_pallet_aura_ext::Config for Runtime {} parameter_types! { - pub const KsmLocation: MultiLocation = X1(Parent); + pub const KsmLocation: MultiLocation = MultiLocation::parent(); pub const RelayNetwork: NetworkId = NetworkId::Kusama; pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into(); pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); @@ -527,8 +527,8 @@ parameter_types! { match_type! { pub type ParentOrParentsExecutivePlurality: impl Contains = { - X1(Parent) | - X2(Parent, Plurality { id: BodyId::Executive, .. }) + MultiLocation { parents: 1, interior: Here } | + MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Executive, .. }) } }; } diff --git a/polkadot-parachains/statemint/src/lib.rs b/polkadot-parachains/statemint/src/lib.rs index e0bb6533883..fec6014434c 100644 --- a/polkadot-parachains/statemint/src/lib.rs +++ b/polkadot-parachains/statemint/src/lib.rs @@ -432,7 +432,7 @@ impl parachain_info::Config for Runtime {} impl cumulus_pallet_aura_ext::Config for Runtime {} parameter_types! { - pub const DotLocation: MultiLocation = X1(Parent); + pub const DotLocation: MultiLocation = MultiLocation::parent(); pub const RelayNetwork: NetworkId = NetworkId::Polkadot; pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into(); pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); @@ -495,8 +495,8 @@ parameter_types! { match_type! { pub type ParentOrParentsExecutivePlurality: impl Contains = { - X1(Parent) | - X2(Parent, Plurality { id: BodyId::Executive, .. }) + MultiLocation { parents: 1, interior: Here } | + MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Executive, .. }) } }; } diff --git a/polkadot-parachains/westmint/src/lib.rs b/polkadot-parachains/westmint/src/lib.rs index 10d88c1b9b8..e22e781e486 100644 --- a/polkadot-parachains/westmint/src/lib.rs +++ b/polkadot-parachains/westmint/src/lib.rs @@ -431,7 +431,7 @@ impl parachain_info::Config for Runtime {} impl cumulus_pallet_aura_ext::Config for Runtime {} parameter_types! { - pub const WestendLocation: MultiLocation = X1(Parent); + pub const WestendLocation: MultiLocation = MultiLocation::parent(); pub RelayNetwork: NetworkId = NetworkId::Named(b"Westend".to_vec()); pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into(); pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); @@ -493,8 +493,8 @@ parameter_types! { match_type! { pub type ParentOrParentsPlurality: impl Contains = { - X1(Parent) | - X2(Parent, Plurality { .. }) + MultiLocation { parents: 1, interior: Here } | + MultiLocation { parents: 1, interior: X1(Plurality { .. }) } }; } diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 04dae9ce261..f2cf5e6824c 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -34,20 +34,19 @@ use xcm::{WrapVersion, latest::prelude::*}; pub struct ParentAsUmp(PhantomData<(T, W)>); impl SendXcm for ParentAsUmp { fn send_xcm(dest: MultiLocation, msg: Xcm<()>) -> Result<(), XcmError> { - match &dest { + if dest.contains_parents_only(1) { // An upward message for the relay chain. - X1(Parent) => { - let versioned_xcm = W::wrap_version(&dest, msg) - .map_err(|()| XcmError::DestinationUnsupported)?; - let data = versioned_xcm.encode(); + let versioned_xcm = W::wrap_version(&dest, msg) + .map_err(|()| XcmError::DestinationUnsupported)?; + let data = versioned_xcm.encode(); - T::send_upward_message(data) - .map_err(|e| XcmError::SendFailed(e.into()))?; + T::send_upward_message(data) + .map_err(|e| XcmError::SendFailed(e.into()))?; - Ok(()) - } + Ok(()) + } else { // Anything else is unhandled. This includes a message this is meant for us. - _ => Err(XcmError::CannotReachDestination(dest, msg)), + Err(XcmError::CannotReachDestination(dest, msg)) } } } diff --git a/test/service/src/lib.rs b/test/service/src/lib.rs index 972488a9a1d..07373538cfa 100644 --- a/test/service/src/lib.rs +++ b/test/service/src/lib.rs @@ -36,7 +36,7 @@ pub use sc_executor::NativeExecutor; use sc_network::{config::TransportConfig, multiaddr, NetworkService}; use sc_service::{ config::{ - DatabaseConfig, KeepBlocks, KeystoreConfig, MultiaddrWithPeerId, NetworkConfiguration, + DatabaseSource, KeepBlocks, KeystoreConfig, MultiaddrWithPeerId, NetworkConfiguration, OffchainWorkerConfig, PruningMode, TransactionStorageMode, WasmExecutionMethod, }, BasePath, ChainSpec, Configuration, Error as ServiceError, PartialComponents, Role, @@ -600,7 +600,7 @@ pub fn node_config( network: network_config, keystore: KeystoreConfig::InMemory, keystore_remote: Default::default(), - database: DatabaseConfig::RocksDb { + database: DatabaseSource::RocksDb { path: root.join("db"), cache_size: 128, }, From 197f6a60f425b1d182007ab0c1c4e1f252b346c6 Mon Sep 17 00:00:00 2001 From: Keith Yeung Date: Wed, 11 Aug 2021 14:13:23 -0700 Subject: [PATCH 2/2] Make tests compile --- pallets/xcmp-queue/src/mock.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pallets/xcmp-queue/src/mock.rs b/pallets/xcmp-queue/src/mock.rs index 5ca3f0a09c3..3e240d3aaa3 100644 --- a/pallets/xcmp-queue/src/mock.rs +++ b/pallets/xcmp-queue/src/mock.rs @@ -104,8 +104,8 @@ impl cumulus_pallet_parachain_system::Config for Test { } parameter_types! { - pub const RelayChain: MultiLocation = X1(Parent); - pub Ancestry: MultiLocation = X1(Parachain(1u32.into())); + pub const RelayChain: MultiLocation = MultiLocation::parent(); + pub Ancestry: MultiLocation = X1(Parachain(1u32.into())).into(); pub UnitWeightCost: Weight = 1_000_000; }