diff --git a/Cargo.lock b/Cargo.lock
index 5e0cb8c6c553..eaa78b35c6ff 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1502,7 +1502,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1520,7 +1520,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1538,7 +1538,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "Inflector",
  "chrono",
@@ -1561,7 +1561,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1577,7 +1577,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "12.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1588,7 +1588,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -1613,7 +1613,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -1625,7 +1625,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1637,7 +1637,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
@@ -1647,7 +1647,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples 0.2.0",
@@ -1663,7 +1663,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1677,7 +1677,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -3942,7 +3942,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b"
 [[package]]
 name = "pallet-authority-discovery"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3958,7 +3958,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3973,7 +3973,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3998,7 +3998,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4012,7 +4012,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4027,7 +4027,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4043,7 +4043,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4058,7 +4058,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4073,7 +4073,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4094,7 +4094,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4110,7 +4110,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4130,7 +4130,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4147,7 +4147,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4161,7 +4161,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4177,7 +4177,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4191,7 +4191,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4206,7 +4206,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4227,7 +4227,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4243,7 +4243,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4256,7 +4256,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4271,7 +4271,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4286,7 +4286,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4306,7 +4306,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4322,7 +4322,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4336,7 +4336,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4358,7 +4358,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -4369,7 +4369,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4383,7 +4383,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4401,7 +4401,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4416,7 +4416,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4432,7 +4432,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4449,7 +4449,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -4460,7 +4460,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4476,7 +4476,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4492,7 +4492,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -6832,7 +6832,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -6860,7 +6860,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -6883,7 +6883,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -6900,7 +6900,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
@@ -6921,7 +6921,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -6932,7 +6932,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "chrono",
  "fdlimit",
@@ -6970,7 +6970,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "derive_more",
  "fnv",
@@ -7004,7 +7004,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -7034,7 +7034,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -7045,7 +7045,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "derive_more",
  "fork-tree",
@@ -7075,6 +7075,7 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
+ "sp-consensus-slots",
  "sp-consensus-vrf",
  "sp-core",
  "sp-inherents",
@@ -7090,7 +7091,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7114,7 +7115,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -7127,7 +7128,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -7153,7 +7154,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "log",
  "sc-client-api",
@@ -7167,7 +7168,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "derive_more",
  "lazy_static",
@@ -7196,7 +7197,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
@@ -7212,7 +7213,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7227,7 +7228,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7245,7 +7246,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7283,7 +7284,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7307,7 +7308,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-warp-sync"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7327,7 +7328,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.12",
@@ -7345,7 +7346,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7365,7 +7366,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -7384,7 +7385,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "async-std",
  "async-trait",
@@ -7436,7 +7437,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -7452,7 +7453,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -7479,7 +7480,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "futures 0.3.12",
  "libp2p",
@@ -7492,7 +7493,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -7501,7 +7502,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "futures 0.3.12",
  "hash-db",
@@ -7535,7 +7536,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7559,7 +7560,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "futures 0.1.29",
  "jsonrpc-core",
@@ -7577,7 +7578,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "directories 3.0.1",
  "exit-future",
@@ -7640,7 +7641,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7655,7 +7656,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -7675,7 +7676,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "chrono",
  "futures 0.3.12",
@@ -7697,7 +7698,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -7725,7 +7726,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -7736,7 +7737,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7758,7 +7759,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "futures 0.3.12",
  "futures-diagnose",
@@ -8180,7 +8181,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "log",
  "sp-core",
@@ -8192,7 +8193,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -8208,7 +8209,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -8220,7 +8221,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8232,7 +8233,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.14",
@@ -8245,7 +8246,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8257,7 +8258,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -8268,7 +8269,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8280,7 +8281,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "futures 0.3.12",
  "log",
@@ -8298,7 +8299,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "serde",
  "serde_json",
@@ -8307,7 +8308,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -8333,7 +8334,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -8353,16 +8354,17 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "parity-scale-codec",
+ "sp-arithmetic",
  "sp-runtime",
 ]
 
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -8374,7 +8376,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -8418,7 +8420,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -8427,7 +8429,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
@@ -8437,7 +8439,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8448,7 +8450,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8465,7 +8467,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -8477,7 +8479,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "futures 0.3.12",
  "hash-db",
@@ -8501,7 +8503,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -8512,7 +8514,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8529,7 +8531,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8542,7 +8544,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -8553,7 +8555,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -8563,7 +8565,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "backtrace",
 ]
@@ -8571,7 +8573,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "serde",
  "sp-core",
@@ -8580,7 +8582,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -8601,7 +8603,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
@@ -8618,7 +8620,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -8630,7 +8632,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "serde",
  "serde_json",
