diff --git a/Cargo.lock b/Cargo.lock
index 968da86854f4..dba485ab28f0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1429,7 +1429,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1437,7 +1437,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1455,7 +1455,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-benchmarking",
  "parity-scale-codec",
@@ -1473,7 +1473,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1489,7 +1489,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "11.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1500,7 +1500,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "bitmask",
  "frame-metadata",
@@ -1525,7 +1525,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support-procedural-tools",
  "proc-macro2 1.0.18",
@@ -1536,7 +1536,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1548,7 +1548,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "proc-macro2 1.0.18",
  "quote 1.0.7",
@@ -1558,7 +1558,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1574,7 +1574,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1588,7 +1588,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -3756,7 +3756,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3772,7 +3772,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3787,7 +3787,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3812,7 +3812,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3826,7 +3826,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3842,7 +3842,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3857,7 +3857,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3872,7 +3872,7 @@ dependencies = [
 [[package]]
 name = "pallet-finality-tracker"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3888,7 +3888,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3910,7 +3910,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -3926,7 +3926,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3946,7 +3946,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3962,7 +3962,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3976,7 +3976,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3991,7 +3991,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4005,7 +4005,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4020,7 +4020,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4041,7 +4041,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4056,7 +4056,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4069,7 +4069,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4084,7 +4084,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4099,7 +4099,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4119,7 +4119,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4135,7 +4135,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4149,7 +4149,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4171,7 +4171,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -4182,7 +4182,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4196,7 +4196,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4214,7 +4214,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4231,7 +4231,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4249,7 +4249,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -4262,7 +4262,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4277,7 +4277,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4293,7 +4293,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -6462,7 +6462,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "bytes 0.5.6",
  "derive_more 0.99.9",
@@ -6490,7 +6490,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -6514,7 +6514,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -6531,7 +6531,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -6548,7 +6548,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -6559,7 +6559,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -6608,7 +6608,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "derive_more 0.99.9",
  "fnv",
@@ -6644,7 +6644,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -6674,7 +6674,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -6685,7 +6685,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "derive_more 0.99.9",
  "fork-tree",
@@ -6729,7 +6729,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -6753,7 +6753,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -6766,7 +6766,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -6789,7 +6789,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "log 0.4.11",
  "sc-client-api",
@@ -6803,7 +6803,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "derive_more 0.99.9",
  "lazy_static",
@@ -6831,7 +6831,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "derive_more 0.99.9",
  "log 0.4.11",
@@ -6848,7 +6848,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "log 0.4.11",
  "parity-scale-codec",
@@ -6863,7 +6863,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "log 0.4.11",
  "parity-scale-codec",
@@ -6881,7 +6881,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "derive_more 0.99.9",
  "finality-grandpa",
@@ -6918,7 +6918,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "derive_more 0.99.9",
  "finality-grandpa",
@@ -6929,10 +6929,12 @@ dependencies = [
  "jsonrpc-pubsub",
  "log 0.4.11",
  "parity-scale-codec",
+ "sc-client-api",
  "sc-finality-grandpa",
  "sc-rpc",
  "serde",
  "serde_json",
+ "sp-blockchain",
  "sp-core",
  "sp-runtime",
 ]
@@ -6940,7 +6942,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.5",
@@ -6958,7 +6960,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "derive_more 0.99.9",
  "hex",
@@ -6974,7 +6976,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -6993,7 +6995,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "async-std",
  "async-trait",
@@ -7047,7 +7049,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -7062,7 +7064,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -7089,7 +7091,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "futures 0.3.5",
  "libp2p",
@@ -7102,7 +7104,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "log 0.4.11",
  "substrate-prometheus-endpoint",
@@ -7111,7 +7113,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -7143,7 +7145,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -7167,7 +7169,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "futures 0.1.29",
  "jsonrpc-core",
@@ -7185,7 +7187,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "derive_more 0.99.9",
  "directories",
@@ -7247,7 +7249,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "log 0.4.11",
  "parity-scale-codec",
@@ -7261,7 +7263,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -7282,7 +7284,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "erased-serde",
  "log 0.4.11",
@@ -7301,7 +7303,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -7322,7 +7324,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -7789,7 +7791,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "derive_more 0.99.9",
  "log 0.4.11",
@@ -7801,7 +7803,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -7816,7 +7818,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -7828,7 +7830,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -7840,7 +7842,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.12",
@@ -7853,7 +7855,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7865,7 +7867,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -7876,7 +7878,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7888,7 +7890,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "derive_more 0.99.9",
  "log 0.4.11",
@@ -7905,7 +7907,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "serde",
  "serde_json",
@@ -7914,7 +7916,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -7940,7 +7942,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -7959,7 +7961,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -7968,7 +7970,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -7980,7 +7982,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -8024,7 +8026,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "kvdb",
  "parking_lot 0.10.2",
@@ -8033,7 +8035,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "proc-macro2 1.0.18",
  "quote 1.0.7",
@@ -8043,7 +8045,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8054,7 +8056,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "finality-grandpa",
  "log 0.4.11",
@@ -8070,7 +8072,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-tracker"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -8080,7 +8082,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "derive_more 0.99.9",
  "parity-scale-codec",
@@ -8092,7 +8094,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -8115,7 +8117,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -8126,7 +8128,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8138,7 +8140,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -8149,7 +8151,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -8159,7 +8161,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "backtrace",
  "log 0.4.11",
@@ -8168,7 +8170,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "serde",
  "sp-core",
@@ -8177,7 +8179,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -8199,7 +8201,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -8215,7 +8217,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -8227,7 +8229,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "serde",
  "serde_json",
@@ -8236,7 +8238,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8249,7 +8251,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8259,7 +8261,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "hash-db",
  "log 0.4.11",
@@ -8280,12 +8282,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 
 [[package]]
 name = "sp-storage"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8298,7 +8300,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8312,7 +8314,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "log 0.4.11",
  "parity-scale-codec",
@@ -8325,7 +8327,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -8340,7 +8342,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -8354,7 +8356,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "futures 0.3.5",
  "futures-core",
@@ -8366,7 +8368,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8378,7 +8380,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8519,7 +8521,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -8545,7 +8547,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "platforms",
 ]
