diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index 0195d5673b..db403a1622 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -1646,7 +1646,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1664,7 +1664,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "3.1.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1683,7 +1683,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "Inflector",
  "chrono",
@@ -1706,7 +1706,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1722,7 +1722,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1733,7 +1733,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -1759,7 +1759,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -1771,10 +1771,10 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-support-procedural-tools-derive",
- "proc-macro-crate",
+ "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -1783,7 +1783,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1793,7 +1793,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1810,7 +1810,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1824,7 +1824,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -1833,7 +1833,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -2734,7 +2734,7 @@ version = "15.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99a847f9ec7bb52149b2786a17c9cb260d6effc6b8eeb8c16b343a487a7563a3"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 0.1.5",
  "proc-macro2",
  "quote",
  "syn",
@@ -3877,7 +3877,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f5653449cd45d502a53480ee08d7a599e8f4893d2bacb33c63d65bc20af6c1a"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 0.1.5",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -4135,7 +4135,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b"
 [[package]]
 name = "pallet-authority-discovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4151,7 +4151,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4166,7 +4166,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4191,7 +4191,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4206,7 +4206,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4221,7 +4221,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4238,7 +4238,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4253,7 +4253,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4274,7 +4274,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4290,7 +4290,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4312,7 +4312,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4328,7 +4328,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4348,7 +4348,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4365,7 +4365,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4379,7 +4379,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4395,7 +4395,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4409,7 +4409,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4425,7 +4425,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4447,7 +4447,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4463,7 +4463,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4476,7 +4476,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4491,7 +4491,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4507,7 +4507,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4527,7 +4527,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4543,7 +4543,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4557,7 +4557,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4581,9 +4581,9 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -4592,7 +4592,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4606,7 +4606,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4625,7 +4625,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4640,7 +4640,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4656,7 +4656,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4673,7 +4673,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -4684,7 +4684,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4700,7 +4700,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4716,7 +4716,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4781,7 +4781,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9029e65297c7fd6d7013f0579e193ec2b34ae78eabca854c9417504ad8a2d214"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 0.1.5",
  "proc-macro2",
  "quote",
  "syn",
