From 59a23c8d8d5ff258570432b5452986e82631286f Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <sergei@parity.io>
Date: Mon, 28 Jun 2021 22:38:28 +0200
Subject: [PATCH] Update Substrate & Polkadot (#519)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update Substrate & Polkadot

* Basti improvements

Co-authored-by: Bastian Köcher <info@kchr.de>
---
 cumulus/Cargo.lock                            | 599 ++++++++----------
 .../client/consensus/relay-chain/src/lib.rs   |   4 +-
 cumulus/client/pov-recovery/src/lib.rs        |   2 +
 cumulus/pallets/parachain-system/Cargo.toml   |   1 -
 .../src/validate_block/tests.rs               |  34 +-
 5 files changed, 304 insertions(+), 336 deletions(-)

diff --git a/cumulus/Cargo.lock b/cumulus/Cargo.lock
index 0f69263a34c..905b75fdc2b 100644
--- a/cumulus/Cargo.lock
+++ b/cumulus/Cargo.lock
@@ -476,7 +476,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#910a83de197bd245101d01be4d252c353a2256c6"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#be278c0dbe10d78ad1ea8a6a9352af181c9b21b1"
 dependencies = [
  "beefy-primitives",
  "futures 0.3.15",
@@ -504,7 +504,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget-rpc"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#910a83de197bd245101d01be4d252c353a2256c6"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#be278c0dbe10d78ad1ea8a6a9352af181c9b21b1"
 dependencies = [
  "beefy-gadget",
  "beefy-primitives",
@@ -525,7 +525,7 @@ dependencies = [
 [[package]]
 name = "beefy-primitives"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#910a83de197bd245101d01be4d252c353a2256c6"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#be278c0dbe10d78ad1ea8a6a9352af181c9b21b1"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -703,7 +703,7 @@ dependencies = [
 [[package]]
 name = "bp-header-chain"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "finality-grandpa",
  "frame-support",
@@ -718,19 +718,22 @@ dependencies = [
 [[package]]
 name = "bp-messages"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
+ "bitvec",
  "bp-runtime",
  "frame-support",
  "frame-system",
+ "impl-trait-for-tuples",
  "parity-scale-codec",
+ "serde",
  "sp-std",
 ]
 
 [[package]]
 name = "bp-polkadot-core"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "bp-messages",
  "bp-runtime",
@@ -747,13 +750,14 @@ dependencies = [
 [[package]]
 name = "bp-rococo"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
- "bp-header-chain",
  "bp-messages",
  "bp-polkadot-core",
  "bp-runtime",
+ "frame-support",
  "parity-scale-codec",
+ "smallvec 1.6.1",
  "sp-api",
  "sp-runtime",
  "sp-std",
@@ -763,7 +767,7 @@ dependencies = [
 [[package]]
 name = "bp-runtime"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "frame-support",
  "hash-db",
@@ -780,7 +784,7 @@ dependencies = [
 [[package]]
 name = "bp-test-utils"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "bp-header-chain",
  "ed25519-dalek",
@@ -795,17 +799,16 @@ dependencies = [
 [[package]]
 name = "bp-wococo"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
- "bp-header-chain",
  "bp-messages",
  "bp-polkadot-core",
+ "bp-rococo",
  "bp-runtime",
  "parity-scale-codec",
  "sp-api",
  "sp-runtime",
  "sp-std",
- "sp-version",
 ]
 
 [[package]]
@@ -903,19 +906,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "cargo_metadata"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7714a157da7991e23d90686b9524b9e12e0407a108647f52e9328f4b3d51ac7f"
-dependencies = [
- "cargo-platform",
- "semver 0.11.0",
- "semver-parser 0.10.2",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "cargo_metadata"
 version = "0.13.1"
@@ -1643,7 +1633,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "rand 0.8.3",
- "rand_chacha 0.3.0",
+ "rand_chacha 0.3.1",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -1673,7 +1663,6 @@ dependencies = [
  "polkadot-parachain",
  "sc-client-api",
  "serde",
- "sp-consensus",
  "sp-core",
  "sp-externalities",
  "sp-inherents",
@@ -1740,7 +1729,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "rand 0.8.3",
- "rand_chacha 0.3.0",
+ "rand_chacha 0.3.1",
  "sp-runtime",
  "sp-std",
  "xcm",
@@ -1914,7 +1903,7 @@ dependencies = [
  "sp-std",
  "sp-transaction-pool",
  "sp-version",
- "substrate-wasm-builder 4.0.0",
+ "substrate-wasm-builder",
 ]
 
 [[package]]
@@ -1946,7 +1935,7 @@ dependencies = [
  "sp-std",
  "sp-transaction-pool",
  "sp-version",
- "substrate-wasm-builder 4.0.0",
+ "substrate-wasm-builder",
 ]
 
 [[package]]
@@ -2524,7 +2513,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2542,7 +2531,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "3.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2561,7 +2550,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "Inflector",
  "chrono",
@@ -2584,7 +2573,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2597,7 +2586,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2612,7 +2601,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -2623,7 +2612,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2650,7 +2639,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -2662,7 +2651,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 1.0.0",
@@ -2674,7 +2663,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "proc-macro2 1.0.27",
  "quote 1.0.9",
@@ -2684,7 +2673,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -2701,7 +2690,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2715,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2724,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3828,8 +3817,8 @@ dependencies = [
 
 [[package]]
 name = "kusama-runtime"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -3865,7 +3854,6 @@ dependencies = [
  "pallet-offences",
  "pallet-offences-benchmarking",
  "pallet-proxy",
- "pallet-randomness-collective-flip",
  "pallet-recovery",
  "pallet-scheduler",
  "pallet-session",
@@ -3906,7 +3894,7 @@ dependencies = [
  "sp-transaction-pool",
  "sp-version",
  "static_assertions",
- "substrate-wasm-builder 3.0.0",
+ "substrate-wasm-builder",
  "xcm",
  "xcm-builder",
  "xcm-executor",
@@ -4625,7 +4613,7 @@ dependencies = [
 [[package]]
 name = "max-encoded-len"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "impl-trait-for-tuples",
  "max-encoded-len-derive",
@@ -4636,7 +4624,7 @@ dependencies = [
 [[package]]
 name = "max-encoded-len-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2 1.0.27",
@@ -4724,7 +4712,7 @@ dependencies = [
 [[package]]
 name = "metered-channel"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "derive_more 0.99.14",
  "futures 0.3.15",
@@ -4980,7 +4968,7 @@ dependencies = [
 [[package]]
 name = "node-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-system",
  "parity-scale-codec",
@@ -5138,7 +5126,7 @@ dependencies = [
 [[package]]
 name = "pallet-assets"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5152,7 +5140,7 @@ dependencies = [
 [[package]]
 name = "pallet-aura"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5168,7 +5156,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5183,7 +5171,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5197,7 +5185,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5220,7 +5208,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5235,7 +5223,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#910a83de197bd245101d01be4d252c353a2256c6"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#be278c0dbe10d78ad1ea8a6a9352af181c9b21b1"
 dependencies = [
  "beefy-primitives",
  "frame-support",
@@ -5250,7 +5238,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5264,7 +5252,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-grandpa"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "bp-header-chain",
  "bp-runtime",
@@ -5309,7 +5297,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5325,7 +5313,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5340,7 +5328,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5361,7 +5349,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5378,7 +5366,7 @@ dependencies = [
 [[package]]
 name = "pallet-gilt"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5392,7 +5380,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "3.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5414,7 +5402,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5429,7 +5417,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5448,7 +5436,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5464,7 +5452,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5479,7 +5467,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "ckb-merkle-mountain-range",
  "frame-benchmarking",
@@ -5496,7 +5484,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-primitives"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5512,7 +5500,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -5530,7 +5518,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5545,7 +5533,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5558,7 +5546,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5574,7 +5562,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5596,7 +5584,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5612,7 +5600,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5625,7 +5613,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -5639,7 +5627,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5654,7 +5642,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5674,7 +5662,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5690,7 +5678,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5703,7 +5691,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5727,7 +5715,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2 1.0.27",
@@ -5738,7 +5726,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -5747,7 +5735,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5760,7 +5748,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5778,7 +5766,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5793,7 +5781,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5809,7 +5797,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -5826,7 +5814,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5837,7 +5825,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5853,7 +5841,7 @@ dependencies = [
 [[package]]
 name = "pallet-uniques"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5867,7 +5855,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5882,7 +5870,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5896,7 +5884,7 @@ dependencies = [
 [[package]]
 name = "pallet-xcm"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6364,7 +6352,7 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325"
 [[package]]
 name = "polkadot-approval-distribution"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "futures 0.3.15",
  "polkadot-node-network-protocol",
@@ -6378,7 +6366,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "futures 0.3.15",
  "polkadot-node-network-protocol",
@@ -6391,7 +6379,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-distribution"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "futures 0.3.15",
  "lru",
@@ -6414,7 +6402,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-recovery"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "futures 0.3.15",
  "lru",
@@ -6432,8 +6420,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-cli"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "frame-benchmarking-cli",
  "futures 0.3.15",
@@ -6453,7 +6441,7 @@ dependencies = [
 [[package]]
 name = "polkadot-client"
 version = "0.9.3"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "beefy-primitives",
  "frame-benchmarking",
@@ -6555,7 +6543,7 @@ dependencies = [
 [[package]]
 name = "polkadot-collator-protocol"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "always-assert",
  "futures 0.3.15",
@@ -6574,8 +6562,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-core-primitives"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
@@ -6586,8 +6574,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-erasure-coding"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-primitives",
@@ -6601,7 +6589,7 @@ dependencies = [
 [[package]]
 name = "polkadot-gossip-support"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "futures 0.3.15",
  "polkadot-node-network-protocol",
@@ -6609,7 +6597,7 @@ dependencies = [
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "rand 0.8.3",
- "rand_chacha 0.3.0",
+ "rand_chacha 0.3.1",
  "sp-application-crypto",
  "sp-core",
  "sp-keystore",
@@ -6619,7 +6607,7 @@ dependencies = [
 [[package]]
 name = "polkadot-network-bridge"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "async-trait",
  "futures 0.3.15",
@@ -6639,7 +6627,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-collation-generation"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "futures 0.3.15",
  "parity-scale-codec",
@@ -6657,13 +6645,14 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-approval-voting"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "bitvec",
  "derive_more 0.99.14",
  "futures 0.3.15",
  "futures-timer 3.0.2",
  "kvdb",
+ "lru",
  "merlin",
  "parity-scale-codec",
  "polkadot-node-jaeger",
@@ -6686,7 +6675,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-av-store"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "bitvec",
  "futures 0.3.15",
@@ -6706,7 +6695,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-backing"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "bitvec",
  "futures 0.3.15",
@@ -6724,7 +6713,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "futures 0.3.15",
  "polkadot-node-subsystem",
@@ -6739,7 +6728,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-candidate-validation"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "async-trait",
  "futures 0.3.15",
@@ -6757,7 +6746,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-chain-api"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "futures 0.3.15",
  "polkadot-node-subsystem",
@@ -6772,7 +6761,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-parachains-inherent"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "async-trait",
  "futures 0.3.15",
@@ -6790,7 +6779,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-provisioner"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "bitvec",
  "futures 0.3.15",
@@ -6805,7 +6794,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-pvf"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "always-assert",
  "assert_matches",
@@ -6826,6 +6815,7 @@ dependencies = [
  "sp-core",
  "sp-externalities",
  "sp-io",
+ "sp-maybe-compressed-blob",
  "sp-wasm-interface",
  "tracing",
 ]
@@ -6833,7 +6823,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-runtime-api"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "futures 0.3.15",
  "memory-lru",
@@ -6851,7 +6841,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-jaeger"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "async-std",
  "lazy_static",
@@ -6869,7 +6859,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-network-protocol"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "futures 0.3.15",
  "parity-scale-codec",
@@ -6884,7 +6874,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-primitives"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "futures 0.3.15",
  "parity-scale-codec",
@@ -6907,7 +6897,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "async-std",
  "async-trait",
@@ -6937,7 +6927,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-test-helpers"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "async-trait",
  "futures 0.3.15",
@@ -6959,7 +6949,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-util"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "async-trait",
  "futures 0.3.15",
@@ -6979,7 +6969,6 @@ dependencies = [
  "sp-application-crypto",
  "sp-core",
  "sp-keystore",
- "streamunordered",
  "substrate-prometheus-endpoint",
  "thiserror",
  "tracing",
@@ -6988,7 +6977,7 @@ dependencies = [
 [[package]]
 name = "polkadot-overseer"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "async-trait",
  "futures 0.3.15",
@@ -7006,8 +6995,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-parachain"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "derive_more 0.99.14",
  "parity-scale-codec",
@@ -7021,8 +7010,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-primitives"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "bitvec",
  "frame-system",
@@ -7052,7 +7041,7 @@ dependencies = [
 [[package]]
 name = "polkadot-procmacro-overseer-subsystems-gen"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "assert_matches",
  "proc-macro2 1.0.27",
@@ -7063,7 +7052,7 @@ dependencies = [
 [[package]]
 name = "polkadot-procmacro-subsystem-dispatch-gen"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "assert_matches",
  "proc-macro2 1.0.27",
@@ -7073,8 +7062,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-rpc"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "beefy-gadget",
  "beefy-gadget-rpc",
@@ -7106,8 +7095,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -7142,7 +7131,6 @@ dependencies = [
  "pallet-offences",
  "pallet-offences-benchmarking",
  "pallet-proxy",
- "pallet-randomness-collective-flip",
  "pallet-scheduler",
  "pallet-session",
  "pallet-session-benchmarking",
@@ -7178,13 +7166,13 @@ dependencies = [
  "sp-transaction-pool",
  "sp-version",
  "static_assertions",
- "substrate-wasm-builder 3.0.0",
+ "substrate-wasm-builder",
 ]
 
 [[package]]
 name = "polkadot-runtime-common"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -7198,6 +7186,7 @@ dependencies = [
  "pallet-babe",
  "pallet-balances",
  "pallet-beefy",
+ "pallet-election-provider-multi-phase",
  "pallet-mmr",
  "pallet-offences",
  "pallet-session",
@@ -7227,8 +7216,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-parachains"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "bitvec",
  "derive_more 0.99.14",
@@ -7248,7 +7237,7 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
  "rand 0.8.3",
- "rand_chacha 0.3.0",
+ "rand_chacha 0.3.1",
  "rustc-hex",
  "serde",
  "sp-api",
@@ -7266,9 +7255,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-service"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
+ "async-trait",
  "beefy-gadget",
  "beefy-primitives",
  "frame-system-rpc-runtime-api",
@@ -7310,7 +7300,7 @@ dependencies = [
  "polkadot-runtime",
  "polkadot-runtime-parachains",
  "polkadot-statement-distribution",
- "rococo-runtime 0.9.5",
+ "rococo-runtime 0.9.7",
  "sc-authority-discovery",
  "sc-basic-authorship",
  "sc-block-builder",
@@ -7358,7 +7348,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-distribution"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "arrayvec 0.5.2",
  "futures 0.3.15",
@@ -7378,8 +7368,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-table"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -7388,8 +7378,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-test-client"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-subsystem",
@@ -7413,8 +7403,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-test-runtime"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -7433,7 +7423,6 @@ dependencies = [
  "pallet-mmr-primitives",
  "pallet-nicks",
  "pallet-offences",
- "pallet-randomness-collective-flip",
  "pallet-session",
  "pallet-staking",
  "pallet-staking-reward-curve",
@@ -7465,13 +7454,13 @@ dependencies = [
  "sp-std",
  "sp-transaction-pool",
  "sp-version",
- "substrate-wasm-builder 3.0.0",
+ "substrate-wasm-builder",
 ]
 
 [[package]]
 name = "polkadot-test-service"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "frame-benchmarking",
  "frame-system",
@@ -7867,7 +7856,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
 dependencies = [
  "libc",
- "rand_chacha 0.3.0",
+ "rand_chacha 0.3.1",
  "rand_core 0.6.1",
  "rand_hc 0.3.0",
 ]
@@ -7894,9 +7883,9 @@ dependencies = [
 
 [[package]]
 name = "rand_chacha"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
  "rand_core 0.6.1",
@@ -8197,7 +8186,7 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "env_logger 0.8.3",
  "hex",
@@ -8315,7 +8304,7 @@ dependencies = [
  "sp-std",
  "sp-transaction-pool",
  "sp-version",
- "substrate-wasm-builder 4.0.0",
+ "substrate-wasm-builder",
  "xcm",
  "xcm-builder",
  "xcm-executor",
@@ -8323,8 +8312,8 @@ dependencies = [
 
 [[package]]
 name = "rococo-runtime"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "beefy-primitives",
  "bp-rococo",
@@ -8382,7 +8371,7 @@ dependencies = [
  "sp-std",
  "sp-transaction-pool",
  "sp-version",
- "substrate-wasm-builder 3.0.0",
+ "substrate-wasm-builder",
  "xcm",
  "xcm-builder",
  "xcm-executor",
@@ -8544,7 +8533,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "async-trait",
  "derive_more 0.99.14",
@@ -8573,7 +8562,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "futures 0.3.15",
  "futures-timer 3.0.2",
@@ -8596,7 +8585,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -8612,7 +8601,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8633,7 +8622,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2 1.0.27",
@@ -8644,7 +8633,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "chrono",
  "fdlimit",
@@ -8682,7 +8671,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "derive_more 0.99.14",
  "fnv",
@@ -8716,7 +8705,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -8746,8 +8735,9 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
+ "async-trait",
  "parking_lot 0.11.1",
  "sc-client-api",
  "sp-blockchain",
@@ -8758,7 +8748,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "async-trait",
  "derive_more 0.99.14",
@@ -8789,7 +8779,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "async-trait",
  "derive_more 0.99.14",
@@ -8835,7 +8825,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "derive_more 0.99.14",
  "futures 0.3.15",
@@ -8859,7 +8849,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -8872,7 +8862,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "async-trait",
  "futures 0.3.15",
@@ -8900,7 +8890,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "sc-client-api",
  "sp-authorship",
@@ -8911,7 +8901,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "derive_more 0.99.14",
  "lazy_static",
@@ -8940,7 +8930,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "derive_more 0.99.14",
  "parity-scale-codec",
@@ -8957,7 +8947,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8972,7 +8962,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -8991,7 +8981,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "async-trait",
  "derive_more 0.99.14",
@@ -9032,7 +9022,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "derive_more 0.99.14",
  "finality-grandpa",
@@ -9056,7 +9046,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-warp-sync"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "derive_more 0.99.14",
  "futures 0.3.15",
@@ -9077,7 +9067,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.15",
@@ -9095,7 +9085,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "async-trait",
  "derive_more 0.99.14",
@@ -9115,7 +9105,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -9134,7 +9124,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "async-std",
  "async-trait",
@@ -9187,7 +9177,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "futures 0.3.15",
  "futures-timer 3.0.2",
@@ -9204,7 +9194,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -9232,7 +9222,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "futures 0.3.15",
  "libp2p",
@@ -9245,7 +9235,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -9254,7 +9244,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "futures 0.3.15",
  "hash-db",
@@ -9289,7 +9279,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "derive_more 0.99.14",
  "futures 0.3.15",
@@ -9314,7 +9304,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "futures 0.1.30",
  "jsonrpc-core",
@@ -9332,7 +9322,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "async-trait",
  "directories",
@@ -9380,6 +9370,7 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-state-machine",
+ "sp-storage",
  "sp-tracing",
  "sp-transaction-pool",
  "sp-transaction-storage-proof",
@@ -9397,7 +9388,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9412,7 +9403,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -9432,7 +9423,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "chrono",
  "futures 0.3.15",
@@ -9452,7 +9443,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -9489,7 +9480,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2 1.0.27",
@@ -9500,7 +9491,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "derive_more 0.99.14",
  "futures 0.3.15",
@@ -9522,7 +9513,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "futures 0.3.15",
  "intervalier",
@@ -9851,7 +9842,7 @@ dependencies = [
  "sp-std",
  "sp-transaction-pool",
  "sp-version",
- "substrate-wasm-builder 4.0.0",
+ "substrate-wasm-builder",
  "xcm",
  "xcm-builder",
  "xcm-executor",
@@ -9917,8 +9908,8 @@ dependencies = [
 
 [[package]]
 name = "slot-range-helper"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "enumn",
  "parity-scale-codec",
@@ -10024,7 +10015,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "log",
  "sp-core",
@@ -10036,7 +10027,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "hash-db",
  "log",
@@ -10053,7 +10044,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate 1.0.0",
@@ -10065,7 +10056,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "max-encoded-len",
  "parity-scale-codec",
@@ -10078,7 +10069,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -10092,7 +10083,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -10104,7 +10095,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10116,7 +10107,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -10128,7 +10119,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "futures 0.3.15",
  "log",
@@ -10146,7 +10137,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "serde",
  "serde_json",
@@ -10155,7 +10146,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "async-trait",
  "futures 0.3.15",
@@ -10182,7 +10173,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10199,7 +10190,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "async-trait",
  "merlin",
@@ -10221,7 +10212,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -10231,7 +10222,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -10243,7 +10234,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -10288,7 +10279,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -10297,7 +10288,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "proc-macro2 1.0.27",
  "quote 1.0.9",
@@ -10307,7 +10298,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -10318,7 +10309,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -10335,7 +10326,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -10349,7 +10340,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "futures 0.3.15",
  "hash-db",
@@ -10374,7 +10365,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -10385,7 +10376,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "async-trait",
  "derive_more 0.99.14",
@@ -10402,7 +10393,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "ruzstd",
  "zstd",
@@ -10411,7 +10402,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -10424,7 +10415,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2 1.0.27",
@@ -10435,7 +10426,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -10445,7 +10436,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "backtrace",
 ]
@@ -10453,7 +10444,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -10464,7 +10455,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -10486,7 +10477,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -10503,7 +10494,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.0.0",
@@ -10515,7 +10506,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "serde",
  "serde_json",
@@ -10524,7 +10515,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -10537,7 +10528,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -10547,7 +10538,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "hash-db",
  "log",
@@ -10570,12 +10561,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 
 [[package]]
 name = "sp-storage"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -10588,7 +10579,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "log",
  "sp-core",
@@ -10601,7 +10592,7 @@ dependencies = [
 [[package]]
 name = "sp-test-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
@@ -10614,7 +10605,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "async-trait",
  "futures-timer 3.0.2",
@@ -10631,7 +10622,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "erased-serde",
  "log",
@@ -10649,7 +10640,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "derive_more 0.99.14",
  "futures 0.3.15",
@@ -10665,7 +10656,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "async-trait",
  "log",
@@ -10680,7 +10671,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -10694,7 +10685,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "futures 0.3.15",
  "futures-core",
@@ -10706,7 +10697,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -10719,7 +10710,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "parity-scale-codec",
  "proc-macro-crate 1.0.0",
@@ -10731,7 +10722,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -10811,7 +10802,7 @@ dependencies = [
  "sp-transaction-pool",
  "sp-version",
  "statemint-common",
- "substrate-wasm-builder 4.0.0",
+ "substrate-wasm-builder",
  "xcm",
  "xcm-builder",
  "xcm-executor",
@@ -10837,7 +10828,7 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "substrate-wasm-builder 4.0.0",
+ "substrate-wasm-builder",
 ]
 
 [[package]]
@@ -10899,7 +10890,7 @@ dependencies = [
  "sp-transaction-pool",
  "sp-version",
  "statemint-common",
- "substrate-wasm-builder 4.0.0",
+ "substrate-wasm-builder",
  "xcm",
  "xcm-builder",
  "xcm-executor",
@@ -10955,18 +10946,6 @@ dependencies = [
  "generic-array 0.14.4",
 ]
 
-[[package]]
-name = "streamunordered"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9394ee1338fee8370bee649f8a7170b3a56917903a0956467ad192dcf8699ca"
-dependencies = [
- "futures-core",
- "futures-sink",
- "futures-util",
- "slab",
-]
-
 [[package]]
 name = "string"
 version = "0.2.1"
@@ -11043,7 +11022,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "platforms",
 ]
@@ -11051,7 +11030,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.15",
@@ -11074,7 +11053,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "async-std",
  "derive_more 0.99.14",
@@ -11088,7 +11067,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "async-trait",
  "futures 0.1.30",
@@ -11117,7 +11096,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "futures 0.3.15",
  "substrate-test-utils-derive",
@@ -11127,38 +11106,22 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "quote 1.0.9",
  "syn 1.0.73",
 ]
 
-[[package]]
-name = "substrate-wasm-builder"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79091baab813855ddf65b191de9fe53e656b6b67c1e9bd23fdcbff8788164684"
-dependencies = [
- "ansi_term 0.12.1",
- "atty",
- "build-helper",
- "cargo_metadata 0.12.3",
- "tempfile",
- "toml",
- "walkdir",
- "wasm-gc-api",
-]
-
 [[package]]
 name = "substrate-wasm-builder"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
  "build-helper",
- "cargo_metadata 0.13.1",
+ "cargo_metadata",
  "sp-maybe-compressed-blob",
  "tempfile",
  "toml",
@@ -11854,7 +11817,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 [[package]]
 name = "try-runtime-cli"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb"
+source = "git+https://github.com/paritytech/substrate?branch=master#c6240ce90083f9e8db94b6c33f81297c11534ea0"
 dependencies = [
  "frame-try-runtime",
  "log",
@@ -11870,6 +11833,7 @@ dependencies = [
  "sp-blockchain",
  "sp-core",
  "sp-externalities",
+ "sp-io",
  "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
@@ -12515,8 +12479,8 @@ dependencies = [
 
 [[package]]
 name = "westend-runtime"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -12550,7 +12514,6 @@ dependencies = [
  "pallet-offences",
  "pallet-offences-benchmarking",
  "pallet-proxy",
- "pallet-randomness-collective-flip",
  "pallet-recovery",
  "pallet-scheduler",
  "pallet-session",
@@ -12591,7 +12554,7 @@ dependencies = [
  "sp-transaction-pool",
  "sp-version",
  "static_assertions",
- "substrate-wasm-builder 3.0.0",
+ "substrate-wasm-builder",
  "xcm",
  "xcm-builder",
  "xcm-executor",
@@ -12656,7 +12619,7 @@ dependencies = [
  "sp-transaction-pool",
  "sp-version",
  "statemint-common",
- "substrate-wasm-builder 4.0.0",
+ "substrate-wasm-builder",
  "xcm",
  "xcm-builder",
  "xcm-executor",
@@ -12759,8 +12722,8 @@ dependencies = [
 
 [[package]]
 name = "xcm"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "derivative",
  "impl-trait-for-tuples",
@@ -12769,8 +12732,8 @@ dependencies = [
 
 [[package]]
 name = "xcm-builder"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -12788,8 +12751,8 @@ dependencies = [
 
 [[package]]
 name = "xcm-executor"
-version = "0.9.5"
-source = "git+https://github.com/paritytech/polkadot?branch=master#f094de238716f226e3d8f1464e35f504b090b164"
+version = "0.9.7"
+source = "git+https://github.com/paritytech/polkadot?branch=master#60341e125563cbf655ab686ac5cef370ac33d16d"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
diff --git a/cumulus/client/consensus/relay-chain/src/lib.rs b/cumulus/client/consensus/relay-chain/src/lib.rs
index 4384042c9c9..782080bf7a7 100644
--- a/cumulus/client/consensus/relay-chain/src/lib.rs
+++ b/cumulus/client/consensus/relay-chain/src/lib.rs
@@ -208,7 +208,9 @@ where
 
 		let mut block_import_params = BlockImportParams::new(BlockOrigin::Own, header);
 		block_import_params.body = Some(extrinsics);
-		block_import_params.storage_changes = Some(storage_changes);
+		block_import_params.state_action = sp_consensus::StateAction::ApplyChanges(
+			sp_consensus::StorageChanges::Changes(storage_changes)
+		);
 
 		if let Err(err) = self
 			.block_import
diff --git a/cumulus/client/pov-recovery/src/lib.rs b/cumulus/client/pov-recovery/src/lib.rs
index 5d4f14f2004..4e979a255f6 100644
--- a/cumulus/client/pov-recovery/src/lib.rs
+++ b/cumulus/client/pov-recovery/src/lib.rs
@@ -352,6 +352,8 @@ where
 				allow_missing_state: false,
 				justifications: None,
 				origin: None,
+				skip_execution: false,
+				state: None,
 			});
 
 			if let Some(waiting) = self.waiting_for_parent.remove(&block_hash) {
diff --git a/cumulus/pallets/parachain-system/Cargo.toml b/cumulus/pallets/parachain-system/Cargo.toml
index 0663c9a517d..3c16f9ad0b2 100644
--- a/cumulus/pallets/parachain-system/Cargo.toml
+++ b/cumulus/pallets/parachain-system/Cargo.toml
@@ -44,7 +44,6 @@ lazy_static = "1.4"
 sp-version = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 # Cumulus dependencies
diff --git a/cumulus/pallets/parachain-system/src/validate_block/tests.rs b/cumulus/pallets/parachain-system/src/validate_block/tests.rs
index 61828dc8818..afcc8c3fafb 100644
--- a/cumulus/pallets/parachain-system/src/validate_block/tests.rs
+++ b/cumulus/pallets/parachain-system/src/validate_block/tests.rs
@@ -19,12 +19,11 @@ use cumulus_primitives_core::{ParachainBlockData, PersistedValidationData};
 use cumulus_test_client::{
 	runtime::{Block, Hash, Header, UncheckedExtrinsic, WASM_BINARY},
 	transfer, BlockData, BuildParachainBlockData, Client, DefaultTestClientBuilderExt, HeadData,
-	InitBlockBuilder, LongestChain, TestClientBuilder, TestClientBuilderExt, ValidationParams,
+	InitBlockBuilder, TestClientBuilder, TestClientBuilderExt, ValidationParams,
 };
 use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
-use sp_consensus::SelectChain;
 use sp_keyring::AccountKeyring::*;
-use sp_runtime::traits::Header as HeaderT;
+use sp_runtime::{generic::BlockId, traits::Header as HeaderT};
 use std::{env, process::Command};
 
 fn call_validate_block(
@@ -44,11 +43,19 @@ fn call_validate_block(
 	.map(|v| Header::decode(&mut &v.head_data.0[..]).expect("Decodes `Header`."))
 }
 
-fn create_test_client() -> (Client, LongestChain) {
-	TestClientBuilder::new()
+fn create_test_client() -> (Client, Header) {
+	let client = TestClientBuilder::new()
 		// NOTE: this allows easier debugging
 		.set_execution_strategy(sc_client_api::ExecutionStrategy::NativeWhenPossible)
-		.build_with_longest_chain()
+		.build();
+
+	let genesis_header = client
+		.header(&BlockId::number(0))
+		.ok()
+		.flatten()
+		.expect("Genesis header exists; qed");
+
+	(client, genesis_header)
 }
 
 struct TestBlockData {
@@ -88,8 +95,7 @@ fn build_block_with_witness(
 fn validate_block_no_extra_extrinsics() {
 	sp_tracing::try_init_simple();
 
-	let (client, longest_chain) = create_test_client();
-	let parent_head = longest_chain.best_chain().expect("Best block exists");
+	let (client, parent_head) = create_test_client();
 	let TestBlockData {
 		block,
 		validation_data,
@@ -109,8 +115,7 @@ fn validate_block_no_extra_extrinsics() {
 fn validate_block_with_extra_extrinsics() {
 	sp_tracing::try_init_simple();
 
-	let (client, longest_chain) = create_test_client();
-	let parent_head = longest_chain.best_chain().expect("Best block exists");
+	let (client, parent_head) = create_test_client();
 	let extra_extrinsics = vec![
 		transfer(&client, Alice, Bob, 69),
 		transfer(&client, Bob, Charlie, 100),
@@ -142,8 +147,7 @@ fn validate_block_invalid_parent_hash() {
 	sp_tracing::try_init_simple();
 
 	if env::var("RUN_TEST").is_ok() {
-		let (client, longest_chain) = create_test_client();
-		let parent_head = longest_chain.best_chain().expect("Best block exists");
+		let (client, parent_head) = create_test_client();
 		let TestBlockData {
 			block,
 			validation_data,
@@ -175,8 +179,7 @@ fn validate_block_fails_on_invalid_validation_data() {
 	sp_tracing::try_init_simple();
 
 	if env::var("RUN_TEST").is_ok() {
-		let (client, longest_chain) = create_test_client();
-		let parent_head = longest_chain.best_chain().expect("Best block exists");
+		let (client, parent_head) = create_test_client();
 		let TestBlockData { block, .. } =
 			build_block_with_witness(&client, vec![], parent_head.clone(), Default::default());
 
@@ -203,8 +206,7 @@ fn check_inherent_fails_on_validate_block_as_expected() {
 	sp_tracing::try_init_simple();
 
 	if env::var("RUN_TEST").is_ok() {
-		let (client, longest_chain) = create_test_client();
-		let parent_head = longest_chain.best_chain().expect("Best block exists");
+		let (client, parent_head) = create_test_client();
 
 		let TestBlockData {
 			block,
-- 
GitLab