diff --git a/cumulus/Cargo.lock b/cumulus/Cargo.lock
index 9373ff7c10..f569dd3795 100644
--- a/cumulus/Cargo.lock
+++ b/cumulus/Cargo.lock
@@ -1100,6 +1100,7 @@ dependencies = [
  "sc-network",
  "sc-service",
  "sc-transaction-pool",
+ "sp-api",
  "sp-consensus",
  "sp-core",
  "sp-inherents",
@@ -1584,7 +1585,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1592,7 +1593,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1609,9 +1610,8 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
- "Inflector",
  "frame-benchmarking",
  "parity-scale-codec",
  "sc-cli",
@@ -1628,7 +1628,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1643,7 +1643,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "11.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1654,7 +1654,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "bitmask",
  "frame-metadata",
@@ -1679,7 +1679,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support-procedural-tools",
  "proc-macro2 1.0.19",
@@ -1690,7 +1690,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1702,7 +1702,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "proc-macro2 1.0.19",
  "quote 1.0.7",
@@ -1712,7 +1712,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1728,7 +1728,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2640,8 +2640,8 @@ dependencies = [
 
 [[package]]
 name = "kusama-runtime"
-version = "0.8.19"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+version = "0.8.22"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "bitvec",
  "frame-executive",
@@ -3660,7 +3660,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3676,7 +3676,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3691,7 +3691,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3716,7 +3716,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3730,7 +3730,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3745,7 +3745,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3760,7 +3760,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3774,7 +3774,7 @@ dependencies = [
 [[package]]
 name = "pallet-finality-tracker"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3790,7 +3790,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3812,7 +3812,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -3828,7 +3828,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3847,7 +3847,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3863,7 +3863,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3877,7 +3877,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3892,7 +3892,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3906,7 +3906,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3921,7 +3921,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3936,7 +3936,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3949,7 +3949,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -3964,7 +3964,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3979,7 +3979,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3999,7 +3999,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4013,7 +4013,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4033,7 +4033,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.19",
@@ -4044,7 +4044,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4058,7 +4058,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4075,7 +4075,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4092,7 +4092,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4110,7 +4110,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -4123,7 +4123,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4137,7 +4137,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4152,7 +4152,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4466,8 +4466,8 @@ checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e"
 
 [[package]]
 name = "polkadot-availability-store"
-version = "0.8.19"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+version = "0.8.22"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "derive_more 0.99.9",
  "exit-future 0.2.0",
@@ -4493,8 +4493,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-cli"
-version = "0.8.19"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+version = "0.8.22"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "frame-benchmarking-cli",
  "futures 0.3.5",
@@ -4508,6 +4508,7 @@ dependencies = [
  "sp-api",
  "sp-core",
  "sp-runtime",
+ "sp-trie",
  "structopt",
  "substrate-build-script-utils",
  "tokio 0.2.22",
@@ -4515,8 +4516,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-collator"
-version = "0.8.19"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+version = "0.8.22"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 2.0.2",
@@ -4543,7 +4544,7 @@ dependencies = [
 [[package]]
 name = "polkadot-core-primitives"
 version = "0.7.30"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "parity-scale-codec",
  "sp-core",
@@ -4553,8 +4554,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-erasure-coding"
-version = "0.8.19"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+version = "0.8.22"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "derive_more 0.15.0",
  "parity-scale-codec",
@@ -4566,8 +4567,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-network"
-version = "0.8.19"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+version = "0.8.22"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "arrayvec 0.4.12",
  "bytes 0.5.6",
@@ -4594,8 +4595,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-parachain"
-version = "0.8.19"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+version = "0.8.22"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -4615,8 +4616,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-primitives"
-version = "0.8.19"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+version = "0.8.22"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "bitvec",
  "frame-system",
@@ -4638,8 +4639,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-rpc"
-version = "0.8.19"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+version = "0.8.22"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "jsonrpc-core",
  "pallet-transaction-payment-rpc",
@@ -4665,8 +4666,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime"
-version = "0.8.19"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+version = "0.8.22"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "bitvec",
  "frame-executive",
@@ -4730,8 +4731,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-common"
-version = "0.8.19"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+version = "0.8.22"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "bitvec",
  "frame-support",
@@ -4747,6 +4748,7 @@ dependencies = [
  "pallet-vesting",
  "parity-scale-codec",
  "polkadot-primitives",
+ "polkadot-runtime-parachains",
  "rustc-hex",
  "serde",
  "serde_derive",
@@ -4761,10 +4763,41 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "polkadot-runtime-parachains"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
+dependencies = [
+ "bitvec",
+ "frame-support",
+ "frame-system",
+ "pallet-authorship",
+ "pallet-balances",
+ "pallet-offences",
+ "pallet-session",
+ "pallet-staking",
+ "pallet-timestamp",
+ "pallet-vesting",
+ "parity-scale-codec",
+ "polkadot-primitives",
+ "rand 0.7.3",
+ "rand_chacha 0.2.2",
+ "rustc-hex",
+ "serde",
+ "sp-api",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-runtime",
+ "sp-session",
+ "sp-staking",
+ "sp-std",
+]
+
 [[package]]
 name = "polkadot-service"
-version = "0.8.19"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+version = "0.8.22"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "frame-benchmarking",
  "frame-system-rpc-runtime-api",
@@ -4785,6 +4818,7 @@ dependencies = [
  "polkadot-rpc",
  "polkadot-runtime",
  "polkadot-validation",
+ "rococo-runtime",
  "sc-authority-discovery",
  "sc-block-builder",
  "sc-chain-spec",
@@ -4822,8 +4856,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-table"
-version = "0.8.19"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+version = "0.8.22"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -4832,8 +4866,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-test-runtime"
-version = "0.8.19"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+version = "0.8.22"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "bitvec",
  "frame-executive",
@@ -4887,7 +4921,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-runtime-client"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "futures 0.3.5",
  "pallet-timestamp",
@@ -4911,7 +4945,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-service"
 version = "0.8.2"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "frame-benchmarking",
  "frame-system",
@@ -4957,8 +4991,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-validation"
-version = "0.8.19"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+version = "0.8.22"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "ansi_term 0.12.1",
  "bitvec",
@@ -5646,6 +5680,74 @@ dependencies = [
  "librocksdb-sys",
 ]
 
+[[package]]
+name = "rococo-runtime"
+version = "0.8.22"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
+dependencies = [
+ "bitvec",
+ "frame-executive",
+ "frame-support",
+ "frame-system",
+ "frame-system-rpc-runtime-api",
+ "hex-literal",
+ "log 0.3.9",
+ "pallet-authority-discovery",
+ "pallet-authorship",
+ "pallet-babe",
+ "pallet-balances",
+ "pallet-collective",
+ "pallet-democracy",
+ "pallet-elections-phragmen",
+ "pallet-finality-tracker",
+ "pallet-grandpa",
+ "pallet-identity",
+ "pallet-im-online",
+ "pallet-indices",
+ "pallet-membership",
+ "pallet-multisig",
+ "pallet-nicks",
+ "pallet-offences",
+ "pallet-proxy",
+ "pallet-randomness-collective-flip",
+ "pallet-recovery",
+ "pallet-scheduler",
+ "pallet-session",
+ "pallet-society",
+ "pallet-staking",
+ "pallet-staking-reward-curve",
+ "pallet-sudo",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "pallet-treasury",
+ "pallet-utility",
+ "pallet-vesting",
+ "parity-scale-codec",
+ "polkadot-parachain",
+ "polkadot-primitives",
+ "polkadot-runtime-common",
+ "rustc-hex",
+ "serde",
+ "serde_derive",
+ "smallvec 1.4.1",
+ "sp-api",
+ "sp-authority-discovery",
+ "sp-block-builder",
+ "sp-consensus-babe",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-std",
+ "sp-transaction-pool",
+ "sp-version",
+ "static_assertions",
+ "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rpassword"
 version = "4.0.5"
@@ -5755,7 +5857,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "bytes 0.5.6",
  "derive_more 0.99.9",
@@ -5782,7 +5884,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -5806,7 +5908,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -5823,7 +5925,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "impl-trait-for-tuples",
  "sc-chain-spec-derive",
@@ -5839,7 +5941,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.19",
@@ -5850,7 +5952,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -5891,7 +5993,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "derive_more 0.99.9",
  "fnv",
@@ -5927,7 +6029,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -5943,6 +6045,7 @@ dependencies = [
  "sc-client-api",
  "sc-executor",
  "sc-state-db",
+ "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
@@ -5956,7 +6059,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -5967,7 +6070,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "derive_more 0.99.9",
  "fork-tree",
@@ -5982,6 +6085,7 @@ dependencies = [
  "parking_lot 0.10.2",
  "pdqselect",
  "rand 0.7.3",
+ "retain_mut",
  "sc-client-api",
  "sc-consensus-epochs",
  "sc-consensus-slots",
@@ -6002,6 +6106,7 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-timestamp",
+ "sp-utils",
  "sp-version",
  "substrate-prometheus-endpoint",
 ]
@@ -6009,7 +6114,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -6033,7 +6138,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -6046,7 +6151,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -6069,7 +6174,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "log 0.4.11",
  "sc-client-api",
@@ -6083,7 +6188,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "derive_more 0.99.9",
  "lazy_static",
@@ -6111,7 +6216,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "derive_more 0.99.9",
  "log 0.4.11",
@@ -6128,7 +6233,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "log 0.4.11",
  "parity-scale-codec",
@@ -6143,7 +6248,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "cranelift-codegen",
  "cranelift-wasm",
@@ -6164,7 +6269,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "assert_matches",
  "derive_more 0.99.9",
@@ -6202,7 +6307,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "derive_more 0.99.9",
  "finality-grandpa",
@@ -6219,7 +6324,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.5",
@@ -6237,7 +6342,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "derive_more 0.99.9",
  "hex",
@@ -6253,7 +6358,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -6272,7 +6377,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "bitflags",
  "bs58",
@@ -6324,7 +6429,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -6339,7 +6444,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -6366,7 +6471,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "futures 0.3.5",
  "libp2p",
@@ -6379,7 +6484,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "log 0.4.11",
  "substrate-prometheus-endpoint",
@@ -6388,7 +6493,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -6420,7 +6525,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -6444,7 +6549,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-http-server",
@@ -6460,7 +6565,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "derive_more 0.99.9",
  "directories",
@@ -6523,7 +6628,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "log 0.4.11",
  "parity-scale-codec",
@@ -6537,7 +6642,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -6558,7 +6663,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "erased-serde",
  "log 0.4.11",
@@ -6575,7 +6680,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -6596,7 +6701,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -7022,7 +7127,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "derive_more 0.99.9",
  "log 0.4.11",
@@ -7034,7 +7139,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -7049,7 +7154,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -7061,7 +7166,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -7073,7 +7178,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.12",
@@ -7086,7 +7191,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7098,7 +7203,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -7109,7 +7214,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7121,7 +7226,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "derive_more 0.99.9",
  "log 0.4.11",
@@ -7138,7 +7243,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "serde",
  "serde_json",
@@ -7147,7 +7252,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -7157,6 +7262,7 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.10.2",
  "serde",
+ "sp-api",
  "sp-core",
  "sp-inherents",
  "sp-runtime",
@@ -7172,7 +7278,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7186,7 +7292,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -7205,7 +7311,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -7214,7 +7320,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -7226,7 +7332,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -7270,7 +7376,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "kvdb",
  "parking_lot 0.10.2",
@@ -7279,7 +7385,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "proc-macro2 1.0.19",
  "quote 1.0.7",
@@ -7289,7 +7395,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -7300,7 +7406,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "finality-grandpa",
  "log 0.4.11",
@@ -7316,7 +7422,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-tracker"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -7326,7 +7432,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "derive_more 0.99.9",
  "parity-scale-codec",
@@ -7338,7 +7444,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -7359,7 +7465,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -7370,7 +7476,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -7382,7 +7488,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.19",
@@ -7393,7 +7499,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -7403,7 +7509,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "backtrace",
  "log 0.4.11",
@@ -7412,7 +7518,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "serde",
  "sp-core",
@@ -7421,7 +7527,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -7443,7 +7549,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -7458,7 +7564,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -7470,7 +7576,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "serde",
  "serde_json",
@@ -7479,7 +7585,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7492,7 +7598,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -7502,7 +7608,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "hash-db",
  "itertools 0.9.0",
@@ -7523,12 +7629,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 
 [[package]]
 name = "sp-storage"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "impl-serde 0.2.3",
  "ref-cast",
@@ -7540,7 +7646,7 @@ dependencies = [
 [[package]]
 name = "sp-test-primitives"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
@@ -7553,7 +7659,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7567,7 +7673,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "log 0.4.11",
  "rental",
@@ -7577,7 +7683,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -7592,7 +7698,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -7606,7 +7712,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "futures 0.3.5",
  "futures-core",
@@ -7618,7 +7724,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "impl-serde 0.2.3",
  "parity-scale-codec",
@@ -7630,7 +7736,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7749,7 +7855,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "platforms",
 ]
@@ -7757,7 +7863,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.5",
@@ -7780,7 +7886,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.8.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "async-std",
  "derive_more 0.99.9",
@@ -7794,7 +7900,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "futures 0.1.29",
  "futures 0.3.5",
@@ -7820,7 +7926,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "cfg-if",
  "frame-executive",
@@ -7860,7 +7966,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime-client"
 version = "2.0.0-rc5"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 dependencies = [
  "futures 0.3.5",
  "parity-scale-codec",
@@ -7881,7 +7987,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder-runner"
 version = "1.0.6"
-source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b066029a23fdc0e6b7224a3c241c16f5122dd31b"
+source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#270a992bf299cd41b2ed4e211814d2a958e3bfc8"
 
 [[package]]
 name = "substrate-wasm-builder-runner"
@@ -9047,8 +9153,8 @@ dependencies = [
 
 [[package]]
 name = "westend-runtime"
-version = "0.8.19"
-source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#589bad99550989a793351dca05b88a34bbf0dbbf"
+version = "0.8.22"
+source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#0674ba962c7494ec88cd06dd1ae0d6f6edf97975"
 dependencies = [
  "bitvec",
  "frame-executive",
diff --git a/cumulus/collator/src/lib.rs b/cumulus/collator/src/lib.rs
index 5197a8ca3d..abcc46bd61 100644
--- a/cumulus/collator/src/lib.rs
+++ b/cumulus/collator/src/lib.rs
@@ -29,9 +29,9 @@ use cumulus_primitives::{
 };
 use cumulus_runtime::ParachainBlockData;
 
-use sc_client_api::{BlockBackend, BlockchainEvents, Finalizer, StateBackend, UsageProvider};
+use sc_client_api::{BlockBackend, Finalizer, StateBackend, UsageProvider};
 use sc_service::Configuration;
-use sp_api::{ApiExt, ProvideRuntimeApi};
+use sp_api::ApiExt;
 use sp_blockchain::HeaderBackend;
 use sp_consensus::{
 	BlockImport, BlockImportParams, BlockOrigin, BlockStatus, Environment, Error as ConsensusError,
@@ -41,15 +41,15 @@ use sp_core::traits::SpawnNamed;
 use sp_inherents::{InherentData, InherentDataProviders};
 use sp_runtime::{
 	generic::BlockId,
-	traits::{Block as BlockT, HashFor, Header as HeaderT},
+	traits::{BlakeTwo256, Block as BlockT, Header as HeaderT},
 };
 
 use polkadot_collator::{
 	BuildParachainContext, Network as CollatorNetwork, ParachainContext, RuntimeApiCollection,
 };
 use polkadot_primitives::v0::{
-	self as parachain, BlockData, GlobalValidationData, Id as ParaId, LocalValidationData,
-	Block as PBlock, DownwardMessage, Hash as PHash,
+	self as parachain, Block as PBlock, BlockData, DownwardMessage, GlobalValidationData,
+	Hash as PHash, Id as ParaId, LocalValidationData,
 };
 
 use codec::{Decode, Encode};
@@ -321,11 +321,7 @@ where
 			let (header, extrinsics) = block.deconstruct();
 
 			// Create the parachain block data for the validators.
-			let b = ParachainBlockData::<Block>::new(
-				header.clone(),
-				extrinsics,
-				proof,
-			);
+			let b = ParachainBlockData::<Block>::new(header.clone(), extrinsics, proof);
 
 			let mut block_import_params = BlockImportParams::new(BlockOrigin::Own, header);
 			block_import_params.body = Some(b.extrinsics().to_vec());
@@ -431,23 +427,90 @@ where
 {
 	type ParachainContext = Collator<Block, PF, BI, BS>;
 
-	fn build<PClient, Spawner, Extrinsic>(
+	fn build<Spawner>(
 		self,
-		polkadot_client: Arc<PClient>,
+		polkadot_client: polkadot_collator::Client,
 		spawner: Spawner,
 		polkadot_network: impl CollatorNetwork + Clone + 'static,
 	) -> Result<Self::ParachainContext, ()>
 	where
-		PClient: ProvideRuntimeApi<PBlock>
-			+ BlockchainEvents<PBlock>
-			+ HeaderBackend<PBlock>
-			+ Send
-			+ Sync
-			+ 'static,
-		PClient::Api: RuntimeApiCollection<Extrinsic>,
-		<PClient::Api as ApiExt<PBlock>>::StateBackend: StateBackend<HashFor<PBlock>>,
 		Spawner: SpawnNamed + Clone + Send + Sync + 'static,
-		Extrinsic: codec::Codec + Send + Sync + 'static,
+	{
+		let CollatorBuilder {
+			proposer_factory,
+			inherent_data_providers,
+			block_import,
+			block_status,
+			para_id,
+			client,
+			announce_block,
+			delayed_block_announce_validator,
+			_marker,
+		} = self;
+		polkadot_client.execute_with(CollatorBuilderWithClient {
+			spawner,
+			polkadot_network,
+			proposer_factory,
+			inherent_data_providers,
+			block_import,
+			block_status,
+			para_id,
+			client,
+			announce_block,
+			delayed_block_announce_validator,
+			_marker,
+		})
+	}
+}
+
+pub struct CollatorBuilderWithClient<Block: BlockT, PF, BI, Backend, Client, BS, Spawner, Network> {
+	proposer_factory: PF,
+	inherent_data_providers: InherentDataProviders,
+	block_import: BI,
+	block_status: Arc<BS>,
+	para_id: ParaId,
+	client: Arc<Client>,
+	announce_block: Arc<dyn Fn(Block::Hash, Vec<u8>) + Send + Sync>,
+	delayed_block_announce_validator: DelayedBlockAnnounceValidator<Block>,
+	_marker: PhantomData<(Block, Backend)>,
+	spawner: Spawner,
+	polkadot_network: Network,
+}
+
+impl<Block: BlockT, PF, BI, Backend, Client, BS, Spawner, Network>
+	polkadot_service::ExecuteWithClient
+	for CollatorBuilderWithClient<Block, PF, BI, Backend, Client, BS, Spawner, Network>
+where
+	PF: Environment<Block> + Send + 'static,
+	BI: BlockImport<Block, Error = sp_consensus::Error, Transaction = TransactionFor<PF, Block>>
+		+ Send
+		+ Sync
+		+ 'static,
+	Backend: sc_client_api::Backend<Block> + 'static,
+	Client: Finalizer<Block, Backend>
+		+ UsageProvider<Block>
+		+ HeaderBackend<Block>
+		+ Send
+		+ Sync
+		+ BlockBackend<Block>
+		+ 'static,
+	for<'a> &'a Client: BlockImport<Block>,
+	BS: BlockBackend<Block>,
+	Spawner: SpawnNamed + Clone + Send + Sync + 'static,
+	Network: CollatorNetwork + Clone + 'static,
+{
+	type Output = Result<Collator<Block, PF, BI, BS>, ()>;
+
+	fn execute_with_client<PClient, Api, PBackend>(
+		self,
+		polkadot_client: Arc<PClient>,
+	) -> Self::Output
+	where
+		<Api as ApiExt<PBlock>>::StateBackend: sp_api::StateBackend<BlakeTwo256>,
+		PBackend: sc_client_api::Backend<PBlock>,
+		PBackend::State: StateBackend<BlakeTwo256>,
+		Api: RuntimeApiCollection<StateBackend = PBackend::State>,
+		PClient: polkadot_service::AbstractClient<PBlock, PBackend, Api = Api> + 'static,
 	{
 		self.delayed_block_announce_validator
 			.set(Box::new(JustifiedBlockAnnounceValidator::new(
@@ -463,15 +526,16 @@ where
 				}
 			};
 
-		spawner.spawn("cumulus-follow-polkadot", follow.map(|_| ()).boxed());
+		self.spawner
+			.spawn("cumulus-follow-polkadot", follow.map(|_| ()).boxed());
 
 		Ok(Collator::new(
 			self.proposer_factory,
 			self.inherent_data_providers,
-			polkadot_network,
+			self.polkadot_network,
 			self.block_import,
 			self.block_status,
-			Arc::new(spawner),
+			Arc::new(self.spawner),
 			self.announce_block,
 		))
 	}
@@ -618,7 +682,7 @@ mod tests {
 		);
 		let context = builder
 			.build(
-				Arc::new(
+				polkadot_service::Client::Polkadot(Arc::new(
 					substrate_test_client::TestClientBuilder::<_, _, _, ()>::default()
 						.build_with_native_executor::<polkadot_service::polkadot_runtime::RuntimeApi, _>(
 							Some(NativeExecutor::<polkadot_service::PolkadotExecutor>::new(
@@ -628,7 +692,7 @@ mod tests {
 							)),
 						)
 						.0,
-				),
+				)),
 				spawner,
 				DummyCollatorNetwork,
 			)
diff --git a/cumulus/network/src/lib.rs b/cumulus/network/src/lib.rs
index 9597c4fd80..68d26134ab 100644
--- a/cumulus/network/src/lib.rs
+++ b/cumulus/network/src/lib.rs
@@ -32,9 +32,7 @@ use sp_runtime::{
 
 use polkadot_collator::Network as CollatorNetwork;
 use polkadot_network::legacy::gossip::{GossipMessage, GossipStatement};
-use polkadot_primitives::v0::{
-	Id as ParaId, ParachainHost, Block as PBlock, Hash as PHash,
-};
+use polkadot_primitives::v0::{Block as PBlock, Hash as PHash, Id as ParaId, ParachainHost};
 use polkadot_statement_table::v0::{SignedStatement, Statement};
 use polkadot_validation::check_statement;
 
@@ -244,11 +242,13 @@ impl<B: BlockT> BlockAnnounceValidator<B> for DelayedBlockAnnounceValidator<B> {
 		header: &B::Header,
 		data: &[u8],
 	) -> Result<Validation, Box<dyn std::error::Error + Send>> {
-		self.0
-			.lock()
-			.as_mut()
-			.expect("BlockAnnounceValidator is set before validating the first announcement; qed")
-			.validate(header, data)
+		match self.0.lock().as_mut() {
+			Some(validator) => validator.validate(header, data),
+			None => {
+				log::warn!("BlockAnnounce validator not yet set, rejecting block announcement");
+				Ok(Validation::Failure)
+			}
+		}
 	}
 }
 
diff --git a/cumulus/runtime/src/validate_block/tests.rs b/cumulus/runtime/src/validate_block/tests.rs
index 5265fa7858..d8656ec9dd 100644
--- a/cumulus/runtime/src/validate_block/tests.rs
+++ b/cumulus/runtime/src/validate_block/tests.rs
@@ -62,7 +62,7 @@ fn call_validate_block(
 
 	executor
 		.call_in_wasm(
-			&WASM_BINARY,
+			&WASM_BINARY.expect("You need to build the WASM binaries to run the tests!"),
 			None,
 			"validate_block",
 			&params,
diff --git a/cumulus/test/parachain/Cargo.toml b/cumulus/test/parachain/Cargo.toml
index 62781aabf7..6e9ec7c1d0 100644
--- a/cumulus/test/parachain/Cargo.toml
+++ b/cumulus/test/parachain/Cargo.toml
@@ -40,6 +40,7 @@ sc-network = { git = "https://github.com/paritytech/substrate", branch = "cumulu
 sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", version = "0.8.0-rc5" }
 sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 sc-informant = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
diff --git a/cumulus/test/parachain/build.rs b/cumulus/test/parachain/build.rs
index c9e7738e27..c3462ee391 100644
--- a/cumulus/test/parachain/build.rs
+++ b/cumulus/test/parachain/build.rs
@@ -14,29 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::{env, path::PathBuf};
-
 use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};
 
 fn main() {
 	generate_cargo_keys();
 	rerun_if_git_head_changed();
-
-	let mut manifest_dir = PathBuf::from(
-		env::var("CARGO_MANIFEST_DIR").expect("`CARGO_MANIFEST_DIR` is always set by cargo."),
-	);
-
-	while manifest_dir.parent().is_some() {
-		if manifest_dir.join(".git/HEAD").exists() {
-			println!(
-				"cargo:rerun-if-changed={}",
-				manifest_dir.join(".git/HEAD").display()
-			);
-			return;
-		}
-
-		manifest_dir.pop();
-	}
-
-	println!("cargo:warning=Could not find `.git/HEAD` from manifest dir!");
 }
diff --git a/cumulus/test/parachain/runtime/build.rs b/cumulus/test/parachain/runtime/build.rs
index 2ca8a48c1f..5fefb95548 100644
--- a/cumulus/test/parachain/runtime/build.rs
+++ b/cumulus/test/parachain/runtime/build.rs
@@ -19,7 +19,7 @@ use wasm_builder_runner::WasmBuilder;
 fn main() {
 	WasmBuilder::new()
 		.with_current_project()
-		.with_wasm_builder_from_crates("1.0.11")
+		.with_wasm_builder_from_crates("2.0.0")
 		.export_heap_base()
 		.import_memory()
 		.build()
diff --git a/cumulus/test/parachain/src/chain_spec.rs b/cumulus/test/parachain/src/chain_spec.rs
index 9e96a71cc0..fb3366e9ce 100644
--- a/cumulus/test/parachain/src/chain_spec.rs
+++ b/cumulus/test/parachain/src/chain_spec.rs
@@ -83,7 +83,7 @@ fn testnet_genesis(
 ) -> GenesisConfig {
 	GenesisConfig {
 		frame_system: Some(SystemConfig {
-			code: WASM_BINARY.to_vec(),
+			code: WASM_BINARY.expect("WASM binary was not build, please build it!").to_vec(),
 			changes_trie_config: Default::default(),
 		}),
 		pallet_balances: Some(BalancesConfig {
diff --git a/cumulus/test/parachain/src/integration_test.rs b/cumulus/test/parachain/src/integration_test.rs
index a9909bbb64..d621da03d5 100644
--- a/cumulus/test/parachain/src/integration_test.rs
+++ b/cumulus/test/parachain/src/integration_test.rs
@@ -42,9 +42,7 @@ static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TE
 #[tokio::test]
 #[ignore]
 async fn integration_test() {
-	let task_executor: TaskExecutor = (|fut, _| {
-		spawn(fut).map(|_| ())
-	}).into();
+	let task_executor: TaskExecutor = (|fut, _| spawn(fut).map(|_| ())).into();
 
 	// start alice
 	let mut alice =
@@ -82,7 +80,10 @@ async fn integration_test() {
 				Info {
 					scheduling: Scheduling::Always,
 				},
-				parachain_runtime::WASM_BINARY.to_vec().into(),
+				parachain_runtime::WASM_BINARY
+					.expect("You need to build the WASM binary to run this test!")
+					.to_vec()
+					.into(),
 				genesis_state.into(),
 			)),
 		)));
@@ -104,7 +105,8 @@ async fn integration_test() {
 		let parachain_config =
 			parachain_config(task_executor.clone(), Charlie, vec![], para_id).unwrap();
 		let (_service, charlie_client) =
-			crate::service::run_collator(parachain_config, key, polkadot_config, para_id, true).unwrap();
+			crate::service::run_collator(parachain_config, key, polkadot_config, para_id, true)
+				.unwrap();
 		sleep(Duration::from_secs(3)).await;
 		charlie_client.wait_for_blocks(4).await;
 
diff --git a/cumulus/test/parachain/src/service.rs b/cumulus/test/parachain/src/service.rs
index 3332d000e7..44fa6e9af2 100644
--- a/cumulus/test/parachain/src/service.rs
+++ b/cumulus/test/parachain/src/service.rs
@@ -16,9 +16,9 @@
 
 use ansi_term::Color;
 use cumulus_collator::{prepare_collator_config, CollatorBuilder};
-use cumulus_network::DelayedBlockAnnounceValidator;
+use cumulus_network::{DelayedBlockAnnounceValidator, JustifiedBlockAnnounceValidator};
 use futures::{future::ready, FutureExt};
-use polkadot_primitives::v0::CollatorPair;
+use polkadot_primitives::v0::{CollatorPair, Block as PBlock, Id as ParaId};
 use sc_executor::native_executor_instance;
 pub use sc_executor::NativeExecutor;
 use sc_informant::OutputFormat;
@@ -26,7 +26,8 @@ use sc_service::{Configuration, PartialComponents, TaskManager, TFullBackend, TF
 use std::sync::Arc;
 use sp_core::crypto::Pair;
 use sp_trie::PrefixedMemoryDB;
-use sp_runtime::traits::BlakeTwo256;
+use sp_runtime::traits::{BlakeTwo256, Block as BlockT};
+use polkadot_service::{AbstractClient, RuntimeApiCollection};
 
 // Our native executor instance.
 native_executor_instance!(
@@ -206,11 +207,11 @@ pub fn run_collator(
 			.spawn("polkadot", polkadot_future);
 	} else {
 		let is_light = matches!(polkadot_config.role, Role::Light);
-		let builder = polkadot_service::NodeBuilder::new(polkadot_config);
-		let mut polkadot_task_manager = if is_light {
-			return Err("Light client not supported.".into());
+		let (mut polkadot_task_manager, client, _) = if is_light {
+			Err("Light client not supported.".into())
 		} else {
-			builder.build_full(
+			polkadot_service::build_full(
+				polkadot_config,
 				Some((key.public(), id)),
 				None,
 				false,
@@ -221,6 +222,7 @@ pub fn run_collator(
 		let polkadot_future = async move {
 			polkadot_task_manager.future().await.expect("polkadot essential task failed");
 		};
+		client.execute_with(SetDelayedBlockAnnounceValidator { block_announce_validator, para_id: id });
 
 		task_manager
 			.spawn_essential_handle()
@@ -229,3 +231,22 @@ pub fn run_collator(
 
 	Ok((task_manager, client))
 }
+
+struct SetDelayedBlockAnnounceValidator<B: BlockT> {
+	block_announce_validator: DelayedBlockAnnounceValidator<B>,
+	para_id: ParaId,
+}
+
+impl<B: BlockT> polkadot_service::ExecuteWithClient for SetDelayedBlockAnnounceValidator<B> {
+	type Output = ();
+
+	fn execute_with_client<Client, Api, Backend>(self, client: Arc<Client>) -> Self::Output
+		where<Api as sp_api::ApiExt<PBlock>>::StateBackend: sp_api::StateBackend<BlakeTwo256>,
+		Backend: sc_client_api::Backend<PBlock>,
+		Backend::State: sp_api::StateBackend<BlakeTwo256>,
+		Api: RuntimeApiCollection<StateBackend = Backend::State>,
+		Client: AbstractClient<PBlock, Backend, Api = Api> + 'static
+	{
+		self.block_announce_validator.set(Box::new(JustifiedBlockAnnounceValidator::new(client, self.para_id)));
+	}
+}
diff --git a/cumulus/test/runtime/build.rs b/cumulus/test/runtime/build.rs
index 2fff5dcf07..5e8fb044e5 100644
--- a/cumulus/test/runtime/build.rs
+++ b/cumulus/test/runtime/build.rs
@@ -19,7 +19,7 @@ use wasm_builder_runner::WasmBuilder;
 fn main() {
 	WasmBuilder::new()
 		.with_current_project()
-		.with_wasm_builder_from_crates("1.0.11")
+		.with_wasm_builder_from_crates("2.0.0")
 		.export_heap_base()
 		.import_memory()
 		.build()