@@ -6407,6 +6407,16 @@ dependencies = [
  "toml",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92"
+dependencies = [
+ "thiserror",
+ "toml",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -6896,7 +6906,7 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "env_logger 0.8.2",
  "hex-literal",
@@ -7146,7 +7156,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7174,7 +7184,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -7197,7 +7207,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -7213,7 +7223,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7234,9 +7244,9 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -7245,7 +7255,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "chrono",
  "fdlimit",
@@ -7283,7 +7293,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "derive_more",
  "fnv",
@@ -7317,7 +7327,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -7347,7 +7357,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -7358,7 +7368,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "derive_more",
  "fork-tree",
@@ -7404,7 +7414,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7428,7 +7438,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -7441,7 +7451,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -7467,7 +7477,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "log",
  "sc-client-api",
@@ -7481,7 +7491,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "derive_more",
  "lazy_static",
@@ -7510,7 +7520,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
@@ -7526,7 +7536,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7541,7 +7551,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7559,7 +7569,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "derive_more",
  "dyn-clone",
@@ -7598,7 +7608,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7622,7 +7632,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-warp-sync"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7643,7 +7653,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.12",
@@ -7661,7 +7671,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7681,7 +7691,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -7700,7 +7710,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "async-std",
  "async-trait",
@@ -7753,7 +7763,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -7769,7 +7779,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -7796,7 +7806,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "futures 0.3.12",
  "libp2p",
@@ -7809,7 +7819,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -7818,7 +7828,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "futures 0.3.12",
  "hash-db",
@@ -7852,7 +7862,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7876,7 +7886,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "futures 0.1.29",
  "jsonrpc-core",
@@ -7894,7 +7904,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "directories",
  "exit-future",
@@ -7957,7 +7967,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7972,7 +7982,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -7992,7 +8002,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "chrono",
  "futures 0.3.12",
@@ -8014,7 +8024,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -8042,9 +8052,9 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -8053,7 +8063,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -8075,7 +8085,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "futures 0.3.12",
  "futures-diagnose",
@@ -8481,7 +8491,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "log",
  "sp-core",
@@ -8493,7 +8503,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "hash-db",
  "log",
@@ -8510,10 +8520,10 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "blake2-rfc",
- "proc-macro-crate",
+ "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -8522,7 +8532,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8534,7 +8544,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -8547,7 +8557,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8559,7 +8569,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -8570,7 +8580,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8582,7 +8592,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "futures 0.3.12",
  "log",
@@ -8600,7 +8610,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "serde",
  "serde_json",
@@ -8609,7 +8619,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -8635,10 +8645,11 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "merlin",
  "parity-scale-codec",
+ "serde",
  "sp-api",
  "sp-application-crypto",
  "sp-consensus",
@@ -8655,7 +8666,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -8665,7 +8676,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -8677,7 +8688,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -8721,7 +8732,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -8730,7 +8741,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8740,7 +8751,7 @@ dependencies = [
 [[package]]
 name = "sp-election-providers"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -8751,7 +8762,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8762,7 +8773,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8779,7 +8790,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -8791,7 +8802,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "futures 0.3.12",
  "hash-db",
@@ -8815,7 +8826,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -8826,7 +8837,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8843,7 +8854,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8856,9 +8867,9 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -8867,7 +8878,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -8877,7 +8888,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "backtrace",
 ]
@@ -8885,7 +8896,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "serde",
  "sp-core",
@@ -8894,7 +8905,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -8915,7 +8926,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8932,10 +8943,10 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "Inflector",
- "proc-macro-crate",
+ "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -8944,7 +8955,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "serde",
  "serde_json",
@@ -8953,7 +8964,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8966,7 +8977,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8976,7 +8987,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "hash-db",
  "log",
@@ -8998,12 +9009,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 
 [[package]]
 name = "sp-storage"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9016,7 +9027,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "log",
  "sp-core",
@@ -9029,7 +9040,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9043,7 +9054,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9056,7 +9067,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -9072,7 +9083,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -9086,7 +9097,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "futures 0.3.12",
  "futures-core",
@@ -9098,7 +9109,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9110,7 +9121,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9242,7 +9253,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -9269,7 +9280,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "platforms",
 ]
@@ -9277,7 +9288,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.12",
@@ -9300,7 +9311,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "async-std",
  "derive_more",
@@ -9314,7 +9325,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "futures 0.1.29",
  "futures 0.3.12",
@@ -9341,7 +9352,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "futures 0.3.12",
  "substrate-test-utils-derive",
@@ -9351,9 +9362,9 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.0.0",
  "quote",
  "syn",
 ]
@@ -9519,18 +9530,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146"
+checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
+checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10034,7 +10045,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 [[package]]
 name = "try-runtime-cli"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#8fca15b79bef42c53faad849652c8f5a9936b369"
+source = "git+https://github.com/paritytech/substrate#24613496216b8c991baa24b26afc8346d313fbf5"
 dependencies = [
  "frame-try-runtime",
  "log",
diff --git a/polkadot/node/core/approval-voting/src/import.rs b/polkadot/node/core/approval-voting/src/import.rs
index f902fbb058..25ff39ea8d 100644
--- a/polkadot/node/core/approval-voting/src/import.rs
+++ b/polkadot/node/core/approval-voting/src/import.rs
@@ -711,7 +711,9 @@ mod tests {
 	use polkadot_node_subsystem::messages::AllMessages;
 	use sp_core::testing::TaskExecutor;
 	use sp_runtime::{Digest, DigestItem};
-	use sp_consensus_babe::Epoch as BabeEpoch;
+	use sp_consensus_babe::{
+		Epoch as BabeEpoch, BabeEpochConfiguration, AllowedSlots,
+	};
 	use sp_consensus_babe::digests::{CompatibleDigestItem, PreDigest, SecondaryVRFPreDigest};
 	use sp_keyring::sr25519::Keyring as Sr25519Keyring;
 	use assert_matches::assert_matches;
@@ -1358,6 +1360,10 @@ mod tests {
 						duration: 200,
 						authorities: vec![(Sr25519Keyring::Alice.public().into(), 1)],
 						randomness: [0u8; 32],
+						config: BabeEpochConfiguration {
+							c: (1, 4),
+							allowed_slots: AllowedSlots::PrimarySlots,
+						},
 					}));
 				}
 			);
