From 7d473c1c11b77e1c68e91e97e3ace7415d7b9ebf Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Thu, 12 Aug 2021 11:26:49 +0200
Subject: [PATCH] Use new MultiLocation syntax everywhere (#570)

* Use new MultiLocation syntax everywhere

* Make tests compile
---
 Cargo.lock                                  | 787 ++++++++++----------
 pallets/dmp-queue/src/lib.rs                |   4 +-
 pallets/xcm/src/lib.rs                      |   6 +-
 pallets/xcmp-queue/src/lib.rs               |   4 +-
 pallets/xcmp-queue/src/mock.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 +-
 13 files changed, 442 insertions(+), 423 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 50d47de2a0..40f976cd4a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -90,12 +90,6 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
-[[package]]
-name = "ahash"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
-
 [[package]]
 name = "ahash"
 version = "0.7.4"
@@ -501,7 +495,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#267ea4530647376704cc116b6d524857c1a596b0"
 dependencies = [
  "beefy-primitives",
  "fnv",
@@ -531,7 +525,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget-rpc"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#267ea4530647376704cc116b6d524857c1a596b0"
 dependencies = [
  "beefy-gadget",
  "beefy-primitives",
@@ -552,12 +546,12 @@ dependencies = [
 [[package]]
 name = "beefy-merkle-tree"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0"
+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=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#267ea4530647376704cc116b6d524857c1a596b0"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -579,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",
@@ -602,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"
@@ -609,7 +615,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f5011ffc90248764d7005b0e10c7294f5aa1bd87d9dd7248f4ad475b347c294d"
 dependencies = [
  "funty",
- "radium",
+ "radium 0.6.2",
  "tap",
  "wyz",
 ]
@@ -735,7 +741,7 @@ dependencies = [
 [[package]]
 name = "bp-header-chain"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "finality-grandpa",
  "frame-support",
@@ -750,7 +756,7 @@ dependencies = [
 [[package]]
 name = "bp-message-dispatch"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "bp-runtime",
  "frame-support",
@@ -761,9 +767,9 @@ dependencies = [
 [[package]]
 name = "bp-messages"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
- "bitvec",
+ "bitvec 0.20.1",
  "bp-runtime",
  "frame-support",
  "frame-system",
@@ -776,7 +782,7 @@ dependencies = [
 [[package]]
 name = "bp-polkadot-core"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "bp-messages",
  "bp-runtime",
@@ -793,7 +799,7 @@ dependencies = [
 [[package]]
 name = "bp-rialto"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "bp-messages",
  "bp-runtime",
@@ -808,7 +814,7 @@ dependencies = [
 [[package]]
 name = "bp-rococo"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "bp-messages",
  "bp-polkadot-core",
@@ -825,7 +831,7 @@ dependencies = [
 [[package]]
 name = "bp-runtime"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "frame-support",
  "hash-db",
@@ -842,7 +848,7 @@ dependencies = [
 [[package]]
 name = "bp-test-utils"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "bp-header-chain",
  "ed25519-dalek",
@@ -857,7 +863,7 @@ dependencies = [
 [[package]]
 name = "bp-wococo"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "bp-messages",
  "bp-polkadot-core",
@@ -872,7 +878,7 @@ dependencies = [
 [[package]]
 name = "bridge-runtime-common"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "bp-message-dispatch",
  "bp-messages",
@@ -1011,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",
 ]
@@ -2605,7 +2611,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2623,7 +2629,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2642,7 +2648,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "Inflector",
  "chrono",
@@ -2668,7 +2674,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2681,7 +2687,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2696,7 +2702,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "14.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -2707,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2733,7 +2739,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -2745,7 +2751,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 1.0.0",
@@ -2757,7 +2763,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "proc-macro2 1.0.28",
  "quote 1.0.9",
@@ -2767,7 +2773,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -2784,7 +2790,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2798,7 +2804,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2807,7 +2813,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3208,22 +3214,13 @@ dependencies = [
  "crunchy",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
-dependencies = [
- "ahash 0.4.7",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 dependencies = [
- "ahash 0.7.4",
+ "ahash",
 ]
 
 [[package]]
@@ -3262,9 +3259,9 @@ dependencies = [
 
 [[package]]
 name = "hex-literal"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5af1f635ef1bc545d78392b136bfe1c9809e029023c84a3638a864a10b8819c8"
+checksum = "21e4590e13640f19f249fe3e4eca5113bc4289f2497710378190e7f4bd96f45b"
 
 [[package]]
 name = "hex-literal-impl"
@@ -3614,7 +3611,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
 dependencies = [
  "autocfg 1.0.1",
- "hashbrown 0.11.2",
+ "hashbrown",
  "serde",
 ]
 
@@ -3923,11 +3920,11 @@ dependencies = [
 
 [[package]]
 name = "kusama-runtime"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+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",
@@ -3936,7 +3933,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
  "log",
  "pallet-authority-discovery",
  "pallet-authorship",
@@ -4037,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",
@@ -4533,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",
@@ -4696,11 +4693,11 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f374d42cdfc1d7dbf3d3dec28afab2eb97ffbf43a3234d795b5986dbf4b90ba"
+checksum = "7ea2d928b485416e8908cff2d97d621db22b27f7b3b6729e438bcf42c671ba91"
 dependencies = [
- "hashbrown 0.9.1",
+ "hashbrown",
 ]
 
 [[package]]
@@ -4712,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"
@@ -4803,7 +4820,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de006e09d04fc301a5f7e817b75aa49801c4479a8af753764416b085337ddcc5"
 dependencies = [
  "hash-db",
- "hashbrown 0.11.2",
+ "hashbrown",
  "parity-util-mem",
 ]
 
@@ -4836,8 +4853,8 @@ dependencies = [
 
 [[package]]
 name = "metered-channel"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "derive_more 0.99.14",
  "futures 0.3.16",
@@ -5104,7 +5121,7 @@ dependencies = [
 [[package]]
 name = "node-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-system",
  "parity-scale-codec",
@@ -5127,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",
 ]
@@ -5272,7 +5291,7 @@ dependencies = [
 [[package]]
 name = "pallet-assets"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5285,7 +5304,7 @@ dependencies = [
 [[package]]
 name = "pallet-aura"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5301,7 +5320,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5316,7 +5335,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5330,7 +5349,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5353,7 +5372,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5367,7 +5386,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#267ea4530647376704cc116b6d524857c1a596b0"
 dependencies = [
  "beefy-primitives",
  "frame-support",
@@ -5383,7 +5402,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy-mmr"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#267ea4530647376704cc116b6d524857c1a596b0"
 dependencies = [
  "beefy-merkle-tree",
  "beefy-primitives",
@@ -5408,7 +5427,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5422,7 +5441,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-dispatch"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "bp-message-dispatch",
  "bp-runtime",
@@ -5438,7 +5457,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-grandpa"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "bp-header-chain",
  "bp-runtime",
@@ -5459,9 +5478,9 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-messages"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
- "bitvec",
+ "bitvec 0.20.1",
  "bp-message-dispatch",
  "bp-messages",
  "bp-rialto",
@@ -5504,7 +5523,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5520,7 +5539,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5535,7 +5554,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5556,7 +5575,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5573,7 +5592,7 @@ dependencies = [
 [[package]]
 name = "pallet-gilt"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5587,7 +5606,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5609,7 +5628,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5624,7 +5643,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5643,7 +5662,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5659,7 +5678,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5674,7 +5693,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "ckb-merkle-mountain-range",
  "frame-benchmarking",
@@ -5691,7 +5710,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5707,7 +5726,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -5725,7 +5744,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5740,7 +5759,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5753,7 +5772,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5769,7 +5788,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5791,7 +5810,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5806,7 +5825,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5819,7 +5838,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -5833,7 +5852,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5848,7 +5867,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5868,7 +5887,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5884,7 +5903,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5897,7 +5916,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5921,7 +5940,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2 1.0.28",
@@ -5932,7 +5951,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -5941,7 +5960,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5954,7 +5973,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5972,7 +5991,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5987,7 +6006,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6003,7 +6022,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -6020,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=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -6031,7 +6050,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6047,7 +6066,7 @@ dependencies = [
 [[package]]
 name = "pallet-uniques"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6061,7 +6080,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6076,7 +6095,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -6089,8 +6108,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-xcm"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6116,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",
@@ -6126,9 +6145,11 @@ dependencies = [
  "hex",
  "libc",
  "log",
+ "lz4",
  "memmap2",
  "parking_lot 0.11.1",
  "rand 0.8.4",
+ "snap",
 ]
 
 [[package]]
@@ -6156,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",
@@ -6208,7 +6229,7 @@ checksum = "7ad6f1acec69b95caf435bbd158d486e5a0a44fcf51531e84922c59ff09e8457"
 dependencies = [
  "cfg-if 1.0.0",
  "ethereum-types",
- "hashbrown 0.11.2",
+ "hashbrown",
  "impl-trait-for-tuples",
  "lru",
  "parity-util-mem-derive",
@@ -6391,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"
@@ -6540,8 +6555,8 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325"
 
 [[package]]
 name = "polkadot-approval-distribution"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "futures 0.3.16",
  "polkadot-node-network-protocol",
@@ -6554,8 +6569,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "futures 0.3.16",
  "polkadot-node-network-protocol",
@@ -6567,8 +6582,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-distribution"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "futures 0.3.16",
  "lru",
@@ -6590,8 +6605,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-recovery"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "futures 0.3.16",
  "lru",
@@ -6609,8 +6624,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-cli"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "frame-benchmarking-cli",
  "futures 0.3.16",
@@ -6629,8 +6644,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-client"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "beefy-primitives",
  "frame-benchmarking",
@@ -6732,8 +6747,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-collator-protocol"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "always-assert",
  "futures 0.3.16",
@@ -6752,8 +6767,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-core-primitives"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
@@ -6764,8 +6779,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-dispute-distribution"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "futures 0.3.16",
  "lru",
@@ -6788,8 +6803,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-erasure-coding"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-primitives",
@@ -6802,8 +6817,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-gossip-support"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "futures 0.3.16",
  "polkadot-node-network-protocol",
@@ -6820,8 +6835,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-network-bridge"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -6840,8 +6855,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-collation-generation"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "futures 0.3.16",
  "parity-scale-codec",
@@ -6858,10 +6873,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-approval-voting"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+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",
@@ -6888,10 +6903,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-av-store"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+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",
@@ -6908,10 +6923,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-backing"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+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",
@@ -6926,8 +6941,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "futures 0.3.16",
  "polkadot-node-subsystem",
@@ -6941,8 +6956,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-candidate-validation"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -6959,8 +6974,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-chain-api"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "futures 0.3.16",
  "polkadot-node-subsystem",
@@ -6974,8 +6989,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-chain-selection"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
@@ -6991,10 +7006,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-dispute-coordinator"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+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",
@@ -7010,8 +7025,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-dispute-participation"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "futures 0.3.16",
  "polkadot-node-primitives",
@@ -7023,8 +7038,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-parachains-inherent"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -7040,10 +7055,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-provisioner"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+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",
@@ -7055,8 +7070,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-pvf"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "always-assert",
  "assert_matches",
@@ -7085,8 +7100,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-runtime-api"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "futures 0.3.16",
  "memory-lru",
@@ -7103,8 +7118,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-jaeger"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "async-std",
  "lazy_static",
@@ -7121,8 +7136,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-metrics"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -7137,8 +7152,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-network-protocol"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -7154,8 +7169,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-primitives"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "futures 0.3.16",
  "parity-scale-codec",
@@ -7178,8 +7193,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-node-subsystem-types",
@@ -7188,8 +7203,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem-test-helpers"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -7214,8 +7229,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem-types"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "async-std",
  "async-trait",
@@ -7244,8 +7259,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem-util"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -7274,8 +7289,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-overseer"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -7296,8 +7311,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-overseer-all-subsystems-gen"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "assert_matches",
  "proc-macro2 1.0.28",
@@ -7307,8 +7322,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-overseer-gen"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -7324,8 +7339,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-overseer-gen-proc-macro"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2 1.0.28",
@@ -7335,8 +7350,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-parachain"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "derive_more 0.99.14",
  "frame-support",
@@ -7351,12 +7366,12 @@ dependencies = [
 
 [[package]]
 name = "polkadot-primitives"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
- "bitvec",
+ "bitvec 0.20.1",
  "frame-system",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
  "parity-scale-codec",
  "parity-util-mem",
  "polkadot-core-primitives",
@@ -7381,8 +7396,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-rpc"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "beefy-gadget",
  "beefy-gadget-rpc",
@@ -7414,11 +7429,11 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+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",
@@ -7427,7 +7442,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
  "log",
  "pallet-authority-discovery",
  "pallet-authorship",
@@ -7489,10 +7504,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-common"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
- "bitvec",
+ "bitvec 0.20.1",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -7532,11 +7547,11 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-parachains"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+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",
@@ -7571,15 +7586,15 @@ dependencies = [
 
 [[package]]
 name = "polkadot-service"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "async-trait",
  "beefy-gadget",
  "beefy-primitives",
  "frame-system-rpc-runtime-api",
  "futures 0.3.16",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
  "kusama-runtime",
  "kvdb",
  "kvdb-rocksdb",
@@ -7620,7 +7635,7 @@ dependencies = [
  "polkadot-runtime",
  "polkadot-runtime-parachains",
  "polkadot-statement-distribution",
- "rococo-runtime 0.9.9-1",
+ "rococo-runtime 0.9.9",
  "sc-authority-discovery",
  "sc-basic-authorship",
  "sc-block-builder",
@@ -7667,8 +7682,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-distribution"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "arrayvec 0.5.2",
  "futures 0.3.16",
@@ -7688,8 +7703,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-table"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -7698,8 +7713,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-test-client"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-subsystem",
@@ -7723,11 +7738,11 @@ dependencies = [
 
 [[package]]
 name = "polkadot-test-runtime"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+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",
@@ -7783,8 +7798,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-test-service"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "frame-benchmarking",
  "frame-system",
@@ -8137,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"
@@ -8537,7 +8558,7 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "env_logger 0.8.3",
  "hex",
@@ -8604,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",
@@ -8629,7 +8650,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
  "log",
  "pallet-assets",
  "pallet-aura",
@@ -8663,8 +8684,8 @@ dependencies = [
 
 [[package]]
 name = "rococo-runtime"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "beefy-primitives",
  "bp-messages",
@@ -8676,7 +8697,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "frame-system-rpc-runtime-api",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
  "log",
  "pallet-authority-discovery",
  "pallet-authorship",
@@ -8889,7 +8910,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "log",
  "sp-core",
@@ -8900,7 +8921,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "derive_more 0.99.14",
@@ -8929,7 +8950,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
@@ -8952,7 +8973,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -8968,7 +8989,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8984,7 +9005,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2 1.0.28",
@@ -8995,7 +9016,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "chrono",
  "fdlimit",
@@ -9033,7 +9054,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "derive_more 0.99.14",
  "fnv",
@@ -9067,7 +9088,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -9096,7 +9117,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -9121,7 +9142,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "derive_more 0.99.14",
@@ -9153,7 +9174,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "derive_more 0.99.14",
@@ -9167,7 +9188,6 @@ dependencies = [
  "num-traits",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "pdqselect",
  "rand 0.7.3",
  "retain_mut",
  "sc-client-api",
@@ -9200,7 +9220,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "derive_more 0.99.14",
  "futures 0.3.16",
@@ -9224,7 +9244,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -9237,7 +9257,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -9266,7 +9286,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "sc-client-api",
  "sp-authorship",
@@ -9277,7 +9297,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "derive_more 0.99.14",
  "lazy_static",
@@ -9306,7 +9326,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "derive_more 0.99.14",
  "parity-scale-codec",
@@ -9323,7 +9343,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9338,7 +9358,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -9358,7 +9378,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "derive_more 0.99.14",
@@ -9399,7 +9419,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "derive_more 0.99.14",
  "finality-grandpa",
@@ -9423,7 +9443,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.16",
@@ -9441,7 +9461,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "derive_more 0.99.14",
@@ -9461,7 +9481,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -9480,7 +9500,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-std",
  "async-trait",
@@ -9535,7 +9555,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
@@ -9552,7 +9572,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -9580,7 +9600,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "futures 0.3.16",
  "libp2p",
@@ -9593,7 +9613,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -9602,7 +9622,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "futures 0.3.16",
  "hash-db",
@@ -9637,7 +9657,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "derive_more 0.99.14",
  "futures 0.3.16",
@@ -9662,7 +9682,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "futures 0.1.30",
  "jsonrpc-core",
@@ -9680,7 +9700,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "directories",
@@ -9748,7 +9768,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9763,7 +9783,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -9785,7 +9805,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "chrono",
  "futures 0.3.16",
@@ -9805,7 +9825,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -9842,7 +9862,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2 1.0.28",
@@ -9853,7 +9873,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "derive_more 0.99.14",
  "futures 0.3.16",
@@ -9882,7 +9902,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "derive_more 0.99.14",
  "futures 0.3.16",
@@ -9900,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",
@@ -10189,7 +10209,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
  "log",
  "parachain-info",
  "parity-scale-codec",
@@ -10214,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"
@@ -10272,8 +10292,8 @@ dependencies = [
 
 [[package]]
 name = "slot-range-helper"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "enumn",
  "parity-scale-codec",
@@ -10306,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"
@@ -10379,7 +10405,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "hash-db",
  "log",
@@ -10396,7 +10422,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate 1.0.0",
@@ -10408,7 +10434,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -10420,7 +10446,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -10434,7 +10460,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -10446,7 +10472,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10458,7 +10484,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -10470,7 +10496,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "futures 0.3.16",
  "log",
@@ -10488,33 +10514,26 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+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=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10531,7 +10550,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "merlin",
@@ -10553,7 +10572,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -10563,7 +10582,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -10575,7 +10594,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -10619,7 +10638,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -10628,7 +10647,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "proc-macro2 1.0.28",
  "quote 1.0.9",
@@ -10638,7 +10657,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -10649,7 +10668,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -10666,7 +10685,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -10680,7 +10699,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "futures 0.3.16",
  "hash-db",
@@ -10705,7 +10724,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -10716,7 +10735,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "derive_more 0.99.14",
@@ -10733,7 +10752,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "ruzstd",
  "zstd",
@@ -10742,20 +10761,20 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+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=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2 1.0.28",
@@ -10766,7 +10785,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -10776,7 +10795,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "backtrace",
 ]
@@ -10784,7 +10803,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -10795,7 +10814,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -10816,7 +10835,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -10833,7 +10852,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.0.0",
@@ -10845,7 +10864,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "serde",
  "serde_json",
@@ -10854,7 +10873,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -10867,7 +10886,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -10877,7 +10896,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "hash-db",
  "log",
@@ -10900,12 +10919,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+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=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -10918,7 +10937,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "log",
  "sp-core",
@@ -10931,7 +10950,7 @@ dependencies = [
 [[package]]
 name = "sp-test-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
@@ -10944,7 +10963,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "futures-timer 3.0.2",
@@ -10961,7 +10980,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "erased-serde",
  "log",
@@ -10979,7 +10998,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -10988,7 +11007,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "log",
@@ -11003,7 +11022,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -11017,7 +11036,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "futures 0.3.16",
  "futures-core",
@@ -11029,7 +11048,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -11044,7 +11063,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "proc-macro-crate 1.0.0",
@@ -11056,7 +11075,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -11097,7 +11116,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "hex",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
  "log",
  "node-primitives",
  "pallet-assets",
@@ -11185,7 +11204,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "hex",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
  "log",
  "node-primitives",
  "pallet-assets",
@@ -11359,7 +11378,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "platforms",
 ]
@@ -11367,7 +11386,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.16",
@@ -11390,7 +11409,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-std",
  "derive_more 0.99.14",
@@ -11404,7 +11423,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "futures 0.1.30",
@@ -11433,7 +11452,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "futures 0.3.16",
  "substrate-test-utils-derive",
@@ -11443,7 +11462,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "quote 1.0.9",
@@ -11453,7 +11472,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -11575,18 +11594,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.24"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
+checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.24"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
+checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
 dependencies = [
  "proc-macro2 1.0.28",
  "quote 1.0.9",
@@ -12089,7 +12108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9eac131e334e81b6b3be07399482042838adcd7957aa0010231d0813e39e02fa"
 dependencies = [
  "hash-db",
- "hashbrown 0.11.2",
+ "hashbrown",
  "log",
  "rustc-hex",
  "smallvec 1.6.1",
@@ -12165,7 +12184,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-try-runtime",
  "log",
@@ -12791,11 +12810,11 @@ dependencies = [
 
 [[package]]
 name = "westend-runtime"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+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",
@@ -12804,7 +12823,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
  "log",
  "pallet-authority-discovery",
  "pallet-authorship",
@@ -12892,7 +12911,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "hex",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
  "log",
  "node-primitives",
  "pallet-assets",
@@ -13033,8 +13052,8 @@ dependencies = [
 
 [[package]]
 name = "xcm"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "derivative",
  "impl-trait-for-tuples",
@@ -13044,8 +13063,8 @@ dependencies = [
 
 [[package]]
 name = "xcm-builder"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -13063,8 +13082,8 @@ dependencies = [
 
 [[package]]
 name = "xcm-executor"
-version = "0.9.9-1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587"
+version = "0.9.9"
+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 9738c31749..a89931fb55 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 922c27bc01..294a358376 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<T: Config> DmpMessageHandler for UnlimitedDmpExecution<T> {
 				Err(_) => Pallet::<T>::deposit_event(Event::InvalidFormat(id)),
 				Ok(Err(())) => Pallet::<T>::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::<T>::deposit_event(Event::ExecutedDownward(id, outcome));
 				}
@@ -149,7 +149,7 @@ impl<T: Config> DmpMessageHandler for LimitAndDropDmpExecution<T> {
 				Ok(Err(())) => Pallet::<T>::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::<T>::deposit_event(Event::ExecutedDownward(id, outcome));
 				}
diff --git a/pallets/xcmp-queue/src/lib.rs b/pallets/xcmp-queue/src/lib.rs
index f090f3ab89..3cf197e6ea 100644
--- a/pallets/xcmp-queue/src/lib.rs
+++ b/pallets/xcmp-queue/src/lib.rs
@@ -351,7 +351,7 @@ impl<T: Config> Pallet<T> {
 		log::debug!("Processing XCMP-XCM: {:?}", &hash);
 		let (result, event) = match Xcm::<T::Call>::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<T: Config> SendXcm for Pallet<T> {
 	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/pallets/xcmp-queue/src/mock.rs b/pallets/xcmp-queue/src/mock.rs
index 5ca3f0a09c..3e240d3aaa 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;
 }
 
diff --git a/polkadot-parachains/pallets/ping/src/lib.rs b/polkadot-parachains/pallets/ping/src/lib.rs
index d4f0ce28d2..9ebfd2d79f 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::<T>::get().into_iter() {
 				let seq = PingCount::<T>::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 36cbc6b4e4..6050c8f94d 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<MultiLocation> = {
-		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 d8c32f12cc..a3bbf0ac0b 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<MultiLocation> = { X1(Parent) };
+	pub type JustTheParent: impl Contains<MultiLocation> = { MultiLocation { parents:1, interior: Here } };
 }
 
 parameter_types! {
diff --git a/polkadot-parachains/statemine/src/lib.rs b/polkadot-parachains/statemine/src/lib.rs
index 920d591954..8e84062ad0 100644
--- a/polkadot-parachains/statemine/src/lib.rs
+++ b/polkadot-parachains/statemine/src/lib.rs
@@ -466,7 +466,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();
@@ -529,8 +529,8 @@ parameter_types! {
 
 match_type! {
 	pub type ParentOrParentsExecutivePlurality: impl Contains<MultiLocation> = {
-		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 e0bb653388..fec6014434 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<MultiLocation> = {
-		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 c6d121ea38..ff166ec92e 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<MultiLocation> = {
-		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 b4fe298f5c..f2cf5e6824 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<T, W>(PhantomData<(T, W)>);
 impl<T: UpwardMessageSender, W: WrapVersion> SendXcm for ParentAsUmp<T, W> {
 	fn send_xcm(dest: MultiLocation, msg: Xcm<()>) -> Result<(), XcmError> {
-		match &dest {
+		if dest.contains_parents_only(1) {
 			// An upward message for the relay chain.
-			MultiLocation::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 972488a9a1..07373538cf 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,
 		},