diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index 81306de744..90f469bac6 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -1314,7 +1314,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1322,7 +1322,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1339,7 +1339,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "Inflector",
  "frame-benchmarking",
@@ -1358,7 +1358,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1373,7 +1373,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "11.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1384,7 +1384,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "bitmask",
  "frame-metadata",
@@ -1409,7 +1409,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support-procedural-tools",
  "proc-macro2 1.0.18",
@@ -1420,7 +1420,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1432,7 +1432,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "proc-macro2 1.0.18",
  "quote 1.0.7",
@@ -1442,7 +1442,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1458,7 +1458,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1472,7 +1472,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -3466,7 +3466,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3482,7 +3482,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3497,7 +3497,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3522,7 +3522,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3536,7 +3536,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3552,7 +3552,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3567,7 +3567,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3582,7 +3582,7 @@ dependencies = [
 [[package]]
 name = "pallet-finality-tracker"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3598,10 +3598,12 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "pallet-authorship",
  "pallet-finality-tracker",
  "pallet-session",
  "parity-scale-codec",
@@ -3618,7 +3620,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -3634,7 +3636,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3654,7 +3656,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3670,7 +3672,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3684,7 +3686,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3699,7 +3701,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3713,7 +3715,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3728,7 +3730,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3749,7 +3751,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3764,7 +3766,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3777,7 +3779,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -3792,7 +3794,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3807,7 +3809,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3827,7 +3829,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3843,7 +3845,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3857,7 +3859,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3879,7 +3881,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -3890,7 +3892,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3904,7 +3906,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3922,7 +3924,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3937,7 +3939,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -3955,7 +3957,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3968,7 +3970,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3983,7 +3985,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3999,7 +4001,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5789,6 +5791,12 @@ dependencies = [
  "syn 1.0.33",
 ]
 
+[[package]]
+name = "retain_mut"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e005d658ad26eacc2b6c506dfde519f4e277e328d0eb3379ca61647d70a8f531"
+
 [[package]]
 name = "ring"
 version = "0.16.15"
@@ -5929,7 +5937,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "bytes 0.5.5",
  "derive_more 0.99.9",
@@ -5956,7 +5964,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -5980,7 +5988,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -5997,7 +6005,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "impl-trait-for-tuples",
  "sc-chain-spec-derive",
@@ -6013,7 +6021,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -6024,7 +6032,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -6065,7 +6073,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "derive_more 0.99.9",
  "fnv",
@@ -6101,7 +6109,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -6130,7 +6138,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -6141,7 +6149,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "derive_more 0.99.9",
  "fork-tree",
@@ -6183,7 +6191,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -6207,7 +6215,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -6220,7 +6228,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -6243,7 +6251,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "log 0.4.8",
  "sc-client-api",
@@ -6257,7 +6265,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "derive_more 0.99.9",
  "lazy_static",
@@ -6285,7 +6293,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "derive_more 0.99.9",
  "log 0.4.8",
@@ -6302,7 +6310,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "log 0.4.8",
  "parity-scale-codec",
@@ -6317,7 +6325,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "cranelift-codegen",
  "cranelift-wasm",
@@ -6338,7 +6346,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "assert_matches",
  "derive_more 0.99.9",
@@ -6376,7 +6384,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "derive_more 0.99.9",
  "finality-grandpa",
@@ -6393,7 +6401,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.5",
@@ -6411,7 +6419,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "derive_more 0.99.9",
  "hex",
@@ -6427,7 +6435,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -6446,7 +6454,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "bitflags",
  "bs58",
@@ -6498,7 +6506,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -6513,7 +6521,7 @@ dependencies = [
 [[package]]
 name = "sc-network-test"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "env_logger",
  "futures 0.3.5",
@@ -6540,7 +6548,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "bytes 0.5.5",
  "fnv",
@@ -6567,7 +6575,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "futures 0.3.5",
  "libp2p",
@@ -6580,7 +6588,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "log 0.4.8",
  "substrate-prometheus-endpoint",
@@ -6589,7 +6597,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -6621,7 +6629,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -6645,7 +6653,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-http-server",
@@ -6661,7 +6669,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "derive_more 0.99.9",
  "directories",
@@ -6723,7 +6731,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "log 0.4.8",
  "parity-scale-codec",
@@ -6737,7 +6745,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -6758,7 +6766,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "erased-serde",
  "log 0.4.8",
@@ -6775,7 +6783,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -6783,6 +6791,7 @@ dependencies = [
  "log 0.4.8",
  "parity-util-mem",
  "parking_lot 0.10.2",
+ "retain_mut",
  "serde",
  "sp-blockchain",
  "sp-core",
@@ -6795,7 +6804,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -7221,7 +7230,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "derive_more 0.99.9",
  "log 0.4.8",
@@ -7233,7 +7242,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -7248,7 +7257,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -7260,7 +7269,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -7272,7 +7281,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.12",
@@ -7285,7 +7294,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7297,7 +7306,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -7308,7 +7317,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7320,7 +7329,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "derive_more 0.99.9",
  "log 0.4.8",
@@ -7337,7 +7346,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "serde",
  "serde_json",
@@ -7346,7 +7355,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -7371,7 +7380,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7385,7 +7394,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -7404,7 +7413,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -7413,7 +7422,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -7425,7 +7434,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -7468,7 +7477,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "kvdb",
  "parking_lot 0.10.2",
@@ -7477,7 +7486,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "proc-macro2 1.0.18",
  "quote 1.0.7",
@@ -7487,7 +7496,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -7498,7 +7507,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "finality-grandpa",
  "log 0.4.8",
@@ -7514,7 +7523,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-tracker"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -7524,7 +7533,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "derive_more 0.99.9",
  "parity-scale-codec",
@@ -7536,7 +7545,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -7557,7 +7566,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -7568,7 +7577,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -7580,7 +7589,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -7591,7 +7600,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -7601,7 +7610,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "backtrace",
  "log 0.4.8",
@@ -7610,7 +7619,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "serde",
  "sp-core",
@@ -7619,7 +7628,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -7641,7 +7650,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -7656,7 +7665,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -7668,7 +7677,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "serde",
  "serde_json",
@@ -7677,7 +7686,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7690,7 +7699,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -7700,7 +7709,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "hash-db",
  "itertools 0.9.0",
@@ -7721,12 +7730,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 
 [[package]]
 name = "sp-storage"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "impl-serde 0.2.3",
  "ref-cast",
@@ -7738,7 +7747,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7752,7 +7761,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "log 0.4.8",
  "rental",
@@ -7762,7 +7771,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -7772,13 +7781,12 @@ dependencies = [
  "sp-api",
  "sp-blockchain",
  "sp-runtime",
- "sp-utils",
 ]
 
 [[package]]
 name = "sp-trie"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -7792,7 +7800,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "futures 0.3.5",
  "futures-core",
@@ -7804,7 +7812,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "impl-serde 0.2.3",
  "parity-scale-codec",
@@ -7816,7 +7824,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7956,7 +7964,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "chrono",
  "clear_on_drop",
@@ -7983,7 +7991,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "platforms",
 ]
@@ -7991,7 +7999,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.5",
@@ -8014,7 +8022,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.8.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "async-std",
  "derive_more 0.99.9",
@@ -8028,7 +8036,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "futures 0.1.29",
  "futures 0.3.5",
@@ -8054,7 +8062,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "cfg-if",
  "frame-executive",
@@ -8094,7 +8102,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime-client"
 version = "2.0.0-rc4"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 dependencies = [
  "futures 0.3.5",
  "parity-scale-codec",
@@ -8115,7 +8123,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder-runner"
 version = "1.0.6"
-source = "git+https://github.com/paritytech/substrate#1be02953d4eb521ac1d40e55c71b44e2031ac105"
+source = "git+https://github.com/paritytech/substrate#6687fa111e5efaef6c91ec840dc7fb92d4a72820"
 
 [[package]]
 name = "substrate-wasm-builder-runner"
diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs
index 81c50e0ed4..c59c1e0f25 100644
--- a/polkadot/runtime/kusama/src/lib.rs
+++ b/polkadot/runtime/kusama/src/lib.rs
@@ -560,12 +560,7 @@ impl grandpa::Trait for Runtime {
 		GrandpaId,
 	)>>::IdentificationTuple;
 
-	type HandleEquivocation = grandpa::EquivocationHandler<
-		Self::KeyOwnerIdentification,
-		primitives::v0::fisherman::FishermanAppCrypto,
-		Runtime,
-		Offences,
-	>;
+	type HandleEquivocation = grandpa::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
 }
 
 parameter_types! {
@@ -653,7 +648,6 @@ impl<LocalCall> system::offchain::CreateSignedTransaction<LocalCall> for Runtime
 			transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),
 			registrar::LimitParathreadCommits::<Runtime>::new(),
 			parachains::ValidateDoubleVoteReports::<Runtime>::new(),
-			grandpa::ValidateEquivocationReport::<Runtime>::new(),
 		);
 		let raw_payload = SignedPayload::new(call, extra).map_err(|e| {
 			debug::warn!("Unable to create signed payload: {:?}", e);
@@ -963,7 +957,7 @@ construct_runtime! {
 		Historical: session_historical::{Module},
 		Session: session::{Module, Call, Storage, Event, Config<T>},
 		FinalityTracker: finality_tracker::{Module, Call, Storage, Inherent},
-		Grandpa: grandpa::{Module, Call, Storage, Config, Event},
+		Grandpa: grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned},
 		ImOnline: im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
 		AuthorityDiscovery: authority_discovery::{Module, Call, Config},
 
@@ -1032,7 +1026,6 @@ pub type SignedExtra = (
 	transaction_payment::ChargeTransactionPayment<Runtime>,
 	registrar::LimitParathreadCommits<Runtime>,
 	parachains::ValidateDoubleVoteReports<Runtime>,
-	grandpa::ValidateEquivocationReport<Runtime>,
 );
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;
@@ -1159,7 +1152,7 @@ sp_api::impl_runtime_apis! {
 			Grandpa::grandpa_authorities()
 		}
 
-		fn submit_report_equivocation_extrinsic(
+		fn submit_report_equivocation_unsigned_extrinsic(
 			equivocation_proof: fg_primitives::EquivocationProof<
 				<Block as BlockT>::Hash,
 				sp_runtime::traits::NumberFor<Block>,
@@ -1168,7 +1161,7 @@ sp_api::impl_runtime_apis! {
 		) -> Option<()> {
 			let key_owner_proof = key_owner_proof.decode()?;
 
-			Grandpa::submit_report_equivocation_extrinsic(
+			Grandpa::submit_unsigned_equivocation_report(
 				equivocation_proof,
 				key_owner_proof,
 			)
diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs
index 180e0b349c..177bf7e26e 100644
--- a/polkadot/runtime/polkadot/src/lib.rs
+++ b/polkadot/runtime/polkadot/src/lib.rs
@@ -626,12 +626,7 @@ impl grandpa::Trait for Runtime {
 
 	type KeyOwnerProofSystem = Historical;
 
-	type HandleEquivocation = grandpa::EquivocationHandler<
-		Self::KeyOwnerIdentification,
-		primitives::v0::fisherman::FishermanAppCrypto,
-		Runtime,
-		Offences,
-	>;
+	type HandleEquivocation = grandpa::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
 }
 
 parameter_types! {
@@ -720,7 +715,6 @@ impl<LocalCall> system::offchain::CreateSignedTransaction<LocalCall> for Runtime
 			transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),
 			registrar::LimitParathreadCommits::<Runtime>::new(),
 			parachains::ValidateDoubleVoteReports::<Runtime>::new(),
-			grandpa::ValidateEquivocationReport::<Runtime>::new(),
 			claims::PrevalidateAttests::<Runtime>::new(),
 		);
 		let raw_payload = SignedPayload::new(call, extra).map_err(|e| {
@@ -976,7 +970,7 @@ construct_runtime! {
 		Historical: session_historical::{Module},
 		Session: session::{Module, Call, Storage, Event, Config<T>},
 		FinalityTracker: finality_tracker::{Module, Call, Storage, Inherent},
-		Grandpa: grandpa::{Module, Call, Storage, Config, Event},
+		Grandpa: grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned},
 		ImOnline: im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
 		AuthorityDiscovery: authority_discovery::{Module, Call, Config},
 
@@ -1042,7 +1036,6 @@ pub type SignedExtra = (
 	transaction_payment::ChargeTransactionPayment<Runtime>,
 	registrar::LimitParathreadCommits<Runtime>,
 	parachains::ValidateDoubleVoteReports<Runtime>,
-	grandpa::ValidateEquivocationReport<Runtime>,
 	claims::PrevalidateAttests<Runtime>,
 );
 /// Unchecked extrinsic type as expected by this runtime.
@@ -1170,7 +1163,7 @@ sp_api::impl_runtime_apis! {
 			Grandpa::grandpa_authorities()
 		}
 
-		fn submit_report_equivocation_extrinsic(
+		fn submit_report_equivocation_unsigned_extrinsic(
 			equivocation_proof: fg_primitives::EquivocationProof<
 				<Block as BlockT>::Hash,
 				sp_runtime::traits::NumberFor<Block>,
@@ -1179,7 +1172,7 @@ sp_api::impl_runtime_apis! {
 		) -> Option<()> {
 			let key_owner_proof = key_owner_proof.decode()?;
 
-			Grandpa::submit_report_equivocation_extrinsic(
+			Grandpa::submit_unsigned_equivocation_report(
 				equivocation_proof,
 				key_owner_proof,
 			)
diff --git a/polkadot/runtime/test-runtime/src/lib.rs b/polkadot/runtime/test-runtime/src/lib.rs
index 45d5a04c31..032efaacfb 100644
--- a/polkadot/runtime/test-runtime/src/lib.rs
+++ b/polkadot/runtime/test-runtime/src/lib.rs
@@ -713,7 +713,7 @@ sp_api::impl_runtime_apis! {
 			Grandpa::grandpa_authorities()
 		}
 
-		fn submit_report_equivocation_extrinsic(
+		fn submit_report_equivocation_unsigned_extrinsic(
 			_equivocation_proof: fg_primitives::EquivocationProof<
 				<Block as BlockT>::Hash,
 				sp_runtime::traits::NumberFor<Block>,
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index a0eaa03fd6..6f2c2aa68e 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -384,12 +384,7 @@ impl grandpa::Trait for Runtime {
 		GrandpaId,
 	)>>::IdentificationTuple;
 
-	type HandleEquivocation = grandpa::EquivocationHandler<
-		Self::KeyOwnerIdentification,
-		primitives::v0::fisherman::FishermanAppCrypto,
-		Runtime,
-		Offences,
-	>;
+	type HandleEquivocation = grandpa::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
 }
 
 parameter_types! {
@@ -477,7 +472,6 @@ impl<LocalCall> system::offchain::CreateSignedTransaction<LocalCall> for Runtime
 			transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),
 			registrar::LimitParathreadCommits::<Runtime>::new(),
 			parachains::ValidateDoubleVoteReports::<Runtime>::new(),
-			grandpa::ValidateEquivocationReport::<Runtime>::new(),
 		);
 		let raw_payload = SignedPayload::new(call, extra).map_err(|e| {
 			debug::warn!("Unable to create signed payload: {:?}", e);
@@ -721,7 +715,7 @@ construct_runtime! {
 		Historical: session_historical::{Module},
 		Session: session::{Module, Call, Storage, Event, Config<T>},
 		FinalityTracker: finality_tracker::{Module, Call, Storage, Inherent},
-		Grandpa: grandpa::{Module, Call, Storage, Config, Event},
+		Grandpa: grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned},
 		ImOnline: im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
 		AuthorityDiscovery: authority_discovery::{Module, Call, Config},
 
@@ -778,7 +772,6 @@ pub type SignedExtra = (
 	transaction_payment::ChargeTransactionPayment<Runtime>,
 	registrar::LimitParathreadCommits<Runtime>,
 	parachains::ValidateDoubleVoteReports<Runtime>,
-	grandpa::ValidateEquivocationReport<Runtime>,
 );
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;
@@ -898,7 +891,7 @@ sp_api::impl_runtime_apis! {
 			Grandpa::grandpa_authorities()
 		}
 
-		fn submit_report_equivocation_extrinsic(
+		fn submit_report_equivocation_unsigned_extrinsic(
 			equivocation_proof: fg_primitives::EquivocationProof<
 				<Block as BlockT>::Hash,
 				sp_runtime::traits::NumberFor<Block>,
@@ -907,7 +900,7 @@ sp_api::impl_runtime_apis! {
 		) -> Option<()> {
 			let key_owner_proof = key_owner_proof.decode()?;
 
-			Grandpa::submit_report_equivocation_extrinsic(
+			Grandpa::submit_unsigned_equivocation_report(
 				equivocation_proof,
 				key_owner_proof,
 			)