@@ -8553,7 +8555,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.5",
@@ -8576,7 +8578,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "async-std",
  "derive_more 0.99.9",
@@ -8590,7 +8592,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "futures 0.1.29",
  "futures 0.3.5",
@@ -8616,7 +8618,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "futures 0.3.5",
  "substrate-test-utils-derive",
@@ -8626,7 +8628,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#b28d202d8d9fb31c6e1e1ec92afc2a9cddbda2f5"
+source = "git+https://github.com/paritytech/substrate#16474ee9ed8f75ad578f4539ae4fc016ecf8b3d1"
 dependencies = [
  "proc-macro-crate",
  "quote 1.0.7",
diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs
index 0377746608ca..c27fd3e56e69 100644
--- a/node/service/src/lib.rs
+++ b/node/service/src/lib.rs
@@ -134,7 +134,10 @@ fn new_partial<RuntimeApi, Executor>(config: &mut Configuration) -> Result<
 				grandpa::LinkHalf<Block, FullClient<RuntimeApi, Executor>, FullSelectChain>,
 				babe::BabeLink<Block>
 			),
-			grandpa::SharedVoterState,
+			(
+				grandpa::SharedVoterState,
+				Arc<GrandpaFinalityProofProvider<FullBackend, Block>>,
+			),
 		)
 	>,
 	Error
@@ -200,9 +203,11 @@ fn new_partial<RuntimeApi, Executor>(config: &mut Configuration) -> Result<
 	let justification_stream = grandpa_link.justification_stream();
 	let shared_authority_set = grandpa_link.shared_authority_set().clone();
 	let shared_voter_state = grandpa::SharedVoterState::empty();
+	let finality_proof_provider =
+		GrandpaFinalityProofProvider::new_for_service(backend.clone(), client.clone());
 
 	let import_setup = (block_import.clone(), grandpa_link, babe_link.clone());