@@ -1463,6 +1469,10 @@ mod tests {
 						duration: 200,
 						authorities: vec![(Sr25519Keyring::Alice.public().into(), 1)],
 						randomness: [0u8; 32],
+						config: BabeEpochConfiguration {
+							c: (1, 4),
+							allowed_slots: AllowedSlots::PrimarySlots,
+						},
 					}));
 				}
 			);
@@ -1714,6 +1724,10 @@ mod tests {
 						duration: 200,
 						authorities: vec![(Sr25519Keyring::Alice.public().into(), 1)],
 						randomness: [0u8; 32],
+						config: BabeEpochConfiguration {
+							c: (1, 4),
+							allowed_slots: AllowedSlots::PrimarySlots,
+						},
 					}));
 				}
 			);
diff --git a/polkadot/node/core/runtime-api/src/lib.rs b/polkadot/node/core/runtime-api/src/lib.rs
index cb32dd5772..5251cfd27d 100644
--- a/polkadot/node/core/runtime-api/src/lib.rs
+++ b/polkadot/node/core/runtime-api/src/lib.rs
@@ -422,7 +422,9 @@ mod tests {
 	use sp_core::testing::TaskExecutor;
 	use std::{collections::{HashMap, BTreeMap}, sync::{Arc, Mutex}};
 	use futures::channel::oneshot;
-	use polkadot_node_primitives::BabeEpoch;
+	use polkadot_node_primitives::{
+		BabeEpoch, BabeEpochConfiguration, BabeAllowedSlots,
+	};
 
 	#[derive(Default, Clone)]
 	struct MockRuntimeApi {
@@ -1158,6 +1160,10 @@ mod tests {
 			duration: 10,
 			authorities: Vec::new(),
 			randomness: [1u8; 32],
+			config: BabeEpochConfiguration {
+				c: (1, 4),
+				allowed_slots: BabeAllowedSlots::PrimarySlots,
+			},
 		};
 		runtime_api.babe_epoch = Some(epoch.clone());
 		let runtime_api = Arc::new(runtime_api);
diff --git a/polkadot/node/primitives/src/lib.rs b/polkadot/node/primitives/src/lib.rs
index 313fe930d1..b5d2ab13d3 100644
--- a/polkadot/node/primitives/src/lib.rs
+++ b/polkadot/node/primitives/src/lib.rs
@@ -32,7 +32,9 @@ use polkadot_primitives::v1::{
 use std::pin::Pin;
 
 pub use sp_core::traits::SpawnNamed;
-pub use sp_consensus_babe::Epoch as BabeEpoch;
+pub use sp_consensus_babe::{
+	Epoch as BabeEpoch, BabeEpochConfiguration, AllowedSlots as BabeAllowedSlots,
+};
 
 pub mod approval;
 
diff --git a/polkadot/node/service/src/chain_spec.rs b/polkadot/node/service/src/chain_spec.rs
index 6d53426fc3..bbacf9aa17 100644
--- a/polkadot/node/service/src/chain_spec.rs
+++ b/polkadot/node/service/src/chain_spec.rs
@@ -261,7 +261,10 @@ fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::Gene
 			phantom: Default::default(),
 		},
 		pallet_membership_Instance1: Default::default(),
-		pallet_babe: Default::default(),
+		pallet_babe: polkadot::BabeConfig {
+			authorities: Default::default(),
+			epoch_config: Some(polkadot::BABE_GENESIS_EPOCH_CONFIG),
+		},
 		pallet_grandpa: Default::default(),
 		pallet_im_online: Default::default(),
 		pallet_authority_discovery: polkadot::AuthorityDiscoveryConfig { keys: vec![] },
@@ -448,7 +451,10 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Genesi
 			slash_reward_fraction: Perbill::from_percent(10),
 			..Default::default()
 		},
-		pallet_babe: Default::default(),
+		pallet_babe: westend::BabeConfig {
+			authorities: Default::default(),
+			epoch_config: Some(westend::BABE_GENESIS_EPOCH_CONFIG),
+		},
 		pallet_grandpa: Default::default(),
 		pallet_im_online: Default::default(),
 		pallet_authority_discovery: westend::AuthorityDiscoveryConfig { keys: vec![] },
@@ -644,7 +650,10 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisC
 			phantom: Default::default(),
 		},
 		pallet_membership_Instance1: Default::default(),
