diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index 61f29625af..a345a467c6 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -1261,7 +1261,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1269,7 +1269,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1286,7 +1286,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-benchmarking",
  "parity-scale-codec",
@@ -1304,7 +1304,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1319,7 +1319,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "11.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1330,7 +1330,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "bitmask",
  "frame-metadata",
@@ -1355,7 +1355,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support-procedural-tools",
  "proc-macro2 1.0.18",
@@ -1366,7 +1366,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1378,7 +1378,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "proc-macro2 1.0.18",
  "quote 1.0.7",
@@ -1388,7 +1388,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1404,7 +1404,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1418,7 +1418,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -3375,7 +3375,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3391,7 +3391,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3406,10 +3406,12 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "pallet-authorship",
  "pallet-session",
  "pallet-timestamp",
  "parity-scale-codec",
@@ -3420,6 +3422,7 @@ dependencies = [
  "sp-inherents",
  "sp-io",
  "sp-runtime",
+ "sp-session",
  "sp-staking",
  "sp-std",
  "sp-timestamp",
@@ -3428,7 +3431,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3442,7 +3445,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3458,7 +3461,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3473,7 +3476,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3488,7 +3491,7 @@ dependencies = [
 [[package]]
 name = "pallet-finality-tracker"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3504,7 +3507,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3524,7 +3527,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -3540,7 +3543,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3560,7 +3563,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3576,7 +3579,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3590,7 +3593,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3605,7 +3608,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3619,7 +3622,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3634,7 +3637,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3655,7 +3658,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3670,7 +3673,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3683,7 +3686,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -3698,7 +3701,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3713,7 +3716,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3733,21 +3736,23 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "pallet-session",
  "pallet-staking",
+ "rand 0.7.3",
  "sp-runtime",
+ "sp-session",
  "sp-std",
 ]
 
 [[package]]
 name = "pallet-society"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3761,7 +3766,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3783,7 +3788,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -3794,7 +3799,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3808,7 +3813,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3826,7 +3831,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3841,7 +3846,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -3859,7 +3864,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3872,7 +3877,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3887,7 +3892,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3903,7 +3908,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5707,7 +5712,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "bytes 0.5.4",
  "derive_more 0.99.8",
@@ -5734,7 +5739,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -5758,7 +5763,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -5775,7 +5780,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "impl-trait-for-tuples",
  "sc-chain-spec-derive",
@@ -5791,7 +5796,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -5802,7 +5807,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -5843,7 +5848,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "derive_more 0.99.8",
  "fnv",
@@ -5879,7 +5884,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -5908,7 +5913,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -5919,7 +5924,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "derive_more 0.99.8",
  "fork-tree",
@@ -5961,7 +5966,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "derive_more 0.99.8",
  "futures 0.3.5",
@@ -5985,7 +5990,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -5998,7 +6003,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -6011,6 +6016,7 @@ dependencies = [
  "sp-application-crypto",
  "sp-blockchain",
  "sp-consensus",
+ "sp-consensus-slots",
  "sp-core",
  "sp-inherents",
  "sp-runtime",
@@ -6020,7 +6026,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "log 0.4.8",
  "sc-client-api",
@@ -6034,7 +6040,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "derive_more 0.99.8",
  "lazy_static",
@@ -6062,7 +6068,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "derive_more 0.99.8",
  "log 0.4.8",
@@ -6079,7 +6085,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "log 0.4.8",
  "parity-scale-codec",
@@ -6094,7 +6100,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "cranelift-codegen",
  "cranelift-wasm",
@@ -6115,7 +6121,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "assert_matches",
  "derive_more 0.99.8",
@@ -6153,7 +6159,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "derive_more 0.99.8",
  "finality-grandpa",
@@ -6170,7 +6176,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.5",
@@ -6189,7 +6195,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "derive_more 0.99.8",
  "hex",
@@ -6205,7 +6211,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -6224,7 +6230,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "bitflags",
  "bs58",
@@ -6276,7 +6282,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -6291,7 +6297,7 @@ dependencies = [
 [[package]]
 name = "sc-network-test"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "env_logger",
  "futures 0.3.5",
@@ -6318,7 +6324,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "bytes 0.5.4",
  "fnv",
@@ -6345,7 +6351,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "futures 0.3.5",
  "libp2p",
@@ -6358,7 +6364,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "log 0.4.8",
  "substrate-prometheus-endpoint",
@@ -6367,7 +6373,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -6399,7 +6405,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "derive_more 0.99.8",
  "futures 0.3.5",
@@ -6423,7 +6429,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-http-server",
@@ -6439,7 +6445,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "derive_more 0.99.8",
  "directories",
@@ -6502,7 +6508,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "log 0.4.8",
  "parity-scale-codec",
@@ -6516,7 +6522,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -6537,7 +6543,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "erased-serde",
  "log 0.4.8",
@@ -6554,7 +6560,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "derive_more 0.99.8",
  "futures 0.3.5",
@@ -6574,7 +6580,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "derive_more 0.99.8",
  "futures 0.3.5",
@@ -6960,7 +6966,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "derive_more 0.99.8",
  "log 0.4.8",
@@ -6972,7 +6978,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -6987,7 +6993,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -6999,7 +7005,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -7011,7 +7017,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.12",
@@ -7024,7 +7030,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7036,7 +7042,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -7047,7 +7053,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7059,7 +7065,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "derive_more 0.99.8",
  "log 0.4.8",
@@ -7075,7 +7081,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "serde",
  "serde_json",
@@ -7084,7 +7090,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "derive_more 0.99.8",
  "futures 0.3.5",
@@ -7108,7 +7114,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7122,13 +7128,14 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "merlin",
  "parity-scale-codec",
  "sp-api",
  "sp-application-crypto",
  "sp-consensus",
+ "sp-consensus-slots",
  "sp-consensus-vrf",
  "sp-core",
  "sp-inherents",
@@ -7137,10 +7144,19 @@ dependencies = [
  "sp-timestamp",
 ]
 
+[[package]]
+name = "sp-consensus-slots"
+version = "0.8.0-rc4"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
+dependencies = [
+ "parity-scale-codec",
+ "sp-runtime",
+]
+
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -7152,7 +7168,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -7195,7 +7211,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "kvdb",
  "parking_lot 0.10.2",
@@ -7204,7 +7220,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "proc-macro2 1.0.18",
  "quote 1.0.7",
@@ -7214,7 +7230,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -7225,7 +7241,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "finality-grandpa",
  "log 0.4.8",
@@ -7241,7 +7257,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-tracker"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -7251,7 +7267,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "derive_more 0.99.8",
  "parity-scale-codec",
@@ -7263,7 +7279,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -7284,7 +7300,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -7295,7 +7311,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -7307,7 +7323,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -7318,7 +7334,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -7328,7 +7344,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "backtrace",
  "log 0.4.8",
@@ -7337,7 +7353,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "serde",
  "sp-core",
@@ -7346,7 +7362,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -7368,7 +7384,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -7383,7 +7399,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -7395,7 +7411,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "serde",
  "serde_json",
@@ -7404,7 +7420,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7417,7 +7433,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -7427,7 +7443,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "hash-db",
  "itertools 0.9.0",
@@ -7448,12 +7464,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 
 [[package]]
 name = "sp-storage"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "impl-serde 0.2.3",
  "ref-cast",
@@ -7465,7 +7481,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7479,7 +7495,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "log 0.4.8",
  "rental",
@@ -7489,7 +7505,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "derive_more 0.99.8",
  "futures 0.3.5",
@@ -7505,7 +7521,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -7519,7 +7535,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "futures 0.3.5",
  "futures-core",
@@ -7531,7 +7547,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "impl-serde 0.2.3",
  "parity-scale-codec",
@@ -7543,7 +7559,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7683,7 +7699,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "chrono",
  "clear_on_drop",
@@ -7710,7 +7726,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "platforms",
 ]
@@ -7718,7 +7734,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.5",
@@ -7741,7 +7757,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "async-std",
  "derive_more 0.99.8",
@@ -7755,10 +7771,12 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
+ "futures 0.1.29",
  "futures 0.3.5",
  "hash-db",
+ "hex",
  "parity-scale-codec",
  "sc-client-api",
  "sc-client-db",
@@ -7777,7 +7795,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "cfg-if",
  "frame-executive",
@@ -7817,7 +7835,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime-client"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 dependencies = [
  "futures 0.3.5",
  "parity-scale-codec",
@@ -7838,7 +7856,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder-runner"
 version = "1.0.6"
-source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5"
+source = "git+https://github.com/paritytech/substrate#18334ee173f0ec4b62d2ca05c5b0c1f0b05b1b17"
 
 [[package]]
 name = "substrate-wasm-builder-runner"
diff --git a/polkadot/node/service/src/lib.rs b/polkadot/node/service/src/lib.rs
index c478e00754..69cdc1b229 100644
--- a/polkadot/node/service/src/lib.rs
+++ b/polkadot/node/service/src/lib.rs
@@ -196,7 +196,7 @@ macro_rules! new_full_start {
 					grandpa::block_import_with_authority_set_hard_forks(
 						client.clone(),
 						&(client.clone() as Arc<_>),
-						select_chain,
+						select_chain.clone(),
 						grandpa_hard_forks,
 					)?;
 
@@ -214,6 +214,7 @@ macro_rules! new_full_start {
 					Some(Box::new(justification_import)),
 					None,
 					client,
+					select_chain,
 					inherent_data_providers.clone(),
 					spawn_task_handle,
 					registry,
@@ -517,14 +518,18 @@ macro_rules! new_light {
 				client,
 				backend,
 				fetcher,
-				_select_chain,
+				mut select_chain,
 				_,
 				spawn_task_handle,
 				registry,
 			| {
+				let select_chain = select_chain.take()
+					.ok_or_else(|| service::Error::SelectChainRequired)?;
+
 				let fetch_checker = fetcher
 					.map(|fetcher| fetcher.checker().clone())
 					.ok_or_else(|| "Trying to start light import queue without active fetch checker")?;
+
 				let grandpa_block_import = grandpa::light_block_import(
 					client.clone(), backend, &(client.clone() as Arc<_>), Arc::new(fetch_checker)
 				)?;
@@ -546,6 +551,7 @@ macro_rules! new_light {
 					None,
 					Some(Box::new(finality_proof_import)),
 					client,
+					select_chain,
 					inherent_data_providers.clone(),
 					spawn_task_handle,
 					registry,
diff --git a/polkadot/runtime/common/src/parachains.rs b/polkadot/runtime/common/src/parachains.rs
index 0c353a45f9..819ce685cc 100644
--- a/polkadot/runtime/common/src/parachains.rs
+++ b/polkadot/runtime/common/src/parachains.rs
@@ -1834,6 +1834,20 @@ mod tests {
 
 		// session module is the trigger
 		type EpochChangeTrigger = babe::ExternalTrigger;
+
+		type KeyOwnerProofSystem = ();
+
+		type KeyOwnerProof = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(
+			KeyTypeId,
+			babe::AuthorityId,
+		)>>::Proof;
+
+		type KeyOwnerIdentification = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(
+			KeyTypeId,
+			babe::AuthorityId,
+		)>>::IdentificationTuple;
+
+		type HandleEquivocation = ();
 	}
 
 	parameter_types! {
diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs
index f9ba963f04..7163fd869c 100644
--- a/polkadot/runtime/kusama/src/lib.rs
+++ b/polkadot/runtime/kusama/src/lib.rs
@@ -169,6 +169,21 @@ impl babe::Trait for Runtime {
 
 	// session module is the trigger
 	type EpochChangeTrigger = babe::ExternalTrigger;
+
+	type KeyOwnerProofSystem = Historical;
+
+	type KeyOwnerProof = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(
+		KeyTypeId,
+		babe::AuthorityId,
+	)>>::Proof;
+
+	type KeyOwnerIdentification = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(
+		KeyTypeId,
+		babe::AuthorityId,
+	)>>::IdentificationTuple;
+
+	type HandleEquivocation =
+		babe::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
 }
 
 parameter_types! {
@@ -913,7 +928,7 @@ construct_runtime! {
 		RandomnessCollectiveFlip: randomness_collective_flip::{Module, Storage},
 
 		// Must be before session.
-		Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp)},
+		Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp), ValidateUnsigned},
 
 		Timestamp: timestamp::{Module, Call, Storage, Inherent},
 		Indices: indices::{Module, Call, Storage, Config<T>, Event<T>},
@@ -1170,6 +1185,29 @@ sp_api::impl_runtime_apis! {
 		fn current_epoch_start() -> babe_primitives::SlotNumber {
 			Babe::current_epoch_start()
 		}
+
+		fn generate_key_ownership_proof(
+			_slot_number: babe_primitives::SlotNumber,
+			authority_id: babe_primitives::AuthorityId,
+		) -> Option<babe_primitives::OpaqueKeyOwnershipProof> {
+			use codec::Encode;
+
+			Historical::prove((babe_primitives::KEY_TYPE, authority_id))
+				.map(|p| p.encode())
+				.map(babe_primitives::OpaqueKeyOwnershipProof::new)
+		}
+
+		fn submit_report_equivocation_unsigned_extrinsic(
+			equivocation_proof: babe_primitives::EquivocationProof<<Block as BlockT>::Header>,
+			key_owner_proof: babe_primitives::OpaqueKeyOwnershipProof,
+		) -> Option<()> {
+			let key_owner_proof = key_owner_proof.decode()?;
+
+			Babe::submit_unsigned_equivocation_report(
+				equivocation_proof,
+				key_owner_proof,
+			)
+		}
 	}
 
 	impl authority_discovery_primitives::AuthorityDiscoveryApi<Block> for Runtime {
diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs
index cd63dfce02..b84734726b 100644
--- a/polkadot/runtime/polkadot/src/lib.rs
+++ b/polkadot/runtime/polkadot/src/lib.rs
@@ -200,6 +200,21 @@ impl babe::Trait for Runtime {
 
 	// session module is the trigger
 	type EpochChangeTrigger = babe::ExternalTrigger;
+
+	type KeyOwnerProofSystem = Historical;
+
+	type KeyOwnerProof = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(
+		KeyTypeId,
+		babe::AuthorityId,
+	)>>::Proof;
+
+	type KeyOwnerIdentification = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(
+		KeyTypeId,
+		babe::AuthorityId,
+	)>>::IdentificationTuple;
+
+	type HandleEquivocation =
+		babe::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
 }
 
 parameter_types! {
@@ -919,7 +934,7 @@ construct_runtime! {
 		Scheduler: scheduler::{Module, Call, Storage, Event<T>},
 
 		// Must be before session.
-		Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp)},
+		Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp), ValidateUnsigned},
 
 		Timestamp: timestamp::{Module, Call, Storage, Inherent},
 		Indices: indices::{Module, Call, Storage, Config<T>, Event<T>},
@@ -1171,6 +1186,29 @@ sp_api::impl_runtime_apis! {
 		fn current_epoch_start() -> babe_primitives::SlotNumber {
 			Babe::current_epoch_start()
 		}
+
+		fn generate_key_ownership_proof(
+			_slot_number: babe_primitives::SlotNumber,
+			authority_id: babe_primitives::AuthorityId,
+		) -> Option<babe_primitives::OpaqueKeyOwnershipProof> {
+			use codec::Encode;
+
+			Historical::prove((babe_primitives::KEY_TYPE, authority_id))
+				.map(|p| p.encode())
+				.map(babe_primitives::OpaqueKeyOwnershipProof::new)
+		}
+
+		fn submit_report_equivocation_unsigned_extrinsic(
+			equivocation_proof: babe_primitives::EquivocationProof<<Block as BlockT>::Header>,
+			key_owner_proof: babe_primitives::OpaqueKeyOwnershipProof,
+		) -> Option<()> {
+			let key_owner_proof = key_owner_proof.decode()?;
+
+			Babe::submit_unsigned_equivocation_report(
+				equivocation_proof,
+				key_owner_proof,
+			)
+		}
 	}
 
 	impl authority_discovery_primitives::AuthorityDiscoveryApi<Block> for Runtime {
diff --git a/polkadot/runtime/test-runtime/src/lib.rs b/polkadot/runtime/test-runtime/src/lib.rs
index 84bf487382..bd3e6459f5 100644
--- a/polkadot/runtime/test-runtime/src/lib.rs
+++ b/polkadot/runtime/test-runtime/src/lib.rs
@@ -175,6 +175,20 @@ impl babe::Trait for Runtime {
 
 	// session module is the trigger
 	type EpochChangeTrigger = babe::ExternalTrigger;
+
+	type KeyOwnerProofSystem = ();
+
+	type KeyOwnerProof = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(
+		KeyTypeId,
+		babe::AuthorityId,
+	)>>::Proof;
+
+	type KeyOwnerIdentification = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(
+		KeyTypeId,
+		babe::AuthorityId,
+	)>>::IdentificationTuple;
+
+	type HandleEquivocation = ();
 }
 
 parameter_types! {
@@ -704,6 +718,20 @@ sp_api::impl_runtime_apis! {
 		fn current_epoch_start() -> babe_primitives::SlotNumber {
 			Babe::current_epoch_start()
 		}
+
+		fn generate_key_ownership_proof(
+			_slot_number: babe_primitives::SlotNumber,
+			_authority_id: babe_primitives::AuthorityId,
+		) -> Option<babe_primitives::OpaqueKeyOwnershipProof> {
+			None
+		}
+
+		fn submit_report_equivocation_unsigned_extrinsic(
+			_equivocation_proof: babe_primitives::EquivocationProof<<Block as BlockT>::Header>,
+			_key_owner_proof: babe_primitives::OpaqueKeyOwnershipProof,
+		) -> Option<()> {
+			None
+		}
 	}
 
 	impl sp_session::SessionKeys<Block> for Runtime {
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index 3029c96d6a..14793d0d6c 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -159,6 +159,21 @@ impl babe::Trait for Runtime {
 
 	// session module is the trigger
 	type EpochChangeTrigger = babe::ExternalTrigger;
+
+	type KeyOwnerProofSystem = Historical;
+
+	type KeyOwnerProof = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(
+		KeyTypeId,
+		babe::AuthorityId,
+	)>>::Proof;
+
+	type KeyOwnerIdentification = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(
+		KeyTypeId,
+		babe::AuthorityId,
+	)>>::IdentificationTuple;
+
+	type HandleEquivocation =
+		babe::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
 }
 
 parameter_types! {
@@ -677,7 +692,7 @@ construct_runtime! {
 		RandomnessCollectiveFlip: randomness_collective_flip::{Module, Storage},
 
 		// Must be before session.
-		Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp)},
+		Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp), ValidateUnsigned},
 
 		Timestamp: timestamp::{Module, Call, Storage, Inherent},
 		Indices: indices::{Module, Call, Storage, Config<T>, Event<T>},
@@ -915,6 +930,29 @@ sp_api::impl_runtime_apis! {
 		fn current_epoch_start() -> babe_primitives::SlotNumber {
 			Babe::current_epoch_start()
 		}
+
+		fn generate_key_ownership_proof(
+			_slot_number: babe_primitives::SlotNumber,
+			authority_id: babe_primitives::AuthorityId,
+		) -> Option<babe_primitives::OpaqueKeyOwnershipProof> {
+			use codec::Encode;
+
+			Historical::prove((babe_primitives::KEY_TYPE, authority_id))
+				.map(|p| p.encode())
+				.map(babe_primitives::OpaqueKeyOwnershipProof::new)
+		}
+
+		fn submit_report_equivocation_unsigned_extrinsic(
+			equivocation_proof: babe_primitives::EquivocationProof<<Block as BlockT>::Header>,
+			key_owner_proof: babe_primitives::OpaqueKeyOwnershipProof,
+		) -> Option<()> {
+			let key_owner_proof = key_owner_proof.decode()?;
+
+			Babe::submit_unsigned_equivocation_report(
+				equivocation_proof,
+				key_owner_proof,
+			)
+		}
 	}
 
 	impl authority_discovery_primitives::AuthorityDiscoveryApi<Block> for Runtime {
diff --git a/polkadot/service/src/lib.rs b/polkadot/service/src/lib.rs
index 70d04df630..c7f2bd8b82 100644
--- a/polkadot/service/src/lib.rs
+++ b/polkadot/service/src/lib.rs
@@ -192,7 +192,7 @@ macro_rules! new_full_start {
 					grandpa::block_import_with_authority_set_hard_forks(
 						client.clone(),
 						&(client.clone() as Arc<_>),
-						select_chain,
+						select_chain.clone(),
 						grandpa_hard_forks,
 					)?;
 
@@ -210,6 +210,7 @@ macro_rules! new_full_start {
 					Some(Box::new(justification_import)),
 					None,
 					client,
+					select_chain,
 					inherent_data_providers.clone(),
 					spawn_task_handle,
 					registry,
@@ -573,14 +574,18 @@ macro_rules! new_light {
 				client,
 				backend,
 				fetcher,
-				_select_chain,
+				mut select_chain,
 				_,
 				spawn_task_handle,
 				registry,
 			| {
+				let select_chain = select_chain.take()
+					.ok_or_else(|| service::Error::SelectChainRequired)?;
+
 				let fetch_checker = fetcher
 					.map(|fetcher| fetcher.checker().clone())
 					.ok_or_else(|| "Trying to start light import queue without active fetch checker")?;
+
 				let grandpa_block_import = grandpa::light_block_import(
 					client.clone(), backend, &(client.clone() as Arc<_>), Arc::new(fetch_checker)
 				)?;
@@ -602,6 +607,7 @@ macro_rules! new_light {
 					None,
 					Some(Box::new(finality_proof_import)),
 					client,
+					select_chain,
 					inherent_data_providers.clone(),
 					spawn_task_handle,
 					registry,