@@ -8639,7 +8641,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8652,7 +8654,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8662,7 +8664,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "hash-db",
  "log",
@@ -8684,12 +8686,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 
 [[package]]
 name = "sp-storage"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8702,7 +8704,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "log",
  "sp-core",
@@ -8715,7 +8717,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
@@ -8729,7 +8731,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8742,7 +8744,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -8758,7 +8760,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -8772,7 +8774,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "futures 0.3.12",
  "futures-core",
@@ -8784,7 +8786,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8796,7 +8798,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
@@ -8949,7 +8951,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -8976,7 +8978,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "platforms",
 ]
@@ -8984,7 +8986,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.12",
@@ -9007,7 +9009,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "async-std",
  "derive_more",
@@ -9021,7 +9023,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "futures 0.1.29",
  "futures 0.3.12",
@@ -9048,7 +9050,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "futures 0.3.12",
  "substrate-test-utils-derive",
@@ -9058,7 +9060,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#0b0d124d5f9be89f614f2be8e9da038fcb9f540e"
+source = "git+https://github.com/paritytech/substrate#64df2f94803e448291bc058bd09b3b750cc5c5ee"
 dependencies = [
  "proc-macro-crate",
  "quote 1.0.7",
diff --git a/node/core/approval-voting/src/aux_schema/mod.rs b/node/core/approval-voting/src/aux_schema/mod.rs
index fd55644a1918..26c9cd5ba525 100644
--- a/node/core/approval-voting/src/aux_schema/mod.rs
+++ b/node/core/approval-voting/src/aux_schema/mod.rs
@@ -39,7 +39,7 @@ use polkadot_primitives::v1::{
 	ValidatorIndex, GroupIndex, CandidateReceipt, SessionIndex, CoreIndex,
 	BlockNumber, Hash, CandidateHash,
 };
-use sp_consensus_slots::SlotNumber;
+use sp_consensus_slots::Slot;
 use parity_scale_codec::{Encode, Decode};
 
 use std::collections::{BTreeMap, HashMap};
@@ -94,7 +94,7 @@ pub(crate) struct CandidateEntry {
 pub(crate) struct BlockEntry {
 	block_hash: Hash,
 	session: SessionIndex,
-	slot: SlotNumber,
+	slot: Slot,
 	relay_vrf_story: RelayVRF,
 	// The candidates included as-of this block and the index of the core they are
 	// leaving. Sorted ascending by core index.
diff --git a/node/core/approval-voting/src/aux_schema/tests.rs b/node/core/approval-voting/src/aux_schema/tests.rs
index 97fd27d597ef..4f7861ee6a8c 100644
--- a/node/core/approval-voting/src/aux_schema/tests.rs
+++ b/node/core/approval-voting/src/aux_schema/tests.rs
@@ -89,7 +89,7 @@ fn make_block_entry(
 	BlockEntry {
 		block_hash,
 		session: 1,
-		slot: 1,
+		slot: 1.into(),
 		relay_vrf_story: RelayVRF([0u8; 32]),
 		approved_bitfield: make_bitvec(candidates.len()),
 		candidates,
diff --git a/node/network/approval-distribution/src/tests.rs b/node/network/approval-distribution/src/tests.rs
index df13004fcacb..263b1c3075ad 100644
--- a/node/network/approval-distribution/src/tests.rs
+++ b/node/network/approval-distribution/src/tests.rs
@@ -202,7 +202,7 @@ fn try_import_the_same_assignment() {
 			parent_hash,
 			number: 2,
 			candidates: vec![Default::default(); 1],
-			slot_number: 1,
+			slot: 1.into(),
 		};
 		let msg = ApprovalDistributionMessage::NewBlocks(vec![meta]);
 		overseer_send(overseer, msg).await;
@@ -288,7 +288,7 @@ fn spam_attack_results_in_negative_reputation_change() {
 			parent_hash,
 			number: 2,
 			candidates: vec![Default::default(); candidates_count],
-			slot_number: 1,
+			slot: 1.into(),
 		};
 
 		let msg = ApprovalDistributionMessage::NewBlocks(vec![meta]);
@@ -363,7 +363,7 @@ fn import_approval_happy_path() {
 			parent_hash,
 			number: 1,
 			candidates: vec![Default::default(); 1],
-			slot_number: 1,
+			slot: 1.into(),
 		};
 		let msg = ApprovalDistributionMessage::NewBlocks(vec![meta]);
 		overseer_send(overseer, msg).await;
@@ -447,7 +447,7 @@ fn import_approval_bad() {
 			parent_hash,
 			number: 1,
 			candidates: vec![Default::default(); 1],
-			slot_number: 1,
+			slot: 1.into(),
 		};
 		let msg = ApprovalDistributionMessage::NewBlocks(vec![meta]);
 		overseer_send(overseer, msg).await;
@@ -521,21 +521,21 @@ fn update_our_view() {
 			parent_hash,
 			number: 1,
 			candidates: vec![Default::default(); 1],
-			slot_number: 1,
+			slot: 1.into(),
 		};
 		let meta_b = BlockApprovalMeta {
 			hash: hash_b,
 			parent_hash: hash_a,
 			number: 2,
 			candidates: vec![Default::default(); 1],
-			slot_number: 1,
+			slot: 1.into(),
 		};
 		let meta_c = BlockApprovalMeta {
 			hash: hash_c,
 			parent_hash: hash_b,
 			number: 3,
 			candidates: vec![Default::default(); 1],
-			slot_number: 1,
+			slot: 1.into(),
 		};
 
 		let msg = ApprovalDistributionMessage::NewBlocks(vec![meta_a, meta_b, meta_c]);
@@ -591,21 +591,21 @@ fn update_peer_view() {
 			parent_hash,
 			number: 1,
 			candidates: vec![Default::default(); 1],
-			slot_number: 1,
+			slot: 1.into(),
 		};
 		let meta_b = BlockApprovalMeta {
 			hash: hash_b,
 			parent_hash: hash_a,
 			number: 2,
 			candidates: vec![Default::default(); 1],
-			slot_number: 1,
+			slot: 1.into(),
 		};
 		let meta_c = BlockApprovalMeta {
 			hash: hash_c,
 			parent_hash: hash_b,
 			number: 3,
 			candidates: vec![Default::default(); 1],
-			slot_number: 1,
+			slot: 1.into(),
 		};
 
 		let msg = ApprovalDistributionMessage::NewBlocks(vec![meta_a, meta_b, meta_c]);
@@ -742,7 +742,7 @@ fn import_remotely_then_locally() {
 			parent_hash,
 			number: 1,
 			candidates: vec![Default::default(); 1],
-			slot_number: 1,
+			slot: 1.into(),
 		};
 		let msg = ApprovalDistributionMessage::NewBlocks(vec![meta]);
 		overseer_send(overseer, msg).await;
diff --git a/node/primitives/src/approval.rs b/node/primitives/src/approval.rs
index 37b72399bd85..43188550fdb2 100644
--- a/node/primitives/src/approval.rs
+++ b/node/primitives/src/approval.rs
@@ -17,7 +17,7 @@
 //! Types relevant for approval.
 
 pub use sp_consensus_vrf::schnorrkel::{VRFOutput, VRFProof};
-pub use sp_consensus_slots::SlotNumber;
+pub use sp_consensus_slots::Slot;
 
 use polkadot_primitives::v1::{
 	CandidateHash, Hash, ValidatorIndex, Signed, ValidatorSignature, CoreIndex,
@@ -118,6 +118,6 @@ pub struct BlockApprovalMeta {
 	/// The candidates included by the block.
 	/// Note that these are not the same as the candidates that appear within the block body.
 	pub candidates: Vec<CandidateHash>,
-	/// The consensus slot number of the block.
-	pub slot_number: SlotNumber,
+	/// The consensus slot of the block.
+	pub slot: Slot,
 }
diff --git a/roadmap/implementers-guide/src/node/approval/approval-voting.md b/roadmap/implementers-guide/src/node/approval/approval-voting.md
index b598f9079267..cc7418d2c11f 100644
--- a/roadmap/implementers-guide/src/node/approval/approval-voting.md
+++ b/roadmap/implementers-guide/src/node/approval/approval-voting.md
@@ -71,7 +71,7 @@ struct CandidateEntry {
 struct BlockEntry {
     block_hash: Hash,
     session: SessionIndex,
-    slot: SlotNumber,
+    slot: Slot,
     // random bytes derived from the VRF submitted within the block by the block
     // author as a credential and used as input to approval assignment criteria.
     relay_vrf_story: [u8; 32],
diff --git a/roadmap/implementers-guide/src/types/overseer-protocol.md b/roadmap/implementers-guide/src/types/overseer-protocol.md
index d545c64a72f8..f166847ee227 100644
--- a/roadmap/implementers-guide/src/types/overseer-protocol.md
+++ b/roadmap/implementers-guide/src/types/overseer-protocol.md
@@ -101,8 +101,8 @@ struct BlockApprovalMeta {
     /// The candidates included by the block. Note that these are not the same as the candidates that appear within the
     /// block body.
     candidates: Vec<CandidateHash>,
-    /// The consensus slot number of the block.
-    slot_number: SlotNumber,
+    /// The consensus slot of the block.
+    slot: Slot,
 }
 
 enum ApprovalDistributionMessage {
diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
index a2ecbbc53226..b5d4e9a9d204 100644
--- a/runtime/kusama/src/lib.rs
+++ b/runtime/kusama/src/lib.rs
@@ -1240,7 +1240,7 @@ sp_api::impl_runtime_apis! {
 			}
 		}
 
-		fn current_epoch_start() -> babe_primitives::SlotNumber {
+		fn current_epoch_start() -> babe_primitives::Slot {
 			Babe::current_epoch_start()
 		}
 
@@ -1253,7 +1253,7 @@ sp_api::impl_runtime_apis! {
 		}
 
 		fn generate_key_ownership_proof(
-			_slot_number: babe_primitives::SlotNumber,
+			_slot: babe_primitives::Slot,
 			authority_id: babe_primitives::AuthorityId,
 		) -> Option<babe_primitives::OpaqueKeyOwnershipProof> {
 			use parity_scale_codec::Encode;
diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
index b97d454ec6a0..90a9b12ef3be 100644
--- a/runtime/polkadot/src/lib.rs
+++ b/runtime/polkadot/src/lib.rs
@@ -1235,7 +1235,7 @@ sp_api::impl_runtime_apis! {
 			}
 		}
 
-		fn current_epoch_start() -> babe_primitives::SlotNumber {
+		fn current_epoch_start() -> babe_primitives::Slot {
 			Babe::current_epoch_start()
 		}
 
@@ -1248,7 +1248,7 @@ sp_api::impl_runtime_apis! {
 		}
 
 		fn generate_key_ownership_proof(
-			_slot_number: babe_primitives::SlotNumber,
+			_slot: babe_primitives::Slot,
 			authority_id: babe_primitives::AuthorityId,
 		) -> Option<babe_primitives::OpaqueKeyOwnershipProof> {
 			use parity_scale_codec::Encode;
diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs
index b52b7cb8c49e..76bdcb16dba5 100644
--- a/runtime/rococo/src/lib.rs
+++ b/runtime/rococo/src/lib.rs
@@ -804,7 +804,7 @@ sp_api::impl_runtime_apis! {
 			}
 		}
 
-		fn current_epoch_start() -> babe_primitives::SlotNumber {
+		fn current_epoch_start() -> babe_primitives::Slot {
 			Babe::current_epoch_start()
 		}
 
@@ -817,7 +817,7 @@ sp_api::impl_runtime_apis! {
 		}
 
 		fn generate_key_ownership_proof(
-			_slot_number: babe_primitives::SlotNumber,
+			_slot: babe_primitives::Slot,
 			authority_id: babe_primitives::AuthorityId,
 		) -> Option<babe_primitives::OpaqueKeyOwnershipProof> {
 			use parity_scale_codec::Encode;
diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs
index 1d6d0675c8bf..11e47862c7e7 100644
--- a/runtime/test-runtime/src/lib.rs
+++ b/runtime/test-runtime/src/lib.rs
@@ -735,7 +735,7 @@ sp_api::impl_runtime_apis! {
 			}
 		}
 
-		fn current_epoch_start() -> babe_primitives::SlotNumber {
+		fn current_epoch_start() -> babe_primitives::Slot {
 			Babe::current_epoch_start()
 		}
 
@@ -748,7 +748,7 @@ sp_api::impl_runtime_apis! {
 		}
 
 		fn generate_key_ownership_proof(
-			_slot_number: babe_primitives::SlotNumber,
+			_slot: babe_primitives::Slot,
 			_authority_id: babe_primitives::AuthorityId,
 		) -> Option<babe_primitives::OpaqueKeyOwnershipProof> {
 			None
diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs
index 4b25d3fd6140..f667696b1389 100644
--- a/runtime/westend/src/lib.rs
+++ b/runtime/westend/src/lib.rs
@@ -950,7 +950,7 @@ sp_api::impl_runtime_apis! {
 			}
 		}
 
-		fn current_epoch_start() -> babe_primitives::SlotNumber {
+		fn current_epoch_start() -> babe_primitives::Slot {
 			Babe::current_epoch_start()
 		}
 
@@ -963,7 +963,7 @@ sp_api::impl_runtime_apis! {
 		}
 
 		fn generate_key_ownership_proof(
-			_slot_number: babe_primitives::SlotNumber,
+			_slot: babe_primitives::Slot,
 			authority_id: babe_primitives::AuthorityId,
 		) -> Option<babe_primitives::OpaqueKeyOwnershipProof> {
 			use parity_scale_codec::Encode;