-		pallet_babe: Default::default(),
+		pallet_babe: kusama::BabeConfig {
+			authorities: Default::default(),
+			epoch_config: Some(kusama::BABE_GENESIS_EPOCH_CONFIG),
+		},
 		pallet_grandpa: Default::default(),
 		pallet_im_online: Default::default(),
 		pallet_authority_discovery: kusama::AuthorityDiscoveryConfig { keys: vec![] },
@@ -850,7 +859,10 @@ fn rococo_staging_testnet_config_genesis(wasm_binary: &[u8]) -> rococo_runtime::
 				),
 			)).collect::<Vec<_>>(),
 		},
-		pallet_babe: Default::default(),
+		pallet_babe: rococo_runtime::BabeConfig {
+			authorities: Default::default(),
+			epoch_config: Some(rococo_runtime::BABE_GENESIS_EPOCH_CONFIG),
+		},
 		pallet_grandpa: Default::default(),
 		pallet_im_online: Default::default(),
 		pallet_authority_discovery: rococo_runtime::AuthorityDiscoveryConfig {
@@ -1130,7 +1142,10 @@ pub fn polkadot_testnet_genesis(
 			phantom: Default::default(),
 		},
 		pallet_membership_Instance1: Default::default(),
-		pallet_babe: Default::default(),
+		pallet_babe: polkadot::BabeConfig {
+			authorities: Default::default(),
+			epoch_config: Some(polkadot::BABE_GENESIS_EPOCH_CONFIG),
+		},
 		pallet_grandpa: Default::default(),
 		pallet_im_online: Default::default(),
 		pallet_authority_discovery: polkadot::AuthorityDiscoveryConfig { keys: vec![] },
@@ -1225,7 +1240,10 @@ pub fn kusama_testnet_genesis(
 			phantom: Default::default(),
 		},
 		pallet_membership_Instance1: Default::default(),
-		pallet_babe: Default::default(),
+		pallet_babe: kusama::BabeConfig {
+			authorities: Default::default(),
+			epoch_config: Some(kusama::BABE_GENESIS_EPOCH_CONFIG),
+		},
 		pallet_grandpa: Default::default(),
 		pallet_im_online: Default::default(),
 		pallet_authority_discovery: kusama::AuthorityDiscoveryConfig { keys: vec![] },
@@ -1309,7 +1327,10 @@ pub fn westend_testnet_genesis(
 			slash_reward_fraction: Perbill::from_percent(10),
 			..Default::default()
 		},
-		pallet_babe: Default::default(),
+		pallet_babe: westend::BabeConfig {
+			authorities: Default::default(),
+			epoch_config: Some(westend::BABE_GENESIS_EPOCH_CONFIG),
+		},
 		pallet_grandpa: Default::default(),
 		pallet_im_online: Default::default(),
 		pallet_authority_discovery: westend::AuthorityDiscoveryConfig { keys: vec![] },
@@ -1363,7 +1384,10 @@ pub fn rococo_testnet_genesis(
 				),
 			)).collect::<Vec<_>>(),
 		},