-	let rpc_setup = shared_voter_state.clone();
+	let rpc_setup = (shared_voter_state.clone(), finality_proof_provider.clone());
 
 	let babe_config = babe_link.config().clone();
 	let shared_epoch_changes = babe_link.epoch_changes().clone();
@@ -229,6 +234,7 @@ fn new_partial<RuntimeApi, Executor>(config: &mut Configuration) -> Result<
 					shared_authority_set: shared_authority_set.clone(),
 					justification_stream: justification_stream.clone(),
 					subscription_executor,
+					finality_provider: finality_proof_provider.clone(),
 				},
 			};
 
@@ -316,8 +322,7 @@ fn new_full<RuntimeApi, Executor>(
 
 	let prometheus_registry = config.prometheus_registry().cloned();
 
-	let finality_proof_provider =
-		GrandpaFinalityProofProvider::new_for_service(backend.clone(), client.clone());
+	let (shared_voter_state, finality_proof_provider) = rpc_setup;
 
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
 		service::build_network(service::BuildNetworkParams {
@@ -357,8 +362,6 @@ fn new_full<RuntimeApi, Executor>(
 
 	let (block_import, link_half, babe_link) = import_setup;
 
-	let shared_voter_state = rpc_setup;
-
 	let overseer_client = client.clone();
 	let spawner = task_manager.spawn_handle();
 	let leaves: Vec<_> = select_chain.clone()
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index 2714db4d3054..8301599412ad 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -23,12 +23,13 @@ use std::sync::Arc;
 use polkadot_primitives::v0::{Block, BlockNumber, AccountId, Nonce, Balance, Hash};
 use sp_api::ProvideRuntimeApi;
 use txpool_api::TransactionPool;
+use sp_block_builder::BlockBuilder;
 use sp_blockchain::{HeaderBackend, HeaderMetadata, Error as BlockChainError};
 use sp_consensus::SelectChain;
 use sp_consensus_babe::BabeApi;
 use sc_client_api::light::{Fetcher, RemoteBlockchain};
 use sc_consensus_babe::Epoch;
-use sp_block_builder::BlockBuilder;
+use sc_finality_grandpa::FinalityProofProvider;
 pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor};
 
 /// A type representing all RPC extensions.
@@ -57,19 +58,21 @@ pub struct BabeDeps {
 }
 
 /// Dependencies for GRANDPA
-pub struct GrandpaDeps {
+pub struct GrandpaDeps<B> {
 	/// Voting round info.
 	pub shared_voter_state: sc_finality_grandpa::SharedVoterState,
 	/// Authority set info.
 	pub shared_authority_set: sc_finality_grandpa::SharedAuthoritySet<Hash, BlockNumber>,
 	/// Receives notifications about justification events from Grandpa.
 	pub justification_stream: sc_finality_grandpa::GrandpaJustificationStream<Block>,
-	/// Subscription manager to keep track of pubsub subscribers.
+	/// Executor to drive the subscription manager in the Grandpa RPC handler.
 	pub subscription_executor: sc_rpc::SubscriptionTaskExecutor,
+	/// Finality proof provider.
+	pub finality_provider: Arc<FinalityProofProvider<B, Block>>,
 }
 
 /// Full client dependencies
-pub struct FullDeps<C, P, SC> {
+pub struct FullDeps<C, P, SC, B> {
 	/// The client instance to use.
 	pub client: Arc<C>,
 	/// Transaction pool instance.
@@ -81,11 +84,11 @@ pub struct FullDeps<C, P, SC> {
 	/// BABE specific dependencies.
 	pub babe: BabeDeps,
 	/// GRANDPA specific dependencies.
-	pub grandpa: GrandpaDeps,
+	pub grandpa: GrandpaDeps<B>,
 }
 
 /// Instantiate all RPC extensions.
-pub fn create_full<C, P, SC>(deps: FullDeps<C, P, SC>) -> RpcExtension where
+pub fn create_full<C, P, SC, B>(deps: FullDeps<C, P, SC, B>) -> RpcExtension where
 	C: ProvideRuntimeApi<Block>,
 	C: HeaderBackend<Block> + HeaderMetadata<Block, Error=BlockChainError>,
 	C: Send + Sync + 'static,
@@ -95,6 +98,8 @@ pub fn create_full<C, P, SC>(deps: FullDeps<C, P, SC>) -> RpcExtension where
 	C::Api: BlockBuilder<Block>,
 	P: TransactionPool + Sync + Send + 'static,
 	SC: SelectChain<Block> + 'static,
+	B: sc_client_api::Backend<Block> + Send + Sync + 'static,
+	B::State: sc_client_api::StateBackend<sp_runtime::traits::HashFor<Block>>,
 {
 	use frame_rpc_system::{FullSystem, SystemApi};
 	use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi};
@@ -120,6 +125,7 @@ pub fn create_full<C, P, SC>(deps: FullDeps<C, P, SC>) -> RpcExtension where
 		shared_authority_set,
 		justification_stream,
 		subscription_executor,
+		finality_provider,
 	} = grandpa;
 
 	io.extend_with(
@@ -146,6 +152,7 @@ pub fn create_full<C, P, SC>(deps: FullDeps<C, P, SC>) -> RpcExtension where
 			shared_voter_state,
 			justification_stream,
 			subscription_executor,
+			finality_provider,
 		))
 	);
 	io
diff --git a/service/src/lib.rs b/service/src/lib.rs
index c79c9d1d5636..5878958a5853 100644
--- a/service/src/lib.rs
+++ b/service/src/lib.rs
@@ -132,7 +132,10 @@ pub fn new_partial<RuntimeApi, Executor>(config: &mut Configuration, test: bool)
 				grandpa::LinkHalf<Block, FullClient<RuntimeApi, Executor>, FullSelectChain>,
 				babe::BabeLink<Block>
 			),
-			grandpa::SharedVoterState,
+			(
+				grandpa::SharedVoterState,
+				Arc<GrandpaFinalityProofProvider<FullBackend, Block>>,
+			),
 		)
 	>,
 	Error
@@ -203,9 +206,11 @@ pub fn new_partial<RuntimeApi, Executor>(config: &mut Configuration, test: bool)
 	let justification_stream = grandpa_link.justification_stream();
 	let shared_authority_set = grandpa_link.shared_authority_set().clone();
 	let shared_voter_state = grandpa::SharedVoterState::empty();
+	let finality_proof_provider =
+		GrandpaFinalityProofProvider::new_for_service(backend.clone(), client.clone());
 
 	let import_setup = (block_import.clone(), grandpa_link, babe_link.clone());
-	let rpc_setup = shared_voter_state.clone();
+	let rpc_setup = (shared_voter_state.clone(), finality_proof_provider.clone());
 
 	let babe_config = babe_link.config().clone();
 	let shared_epoch_changes = babe_link.epoch_changes().clone();
@@ -232,6 +237,7 @@ pub fn new_partial<RuntimeApi, Executor>(config: &mut Configuration, test: bool)
 					shared_authority_set: shared_authority_set.clone(),
 					justification_stream: justification_stream.clone(),
 					subscription_executor,
+					finality_provider: finality_proof_provider.clone(),
 				},
 			};
 
@@ -303,8 +309,7 @@ pub fn new_full<RuntimeApi, Executor>(
 
 	let prometheus_registry = config.prometheus_registry().cloned();
 
-	let finality_proof_provider =
-		GrandpaFinalityProofProvider::new_for_service(backend.clone(), client.clone());
+	let (shared_voter_state, finality_proof_provider) = rpc_setup;
 
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
 		service::build_network(service::BuildNetworkParams {
@@ -345,8 +350,6 @@ pub fn new_full<RuntimeApi, Executor>(
 
 	let (block_import, link_half, babe_link) = import_setup;
 
-	let shared_voter_state = rpc_setup;
-
 	if role.is_authority() {
 		let proposer = consensus::ProposerFactory::new(
 			client.clone(),