diff --git a/Cargo.lock b/Cargo.lock
index e27b993d20..6714240550 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -433,7 +433,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "beefy-primitives",
  "fnv",
@@ -462,7 +462,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "beefy-gadget",
  "beefy-primitives",
@@ -485,12 +485,12 @@ dependencies = [
 [[package]]
 name = "beefy-merkle-tree"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 
 [[package]]
 name = "beefy-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -692,7 +692,7 @@ dependencies = [
 [[package]]
 name = "bp-header-chain"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "finality-grandpa",
  "frame-support",
@@ -708,7 +708,7 @@ dependencies = [
 [[package]]
 name = "bp-message-dispatch"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bp-runtime",
  "frame-support",
@@ -720,7 +720,7 @@ dependencies = [
 [[package]]
 name = "bp-messages"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bitvec",
  "bp-runtime",
@@ -736,7 +736,7 @@ dependencies = [
 [[package]]
 name = "bp-polkadot-core"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bp-messages",
  "bp-runtime",
@@ -754,7 +754,7 @@ dependencies = [
 [[package]]
 name = "bp-rococo"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bp-messages",
  "bp-polkadot-core",
@@ -771,7 +771,7 @@ dependencies = [
 [[package]]
 name = "bp-runtime"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "frame-support",
  "hash-db",
@@ -789,7 +789,7 @@ dependencies = [
 [[package]]
 name = "bp-test-utils"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bp-header-chain",
  "ed25519-dalek",
@@ -804,7 +804,7 @@ dependencies = [
 [[package]]
 name = "bp-wococo"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bp-messages",
  "bp-polkadot-core",
@@ -819,7 +819,7 @@ dependencies = [
 [[package]]
 name = "bridge-runtime-common"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bp-message-dispatch",
  "bp-messages",
@@ -1806,7 +1806,7 @@ dependencies = [
 name = "cumulus-pallet-parachain-system-proc-macro"
 version = "0.1.0"
 dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.2",
  "proc-macro2",
  "quote",
  "syn",
@@ -2595,7 +2595,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2613,7 +2613,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2635,7 +2635,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "Inflector",
  "chrono",
@@ -2662,7 +2662,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2676,7 +2676,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2733,7 +2733,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -2745,10 +2745,10 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-support-procedural-tools-derive",
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.2",
  "proc-macro2",
  "quote",
  "syn",
@@ -2757,7 +2757,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2767,7 +2767,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-support",
  "log",
@@ -2784,7 +2784,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2799,7 +2799,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2808,7 +2808,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-support",
  "sp-api",
@@ -3737,7 +3737,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4299ebf790ea9de1cb72e73ff2ae44c723ef264299e5e2d5ef46a371eb3ac3d8"
 dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.2",
  "proc-macro2",
  "quote",
  "syn",
@@ -3841,7 +3841,7 @@ dependencies = [
 [[package]]
 name = "kusama-runtime"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -3929,7 +3929,7 @@ dependencies = [
 [[package]]
 name = "kusama-runtime-constants"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -4798,7 +4798,7 @@ dependencies = [
 [[package]]
 name = "metered-channel"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "derive_more",
  "futures 0.3.21",
@@ -4970,7 +4970,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99"
 dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.2",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -5319,7 +5319,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5335,7 +5335,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5350,7 +5350,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5374,7 +5374,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5394,7 +5394,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5409,7 +5409,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "beefy-primitives",
  "frame-support",
@@ -5425,7 +5425,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "beefy-merkle-tree",
  "beefy-primitives",
@@ -5450,7 +5450,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5468,7 +5468,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-dispatch"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bp-message-dispatch",
  "bp-runtime",
@@ -5485,7 +5485,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-grandpa"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bp-header-chain",
  "bp-runtime",
@@ -5507,7 +5507,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-messages"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bitvec",
  "bp-message-dispatch",
@@ -5554,7 +5554,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5656,7 +5656,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5672,7 +5672,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5689,13 +5689,13 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "static_assertions",
- "strum",
+ "strum 0.23.0",
 ]
 
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5713,7 +5713,7 @@ dependencies = [
 [[package]]
 name = "pallet-gilt"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5728,7 +5728,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5751,7 +5751,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5767,7 +5767,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5787,7 +5787,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5804,7 +5804,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5821,7 +5821,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "ckb-merkle-mountain-range",
  "frame-benchmarking",
@@ -5839,7 +5839,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5855,7 +5855,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -5872,7 +5872,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5887,7 +5887,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5901,7 +5901,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5918,7 +5918,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5941,7 +5941,7 @@ dependencies = [
 [[package]]
 name = "pallet-preimage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5957,7 +5957,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5986,7 +5986,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6000,7 +6000,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6016,7 +6016,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6037,7 +6037,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6053,7 +6053,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6067,7 +6067,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6090,9 +6090,9 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.2",
  "proc-macro2",
  "quote",
  "syn",
@@ -6101,7 +6101,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -6110,7 +6110,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6139,7 +6139,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6157,7 +6157,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6176,7 +6176,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6193,7 +6193,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -6210,7 +6210,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -6221,7 +6221,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6253,7 +6253,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6269,7 +6269,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6284,7 +6284,7 @@ dependencies = [
 [[package]]
 name = "pallet-xcm"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6302,7 +6302,7 @@ dependencies = [
 [[package]]
 name = "pallet-xcm-benchmarks"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6515,7 +6515,7 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27"
 dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.2",
  "proc-macro2",
  "quote",
  "syn",
@@ -6875,7 +6875,7 @@ dependencies = [
 [[package]]
 name = "polkadot-approval-distribution"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "futures 0.3.21",
  "polkadot-node-network-protocol",
@@ -6889,7 +6889,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "futures 0.3.21",
  "polkadot-node-network-protocol",
@@ -6902,7 +6902,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-distribution"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "derive_more",
  "futures 0.3.21",
@@ -6924,7 +6924,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-recovery"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "futures 0.3.21",
  "lru 0.7.2",
@@ -6944,7 +6944,7 @@ dependencies = [
 [[package]]
 name = "polkadot-cli"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "clap 3.0.7",
  "frame-benchmarking-cli",
@@ -6967,7 +6967,7 @@ dependencies = [
 [[package]]
 name = "polkadot-client"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "beefy-primitives",
  "frame-benchmarking",
@@ -7072,7 +7072,7 @@ dependencies = [
 [[package]]
 name = "polkadot-collator-protocol"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "always-assert",
  "derive_more",
@@ -7093,7 +7093,7 @@ dependencies = [
 [[package]]
 name = "polkadot-core-primitives"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
@@ -7106,7 +7106,7 @@ dependencies = [
 [[package]]
 name = "polkadot-dispute-distribution"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "derive_more",
  "futures 0.3.21",
@@ -7128,7 +7128,7 @@ dependencies = [
 [[package]]
 name = "polkadot-erasure-coding"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-primitives",
@@ -7142,7 +7142,7 @@ dependencies = [
 [[package]]
 name = "polkadot-gossip-support"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -7162,7 +7162,7 @@ dependencies = [
 [[package]]
 name = "polkadot-network-bridge"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -7181,7 +7181,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-collation-generation"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "futures 0.3.21",
  "parity-scale-codec",
@@ -7199,7 +7199,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-approval-voting"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bitvec",
  "derive_more",
@@ -7227,7 +7227,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-av-store"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bitvec",
  "futures 0.3.21",
@@ -7247,7 +7247,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-backing"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bitvec",
  "futures 0.3.21",
@@ -7265,7 +7265,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "futures 0.3.21",
  "polkadot-node-subsystem",
@@ -7280,7 +7280,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-candidate-validation"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -7298,7 +7298,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-chain-api"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "futures 0.3.21",
  "polkadot-node-subsystem",
@@ -7313,7 +7313,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-chain-selection"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -7330,7 +7330,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-dispute-coordinator"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "futures 0.3.21",
  "kvdb",
@@ -7348,7 +7348,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-parachains-inherent"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -7365,7 +7365,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-provisioner"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bitvec",
  "futures 0.3.21",
@@ -7382,7 +7382,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-pvf"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "always-assert",
  "assert_matches",
@@ -7412,7 +7412,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-pvf-checker"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "futures 0.3.21",
  "polkadot-node-primitives",
@@ -7428,7 +7428,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-runtime-api"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "futures 0.3.21",
  "memory-lru",
@@ -7446,7 +7446,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-jaeger"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "async-std",
  "lazy_static",
@@ -7464,7 +7464,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-metrics"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bs58",
  "futures 0.3.21",
@@ -7483,7 +7483,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-network-protocol"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7494,14 +7494,14 @@ dependencies = [
  "polkadot-primitives",
  "sc-authority-discovery",
  "sc-network",
- "strum",
+ "strum 0.24.0",
  "thiserror",
 ]
 
 [[package]]
 name = "polkadot-node-primitives"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bounded-vec",
  "futures 0.3.21",
@@ -7523,7 +7523,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-node-subsystem-types",
@@ -7533,7 +7533,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-test-helpers"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -7551,7 +7551,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-types"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "derive_more",
  "futures 0.3.21",
@@ -7570,7 +7570,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-util"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7598,7 +7598,7 @@ dependencies = [
 [[package]]
 name = "polkadot-overseer"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -7619,7 +7619,7 @@ dependencies = [
 [[package]]
 name = "polkadot-overseer-gen"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -7636,9 +7636,9 @@ dependencies = [
 [[package]]
 name = "polkadot-overseer-gen-proc-macro"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.2",
  "proc-macro2",
  "quote",
  "syn",
@@ -7647,7 +7647,7 @@ dependencies = [
 [[package]]
 name = "polkadot-parachain"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "derive_more",
  "frame-support",
@@ -7664,7 +7664,7 @@ dependencies = [
 [[package]]
 name = "polkadot-performance-test"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "env_logger 0.9.0",
  "kusama-runtime",
@@ -7679,7 +7679,7 @@ dependencies = [
 [[package]]
 name = "polkadot-primitives"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bitvec",
  "frame-system",
@@ -7709,7 +7709,7 @@ dependencies = [
 [[package]]
 name = "polkadot-rpc"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "beefy-gadget",
  "beefy-gadget-rpc",
@@ -7740,7 +7740,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -7824,7 +7824,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-common"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -7871,7 +7871,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-constants"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -7883,7 +7883,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-metrics"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bs58",
  "parity-scale-codec",
@@ -7895,7 +7895,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-parachains"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "bitflags",
  "bitvec",
@@ -7937,7 +7937,7 @@ dependencies = [
 [[package]]
 name = "polkadot-service"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "async-trait",
  "beefy-gadget",
@@ -8037,7 +8037,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-distribution"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "arrayvec 0.5.2",
  "derive_more",
@@ -8058,7 +8058,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-table"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -8068,7 +8068,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-client"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-subsystem",
@@ -8093,7 +8093,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-runtime"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -8155,7 +8155,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-service"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "frame-benchmarking",
  "frame-system",
@@ -8299,9 +8299,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.1.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83"
+checksum = "9dada8c9981fcf32929c3c0f0cd796a9284aca335565227ed88c83babb1d43dc"
 dependencies = [
  "thiserror",
  "toml",
@@ -8695,7 +8695,7 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "env_logger 0.9.0",
  "jsonrpsee 0.8.0",
@@ -8812,7 +8812,7 @@ dependencies = [
 [[package]]
 name = "rococo-runtime"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "beefy-primitives",
  "bp-messages",
@@ -8887,7 +8887,7 @@ dependencies = [
 [[package]]
 name = "rococo-runtime-constants"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -9076,7 +9076,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "log",
  "sp-core",
@@ -9087,7 +9087,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -9114,7 +9114,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -9137,7 +9137,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -9153,7 +9153,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "impl-trait-for-tuples",
  "memmap2 0.5.0",
@@ -9170,9 +9170,9 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.2",
  "proc-macro2",
  "quote",
  "syn",
@@ -9181,7 +9181,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "chrono",
  "clap 3.0.7",
@@ -9219,7 +9219,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "fnv",
  "futures 0.3.21",
@@ -9247,7 +9247,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -9272,7 +9272,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -9325,7 +9325,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -9368,7 +9368,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "futures 0.3.21",
  "jsonrpc-core",
@@ -9392,7 +9392,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -9405,7 +9405,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -9430,7 +9430,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "sc-client-api",
  "sp-authorship",
@@ -9441,11 +9441,10 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "lazy_static",
  "libsecp256k1",
- "log",
  "lru 0.6.6",
  "parity-scale-codec",
  "parking_lot 0.11.2",
@@ -9463,13 +9462,14 @@ dependencies = [
  "sp-trie",
  "sp-version",
  "sp-wasm-interface",
+ "tracing",
  "wasmi",
 ]
 
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -9486,7 +9486,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9502,7 +9502,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -9520,7 +9520,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "ahash",
  "async-trait",
@@ -9559,7 +9559,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "finality-grandpa",
  "futures 0.3.21",
@@ -9583,7 +9583,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "ansi_term",
  "futures 0.3.21",
@@ -9600,7 +9600,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "async-trait",
  "hex",
@@ -9615,7 +9615,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "async-std",
  "async-trait",
@@ -9665,7 +9665,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "ahash",
  "futures 0.3.21",
@@ -9682,7 +9682,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "bytes 1.1.0",
  "fnv",
@@ -9710,7 +9710,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "futures 0.3.21",
  "libp2p",
@@ -9723,7 +9723,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -9732,7 +9732,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "futures 0.3.21",
  "hash-db",
@@ -9763,7 +9763,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "futures 0.3.21",
  "jsonrpc-core",
@@ -9788,7 +9788,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "futures 0.3.21",
  "jsonrpc-core",
@@ -9805,7 +9805,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "async-trait",
  "directories",
@@ -9869,7 +9869,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9883,7 +9883,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -9904,7 +9904,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "chrono",
  "futures 0.3.21",
@@ -9922,7 +9922,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "ansi_term",
  "atty",
@@ -9953,9 +9953,9 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.2",
  "proc-macro2",
  "quote",
  "syn",
@@ -9964,7 +9964,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -9991,7 +9991,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "futures 0.3.21",
  "log",
@@ -10004,7 +10004,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -10033,7 +10033,7 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd"
 dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.2",
  "proc-macro2",
  "quote",
  "syn",
@@ -10433,7 +10433,7 @@ checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
 [[package]]
 name = "slot-range-helper"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "enumn",
  "parity-scale-codec",
@@ -10521,7 +10521,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "hash-db",
  "log",
@@ -10538,10 +10538,10 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "blake2 0.10.2",
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.2",
  "proc-macro2",
  "quote",
  "syn",
@@ -10550,7 +10550,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10563,7 +10563,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -10578,7 +10578,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10591,7 +10591,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10603,7 +10603,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -10615,7 +10615,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "futures 0.3.21",
  "log",
@@ -10633,7 +10633,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -10670,7 +10670,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "async-trait",
  "merlin",
@@ -10693,19 +10693,21 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-arithmetic",
  "sp-runtime",
+ "sp-std",
+ "sp-timestamp",
 ]
 
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -10717,7 +10719,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "base58",
  "bitflags",
@@ -10762,7 +10764,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "blake2 0.10.2",
  "byteorder",
@@ -10776,7 +10778,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10787,7 +10789,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.2",
@@ -10796,7 +10798,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10806,7 +10808,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.11.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -10817,7 +10819,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -10835,7 +10837,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -10849,7 +10851,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "futures 0.3.21",
  "hash-db",
@@ -10873,18 +10875,18 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "lazy_static",
  "sp-core",
  "sp-runtime",
- "strum",
+ "strum 0.23.0",
 ]
 
 [[package]]
 name = "sp-keystore"
 version = "0.11.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -10901,7 +10903,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "thiserror",
  "zstd",
@@ -10910,7 +10912,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10925,9 +10927,9 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.2",
  "proc-macro2",
  "quote",
  "syn",
@@ -10936,7 +10938,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -10946,7 +10948,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -10956,7 +10958,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -10966,7 +10968,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -10988,7 +10990,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -11005,10 +11007,10 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "Inflector",
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.2",
  "proc-macro2",
  "quote",
  "syn",
@@ -11031,7 +11033,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "serde",
  "serde_json",
@@ -11040,7 +11042,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11054,7 +11056,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11065,7 +11067,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.11.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "hash-db",
  "log",
@@ -11088,12 +11090,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 
 [[package]]
 name = "sp-storage"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -11106,7 +11108,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "log",
  "sp-core",
@@ -11119,7 +11121,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "async-trait",
  "futures-timer",
@@ -11135,7 +11137,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -11147,7 +11149,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -11156,7 +11158,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "async-trait",
  "log",
@@ -11172,7 +11174,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -11187,7 +11189,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -11204,7 +11206,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -11215,7 +11217,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "impl-trait-for-tuples",
  "log",
@@ -11441,7 +11443,16 @@ version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb"
 dependencies = [
- "strum_macros",
+ "strum_macros 0.23.1",
+]
+
+[[package]]
+name = "strum"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e96acfc1b70604b8b2f1ffa4c57e59176c7dbb05d556c71ecd2f5498a1dee7f8"
+dependencies = [
+ "strum_macros 0.24.0",
 ]
 
 [[package]]
@@ -11457,6 +11468,19 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "strum_macros"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef"
+dependencies = [
+ "heck 0.4.0",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn",
+]
+
 [[package]]
 name = "substrate-bip39"
 version = "0.4.4"
@@ -11473,7 +11497,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "platforms",
 ]
@@ -11481,7 +11505,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.21",
@@ -11503,7 +11527,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "async-std",
  "futures-util",
@@ -11517,7 +11541,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -11555,7 +11579,7 @@ name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
 source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4"
 dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.2",
  "proc-macro2",
  "quote",
  "syn",
@@ -11564,13 +11588,13 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "ansi_term",
  "build-helper",
  "cargo_metadata",
  "sp-maybe-compressed-blob",
- "strum",
+ "strum 0.23.0",
  "tempfile",
  "toml",
  "walkdir",
@@ -11650,7 +11674,7 @@ checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16"
 [[package]]
 name = "test-runtime-constants"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -11948,7 +11972,7 @@ dependencies = [
  "chrono",
  "lazy_static",
  "matchers",
- "parking_lot 0.11.2",
+ "parking_lot 0.10.2",
  "regex",
  "serde",
  "serde_json",
@@ -12035,7 +12059,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e6def65920d30029e42d498cb07cec5dd433b927"
+source = "git+https://github.com/paritytech/substrate?branch=master#42b2d623d058197aebc3c737fb44fbbf278a85b4"
 dependencies = [
  "clap 3.0.7",
  "jsonrpsee 0.4.1",
@@ -12637,7 +12661,7 @@ dependencies = [
 [[package]]
 name = "westend-runtime"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -12723,7 +12747,7 @@ dependencies = [
 [[package]]
 name = "westend-runtime-constants"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -12940,7 +12964,7 @@ dependencies = [
 [[package]]
 name = "xcm"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "derivative",
  "impl-trait-for-tuples",
@@ -12953,7 +12977,7 @@ dependencies = [
 [[package]]
 name = "xcm-builder"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -12973,7 +12997,7 @@ dependencies = [
 [[package]]
 name = "xcm-executor"
 version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -12991,7 +13015,7 @@ dependencies = [
 [[package]]
 name = "xcm-procedural"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#a6394995871d40a1b9ec5c4f458a8aa7f7638aa6"
+source = "git+https://github.com/paritytech/polkadot?branch=master#daec96f748e2a3c2c8ee4ec23f0c31b6daade800"
 dependencies = [
  "Inflector",
  "proc-macro2",
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 3a65e6a0fc..90472fee01 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -36,10 +36,8 @@ use sc_telemetry::TelemetryHandle;
 use sp_api::ProvideRuntimeApi;
 use sp_application_crypto::AppPublic;
 use sp_blockchain::HeaderBackend;
-use sp_consensus::{
-	EnableProofRecording, Environment, ProofRecording, Proposer, SlotData, SyncOracle,
-};
-use sp_consensus_aura::AuraApi;
+use sp_consensus::{EnableProofRecording, Environment, ProofRecording, Proposer, SyncOracle};
+use sp_consensus_aura::{AuraApi, SlotDuration};
 use sp_core::crypto::Pair;
 use sp_inherents::{CreateInherentDataProviders, InherentData, InherentDataProvider};
 use sp_keystore::SyncCryptoStorePtr;
@@ -49,9 +47,7 @@ use std::{convert::TryFrom, hash::Hash, sync::Arc};
 mod import_queue;
 
 pub use import_queue::{build_verifier, import_queue, BuildVerifierParams, ImportQueueParams};
-pub use sc_consensus_aura::{
-	slot_duration, AuraVerifier, BuildAuraWorkerParams, SlotDuration, SlotProportion,
-};
+pub use sc_consensus_aura::{slot_duration, AuraVerifier, BuildAuraWorkerParams, SlotProportion};
 pub use sc_consensus_slots::InherentDataProviderExt;
 
 const LOG_TARGET: &str = "aura::cumulus";
@@ -201,7 +197,7 @@ where
 			inherent_data_providers.slot(),
 			inherent_data_providers.timestamp(),
 			inherent_data,
-			self.slot_duration.slot_duration(),
+			self.slot_duration.as_duration(),
 			parent.clone(),
 			// Set the block limit to 50% of the maximum PoV size.
 			//
diff --git a/parachain-template/node/src/service.rs b/parachain-template/node/src/service.rs
index 400daeaa67..317826054a 100644
--- a/parachain-template/node/src/service.rs
+++ b/parachain-template/node/src/service.rs
@@ -26,7 +26,6 @@ use sc_network::NetworkService;
 use sc_service::{Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager};
 use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
 use sp_api::ConstructRuntimeApi;
-use sp_consensus::SlotData;
 use sp_keystore::SyncCryptoStorePtr;
 use sp_runtime::traits::BlakeTwo256;
 use substrate_prometheus_endpoint::Registry;
@@ -383,9 +382,9 @@ pub fn parachain_build_import_queue(
 			let time = sp_timestamp::InherentDataProvider::from_system_time();
 
 			let slot =
-				sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
+				sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
 					*time,
-					slot_duration.slot_duration(),
+					slot_duration,
 				);
 
 			Ok((time, slot))
@@ -448,9 +447,9 @@ pub async fn start_parachain_node(
 							let time = sp_timestamp::InherentDataProvider::from_system_time();
 
 							let slot =
-						sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
+						sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
 							*time,
-							slot_duration.slot_duration(),
+							slot_duration,
 						);
 
 							let parachain_inherent = parachain_inherent.ok_or_else(|| {
diff --git a/polkadot-parachains/src/service.rs b/polkadot-parachains/src/service.rs
index f09ddd1f43..2fe31635a6 100644
--- a/polkadot-parachains/src/service.rs
+++ b/polkadot-parachains/src/service.rs
@@ -46,7 +46,7 @@ use sc_network::NetworkService;
 use sc_service::{Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager};
 use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
 use sp_api::{ApiExt, ConstructRuntimeApi};
-use sp_consensus::{CacheKeyId, SlotData};
+use sp_consensus::CacheKeyId;
 use sp_consensus_aura::AuraApi;
 use sp_core::crypto::Pair;
 use sp_keystore::SyncCryptoStorePtr;
@@ -683,15 +683,15 @@ pub fn rococo_parachain_build_import_queue(
 		block_import: client.clone(),
 		client: client.clone(),
 		create_inherent_data_providers: move |_, _| async move {
-			let time = sp_timestamp::InherentDataProvider::from_system_time();
+			let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
 
 			let slot =
-				sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
-					*time,
-					slot_duration.slot_duration(),
+				sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
+					*timestamp,
+					slot_duration,
 				);
 
-			Ok((time, slot))
+			Ok((timestamp, slot))
 		},
 		registry: config.prometheus_registry().clone(),
 		can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
@@ -753,29 +753,32 @@ pub async fn start_rococo_parachain_node(
 			>(BuildAuraConsensusParams {
 				proposer_factory,
 				create_inherent_data_providers: move |_, (relay_parent, validation_data)| {
-						let relay_chain_interface = relay_chain_interface.clone();
+					let relay_chain_interface = relay_chain_interface.clone();
+
 					async move {
-					let parachain_inherent =
-					cumulus_primitives_parachain_inherent::ParachainInherentData::create_at(
-						relay_parent,
-						&relay_chain_interface,
-						&validation_data,
-						id,
-					).await;
-						let time = sp_timestamp::InherentDataProvider::from_system_time();
+						let parachain_inherent =
+							cumulus_primitives_parachain_inherent::ParachainInherentData::create_at(
+								relay_parent,
+								&relay_chain_interface,
+								&validation_data,
+								id,
+							).await;
+
+						let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
 
 						let slot =
-						sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
-							*time,
-							slot_duration.slot_duration(),
-						);
+							sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
+								*timestamp,
+								slot_duration,
+							);
 
 						let parachain_inherent = parachain_inherent.ok_or_else(|| {
 							Box::<dyn std::error::Error + Send + Sync>::from(
 								"Failed to create parachain inherent",
 							)
 						})?;
-						Ok((time, slot, parachain_inherent))
+
+						Ok((timestamp, slot, parachain_inherent))
 					}
 				},
 				block_import: client.clone(),
@@ -1064,15 +1067,15 @@ where
 				cumulus_client_consensus_aura::BuildVerifierParams {
 					client: client2.clone(),
 					create_inherent_data_providers: move |_, _| async move {
-						let time = sp_timestamp::InherentDataProvider::from_system_time();
+						let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
 
 						let slot =
-					sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
-						*time,
-						slot_duration.slot_duration(),
-					);
+							sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
+								*timestamp,
+								slot_duration,
+							);
 
-						Ok((time, slot))
+						Ok((timestamp, slot))
 					},
 					can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(
 						client2.executor().clone(),
@@ -1177,20 +1180,21 @@ where
 								let relay_chain_for_aura = relay_chain_for_aura.clone();
 								async move {
 									let parachain_inherent =
-							cumulus_primitives_parachain_inherent::ParachainInherentData::create_at(
-								relay_parent,
-								&relay_chain_for_aura,
-								&validation_data,
-								id,
-							).await;
-									let time =
+										cumulus_primitives_parachain_inherent::ParachainInherentData::create_at(
+											relay_parent,
+											&relay_chain_for_aura,
+											&validation_data,
+											id,
+										).await;
+
+									let timestamp =
 										sp_timestamp::InherentDataProvider::from_system_time();
 
 									let slot =
-									sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
-										*time,
-										slot_duration.slot_duration(),
-									);
+										sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
+											*timestamp,
+											slot_duration,
+										);
 
 									let parachain_inherent =
 										parachain_inherent.ok_or_else(|| {
@@ -1198,7 +1202,8 @@ where
 												"Failed to create parachain inherent",
 											)
 										})?;
-									Ok((time, slot, parachain_inherent))
+
+									Ok((timestamp, slot, parachain_inherent))
 								}
 							},
 						block_import: client2.clone(),
@@ -1494,15 +1499,15 @@ pub fn canvas_kusama_build_import_queue(
 		block_import: client.clone(),
 		client: client.clone(),
 		create_inherent_data_providers: move |_, _| async move {
-			let time = sp_timestamp::InherentDataProvider::from_system_time();
+			let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
 
 			let slot =
-				sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
-					*time,
-					slot_duration.slot_duration(),
+				sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
+					*timestamp,
+					slot_duration,
 				);
 
-			Ok((time, slot))
+			Ok((timestamp, slot))
 		},
 		registry: config.prometheus_registry(),
 		can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
@@ -1565,26 +1570,28 @@ pub async fn start_canvas_kusama_node(
 						let relay_chain_interface = relay_chain_interface.clone();
 						async move {
 							let parachain_inherent =
-							cumulus_primitives_parachain_inherent::ParachainInherentData::create_at(
-								relay_parent,
-								&relay_chain_interface,
-								&validation_data,
-								id,
-							).await;
-							let time = sp_timestamp::InherentDataProvider::from_system_time();
+								cumulus_primitives_parachain_inherent::ParachainInherentData::create_at(
+									relay_parent,
+									&relay_chain_interface,
+									&validation_data,
+									id,
+								).await;
+
+							let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
 
 							let slot =
-						sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
-							*time,
-							slot_duration.slot_duration(),
-						);
+								sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
+									*timestamp,
+									slot_duration,
+								);
 
 							let parachain_inherent = parachain_inherent.ok_or_else(|| {
 								Box::<dyn std::error::Error + Send + Sync>::from(
 									"Failed to create parachain inherent",
 								)
 							})?;
-							Ok((time, slot, parachain_inherent))
+
+							Ok((timestamp, slot, parachain_inherent))
 						}
 					},
 					block_import: client.clone(),