-		pallet_babe: Default::default(),
+		pallet_babe: rococo_runtime::BabeConfig {
+			authorities: Default::default(),
+			epoch_config: Some(rococo_runtime::BABE_GENESIS_EPOCH_CONFIG),
+		},
 		pallet_grandpa: Default::default(),
 		pallet_im_online: Default::default(),
 		pallet_authority_discovery: rococo_runtime::AuthorityDiscoveryConfig {
diff --git a/polkadot/node/test/service/src/chain_spec.rs b/polkadot/node/test/service/src/chain_spec.rs
index e4505f1618..be4ea88fec 100644
--- a/polkadot/node/test/service/src/chain_spec.rs
+++ b/polkadot/node/test/service/src/chain_spec.rs
@@ -22,7 +22,7 @@ use grandpa::AuthorityId as GrandpaId;
 use pallet_staking::Forcing;
 use polkadot_primitives::v1::{ValidatorId, AccountId, AssignmentId};
 use polkadot_service::chain_spec::{get_account_id_from_seed, get_from_seed, Extensions};
-use polkadot_test_runtime::constants::currency::DOTS;
+use polkadot_test_runtime::{constants::currency::DOTS, BABE_GENESIS_EPOCH_CONFIG};
 use sc_chain_spec::{ChainSpec, ChainType};
 use sp_core::sr25519;
 use sp_runtime::Perbill;
@@ -162,7 +162,10 @@ fn polkadot_testnet_genesis(
 			slash_reward_fraction: Perbill::from_percent(10),
 			..Default::default()
 		},
-		pallet_babe: Default::default(),
+		pallet_babe: runtime::BabeConfig {
+			authorities: vec![],
+			epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG),
+		},
 		pallet_grandpa: Default::default(),
 		pallet_authority_discovery: runtime::AuthorityDiscoveryConfig { keys: vec![] },
 		claims: runtime::ClaimsConfig {
diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs
index cfee187345..49abd6dd28 100644
--- a/polkadot/runtime/kusama/src/lib.rs
+++ b/polkadot/runtime/kusama/src/lib.rs
@@ -99,6 +99,13 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	transaction_version: 4,
 };
 
+/// The BABE epoch configuration at genesis.
+pub const BABE_GENESIS_EPOCH_CONFIG: babe_primitives::BabeEpochConfiguration =
+	babe_primitives::BabeEpochConfiguration {
+		c: PRIMARY_PROBABILITY,
+		allowed_slots: babe_primitives::AllowedSlots::PrimaryAndSecondaryVRFSlots
+	};
+
 /// Native version.
 #[cfg(any(feature = "std", test))]
 pub fn native_version() -> NativeVersion {
@@ -1036,6 +1043,24 @@ construct_runtime! {
 	}
 }
 
+impl pallet_babe::migrations::BabePalletPrefix for Runtime {
+	fn pallet_prefix() -> &'static str {
+		"Babe"
+	}
+}
+
+pub struct BabeEpochConfigMigrations;
+impl frame_support::traits::OnRuntimeUpgrade for BabeEpochConfigMigrations {
+	fn on_runtime_upgrade() -> frame_support::weights::Weight {
+		pallet_babe::migrations::add_epoch_configuration::<Runtime>(
+			babe_primitives::BabeEpochConfiguration {
+				allowed_slots: babe_primitives::AllowedSlots::PrimaryAndSecondaryPlainSlots,
+				..BABE_GENESIS_EPOCH_CONFIG
+			}
+		)
+	}
+}
+
 /// The address format for describing accounts.
 pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
 /// Block header type as expected by this runtime.
@@ -1067,6 +1092,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllModules,
+	BabeEpochConfigMigrations,
 >;
 /// The payload being signed in the transactions.
 pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
@@ -1236,10 +1262,10 @@ sp_api::impl_runtime_apis! {
 			babe_primitives::BabeGenesisConfiguration {
 				slot_duration: Babe::slot_duration(),
 				epoch_length: EpochDuration::get(),
-				c: PRIMARY_PROBABILITY,
+				c: BABE_GENESIS_EPOCH_CONFIG.c,
 				genesis_authorities: Babe::authorities(),
 				randomness: Babe::randomness(),
-				allowed_slots: babe_primitives::AllowedSlots::PrimaryAndSecondaryVRFSlots,
+				allowed_slots: BABE_GENESIS_EPOCH_CONFIG.allowed_slots,
 			}
 		}
 
diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs
index 92ae59d356..125facdb6a 100644
--- a/polkadot/runtime/polkadot/src/lib.rs
+++ b/polkadot/runtime/polkadot/src/lib.rs
@@ -101,6 +101,13 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	transaction_version: 6,
 };
 
+/// The BABE epoch configuration at genesis.
+pub const BABE_GENESIS_EPOCH_CONFIG: babe_primitives::BabeEpochConfiguration =
+	babe_primitives::BabeEpochConfiguration {
+		c: PRIMARY_PROBABILITY,
+		allowed_slots: babe_primitives::AllowedSlots::PrimaryAndSecondaryVRFSlots
+	};
+
 /// Native version.
 #[cfg(any(feature = "std", test))]
 pub fn native_version() -> NativeVersion {
@@ -1031,6 +1038,21 @@ construct_runtime! {
 	}
 }
 
+impl pallet_babe::migrations::BabePalletPrefix for Runtime {
+	fn pallet_prefix() -> &'static str {
+		"Babe"
+	}
+}
+
+pub struct BabeEpochConfigMigrations;
+impl frame_support::traits::OnRuntimeUpgrade for BabeEpochConfigMigrations {
+	fn on_runtime_upgrade() -> frame_support::weights::Weight {
+		pallet_babe::migrations::add_epoch_configuration::<Runtime>(
+			BABE_GENESIS_EPOCH_CONFIG,
+		)
+	}
+}
+
 /// The address format for describing accounts.
 pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
 /// Block header type as expected by this runtime.
@@ -1063,7 +1085,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllModules,
-	()
+	BabeEpochConfigMigrations,
 >;
 /// The payload being signed in transactions.
 pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
@@ -1232,10 +1254,10 @@ sp_api::impl_runtime_apis! {
 			babe_primitives::BabeGenesisConfiguration {
 				slot_duration: Babe::slot_duration(),
 				epoch_length: EpochDuration::get(),
-				c: PRIMARY_PROBABILITY,
+				c: BABE_GENESIS_EPOCH_CONFIG.c,
 				genesis_authorities: Babe::authorities(),
 				randomness: Babe::randomness(),
-				allowed_slots: babe_primitives::AllowedSlots::PrimaryAndSecondaryVRFSlots,
+				allowed_slots: BABE_GENESIS_EPOCH_CONFIG.allowed_slots,
 			}
 		}
 
diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs
index 6a85199c16..b45b21d601 100644
--- a/polkadot/runtime/rococo/src/lib.rs
+++ b/polkadot/runtime/rococo/src/lib.rs
@@ -110,6 +110,13 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	transaction_version: 0,
 };
 
+/// The BABE epoch configuration at genesis.
+pub const BABE_GENESIS_EPOCH_CONFIG: babe_primitives::BabeEpochConfiguration =
+	babe_primitives::BabeEpochConfiguration {
+		c: PRIMARY_PROBABILITY,
+		allowed_slots: babe_primitives::AllowedSlots::PrimaryAndSecondaryVRFSlots
+	};
+
 /// Native version.
 #[cfg(any(feature = "std", test))]
 pub fn native_version() -> NativeVersion {
@@ -805,10 +812,10 @@ sp_api::impl_runtime_apis! {
 			babe_primitives::BabeGenesisConfiguration {
 				slot_duration: Babe::slot_duration(),
 				epoch_length: EpochDurationInBlocks::get().into(),
-				c: PRIMARY_PROBABILITY,
+				c: BABE_GENESIS_EPOCH_CONFIG.c,
 				genesis_authorities: Babe::authorities(),
 				randomness: Babe::randomness(),
-				allowed_slots: babe_primitives::AllowedSlots::PrimaryAndSecondaryVRFSlots,
+				allowed_slots: BABE_GENESIS_EPOCH_CONFIG.allowed_slots,
 			}
 		}
 
diff --git a/polkadot/runtime/test-runtime/src/lib.rs b/polkadot/runtime/test-runtime/src/lib.rs
index e69dce1997..992ef48a15 100644
--- a/polkadot/runtime/test-runtime/src/lib.rs
+++ b/polkadot/runtime/test-runtime/src/lib.rs
@@ -100,6 +100,13 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	transaction_version: 1,
 };
 
+/// The BABE epoch configuration at genesis.
+pub const BABE_GENESIS_EPOCH_CONFIG: babe_primitives::BabeEpochConfiguration =
+	babe_primitives::BabeEpochConfiguration {
+		c: PRIMARY_PROBABILITY,
+		allowed_slots: babe_primitives::AllowedSlots::PrimaryAndSecondaryVRFSlots
+	};
+
 /// Native version.
 #[cfg(any(feature = "std", test))]
 pub fn native_version() -> NativeVersion {
@@ -737,10 +744,10 @@ sp_api::impl_runtime_apis! {
 			babe_primitives::BabeGenesisConfiguration {
 				slot_duration: Babe::slot_duration(),
 				epoch_length: EpochDuration::get(),
-				c: PRIMARY_PROBABILITY,
+				c: BABE_GENESIS_EPOCH_CONFIG.c,
 				genesis_authorities: Babe::authorities(),
 				randomness: Babe::randomness(),
-				allowed_slots: babe_primitives::AllowedSlots::PrimaryAndSecondaryVRFSlots,
+				allowed_slots: BABE_GENESIS_EPOCH_CONFIG.allowed_slots,
 			}
 		}
 
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index 9d4563040e..c6006bc0c6 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -96,6 +96,13 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	transaction_version: 4,
 };
 
+/// The BABE epoch configuration at genesis.
+pub const BABE_GENESIS_EPOCH_CONFIG: babe_primitives::BabeEpochConfiguration =
+	babe_primitives::BabeEpochConfiguration {
+		c: PRIMARY_PROBABILITY,
+		allowed_slots: babe_primitives::AllowedSlots::PrimaryAndSecondaryVRFSlots
+	};
+
 /// Native version.
 #[cfg(any(feature = "std", test))]
 pub fn native_version() -> NativeVersion {
@@ -743,6 +750,21 @@ construct_runtime! {
 	}
 }
 
+impl pallet_babe::migrations::BabePalletPrefix for Runtime {
+	fn pallet_prefix() -> &'static str {
+		"Babe"
+	}
+}
+
+pub struct BabeEpochConfigMigrations;
+impl frame_support::traits::OnRuntimeUpgrade for BabeEpochConfigMigrations {
+	fn on_runtime_upgrade() -> frame_support::weights::Weight {
+		pallet_babe::migrations::add_epoch_configuration::<Runtime>(
+			BABE_GENESIS_EPOCH_CONFIG,
+		)
+	}
+}
+
 /// The address format for describing accounts.
 pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
 /// Block header type as expected by this runtime.
@@ -774,6 +796,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllModules,
+	BabeEpochConfigMigrations,
 >;
 /// The payload being signed in transactions.
 pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
@@ -951,10 +974,10 @@ sp_api::impl_runtime_apis! {
 			babe_primitives::BabeGenesisConfiguration {
 				slot_duration: Babe::slot_duration(),
 				epoch_length: EpochDuration::get(),
-				c: PRIMARY_PROBABILITY,
+				c: BABE_GENESIS_EPOCH_CONFIG.c,
 				genesis_authorities: Babe::authorities(),
 				randomness: Babe::randomness(),
-				allowed_slots: babe_primitives::AllowedSlots::PrimaryAndSecondaryVRFSlots,
+				allowed_slots: BABE_GENESIS_EPOCH_CONFIG.allowed_slots,
 			}
 		}