diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index 3a3d01c62d..01f104c583 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -1489,7 +1489,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1507,7 +1507,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1525,7 +1525,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "Inflector",
  "chrono",
@@ -1548,7 +1548,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1564,7 +1564,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "12.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1575,7 +1575,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -1600,7 +1600,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-support-procedural-tools",
  "proc-macro2 1.0.24",
@@ -1611,7 +1611,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1623,7 +1623,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
@@ -1633,7 +1633,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples 0.1.3",
@@ -1649,7 +1649,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1663,7 +1663,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -3895,7 +3895,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b"
 [[package]]
 name = "pallet-authority-discovery"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3911,7 +3911,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3926,7 +3926,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3951,7 +3951,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3965,7 +3965,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3980,7 +3980,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3996,7 +3996,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4011,7 +4011,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4026,7 +4026,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4047,7 +4047,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4063,7 +4063,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4083,7 +4083,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4100,7 +4100,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4114,7 +4114,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4130,7 +4130,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4144,7 +4144,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4159,7 +4159,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4180,7 +4180,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4196,7 +4196,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4209,7 +4209,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4224,7 +4224,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4239,7 +4239,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4259,7 +4259,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4275,7 +4275,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4289,7 +4289,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4311,7 +4311,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -4322,7 +4322,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4336,7 +4336,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4354,7 +4354,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4369,7 +4369,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4386,7 +4386,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4404,7 +4404,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -4417,7 +4417,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4433,7 +4433,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4449,7 +4449,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -6723,7 +6723,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -6751,7 +6751,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "futures 0.3.8",
  "futures-timer 3.0.2",
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -6791,7 +6791,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "impl-trait-for-tuples 0.1.3",
  "parity-scale-codec",
@@ -6812,7 +6812,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -6823,7 +6823,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "atty",
  "chrono",
@@ -6866,7 +6866,7 @@ dependencies = [
 [[package]]
 name = "sc-cli-proc-macro"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -6877,7 +6877,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "derive_more",
  "fnv",
@@ -6911,7 +6911,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -6941,7 +6941,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -6952,7 +6952,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "derive_more",
  "fork-tree",
@@ -6997,7 +6997,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "derive_more",
  "futures 0.3.8",
@@ -7021,7 +7021,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -7034,7 +7034,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "futures 0.3.8",
  "futures-timer 3.0.2",
@@ -7060,7 +7060,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "log",
  "sc-client-api",
@@ -7074,7 +7074,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "derive_more",
  "lazy_static",
@@ -7103,7 +7103,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
@@ -7119,7 +7119,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7134,7 +7134,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7152,7 +7152,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7189,7 +7189,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7213,7 +7213,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.8",
@@ -7231,7 +7231,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7251,7 +7251,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -7270,7 +7270,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "async-std",
  "async-trait",
@@ -7324,7 +7324,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "futures 0.3.8",
  "futures-timer 3.0.2",
@@ -7339,7 +7339,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -7366,7 +7366,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "futures 0.3.8",
  "libp2p",
@@ -7379,7 +7379,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -7388,7 +7388,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "futures 0.3.8",
  "hash-db",
@@ -7422,7 +7422,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "derive_more",
  "futures 0.3.8",
@@ -7446,7 +7446,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "futures 0.1.29",
  "jsonrpc-core",
@@ -7464,7 +7464,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "directories 3.0.1",
  "exit-future",
@@ -7528,7 +7528,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7543,7 +7543,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -7563,7 +7563,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "futures 0.3.8",
  "futures-timer 3.0.2",
@@ -7584,7 +7584,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "ansi_term 0.12.1",
  "erased-serde",
@@ -7608,7 +7608,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "derive_more",
  "futures 0.3.8",
@@ -7630,7 +7630,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "futures 0.3.8",
  "futures-diagnose",
@@ -8096,7 +8096,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "log",
  "sp-core",
@@ -8108,7 +8108,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -8124,7 +8124,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -8136,7 +8136,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8148,7 +8148,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.12",
@@ -8161,7 +8161,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8173,7 +8173,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -8184,7 +8184,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8196,7 +8196,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "futures 0.3.8",
  "log",
@@ -8214,7 +8214,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "serde",
  "serde_json",
@@ -8223,7 +8223,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "futures 0.3.8",
  "futures-timer 3.0.2",
@@ -8249,7 +8249,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -8269,7 +8269,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8278,7 +8278,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -8290,7 +8290,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -8334,7 +8334,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "kvdb",
  "parking_lot 0.10.2",
@@ -8343,7 +8343,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
@@ -8353,7 +8353,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8364,7 +8364,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8381,7 +8381,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.10.2",
@@ -8393,7 +8393,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "futures 0.3.8",
  "hash-db",
@@ -8417,7 +8417,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -8428,7 +8428,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8445,7 +8445,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8457,7 +8457,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -8468,7 +8468,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -8478,7 +8478,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "backtrace",
 ]
@@ -8486,7 +8486,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "serde",
  "sp-core",
@@ -8495,7 +8495,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -8516,7 +8516,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "impl-trait-for-tuples 0.1.3",
  "parity-scale-codec",
@@ -8533,7 +8533,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -8545,7 +8545,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "serde",
  "serde_json",
@@ -8554,7 +8554,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8567,7 +8567,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8577,7 +8577,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "hash-db",
  "log",
@@ -8599,12 +8599,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 
 [[package]]
 name = "sp-storage"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8617,7 +8617,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "log",
  "sp-core",
@@ -8630,7 +8630,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "impl-trait-for-tuples 0.1.3",
  "parity-scale-codec",
@@ -8644,7 +8644,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8657,7 +8657,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "derive_more",
  "futures 0.3.8",
@@ -8673,7 +8673,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -8687,7 +8687,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "futures 0.3.8",
  "futures-core",
@@ -8699,7 +8699,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8711,7 +8711,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "impl-trait-for-tuples 0.1.3",
  "parity-scale-codec",
@@ -8853,7 +8853,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -8879,7 +8879,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "platforms",
 ]
@@ -8887,7 +8887,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.8",
@@ -8910,7 +8910,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "async-std",
  "derive_more",
@@ -8924,7 +8924,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "futures 0.1.29",
  "futures 0.3.8",
@@ -8951,7 +8951,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "futures 0.3.8",
  "substrate-test-utils-derive",
@@ -8961,7 +8961,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#6abbbd639d07f041255fb326491fea27ece8a490"
+source = "git+https://github.com/paritytech/substrate#67c8cadb33313ef317a4266edb334b7fc594629c"
 dependencies = [
  "proc-macro-crate",
  "quote 1.0.7",
diff --git a/polkadot/runtime/common/src/claims.rs b/polkadot/runtime/common/src/claims.rs
index 1d6f02bfe0..8aebbb2531 100644
--- a/polkadot/runtime/common/src/claims.rs
+++ b/polkadot/runtime/common/src/claims.rs
@@ -20,7 +20,9 @@ use sp_std::{prelude::*, fmt::Debug};
 use sp_io::{hashing::keccak_256, crypto::secp256k1_ecdsa_recover};
 use frame_support::{
 	decl_event, decl_storage, decl_module, decl_error, ensure,
-	traits::{Currency, Get, VestingSchedule, EnsureOrigin, IsSubType}, weights::{Pays, DispatchClass}
+	traits::{Currency, Get, VestingSchedule, EnsureOrigin, IsSubType},
+	weights::{Weight, Pays, DispatchClass},
+	pallet_prelude::DispatchResultWithPostInfo,
 };
 use frame_system::{ensure_signed, ensure_root, ensure_none};
 use parity_scale_codec::{Encode, Decode};
@@ -47,6 +49,24 @@ pub trait Config: frame_system::Config {
 	type VestingSchedule: VestingSchedule<Self::AccountId, Moment=Self::BlockNumber>;
 	type Prefix: Get<&'static [u8]>;
 	type MoveClaimOrigin: EnsureOrigin<Self::Origin>;
+	type WeightInfo: WeightInfo;
+}
+
+pub trait WeightInfo {
+	fn claim() -> Weight;
+	fn mint_claim() -> Weight;
+	fn claim_attest() -> Weight;
+	fn attest() -> Weight;
+	fn move_claim() -> Weight;
+}
+
+pub struct TestWeightInfo;
+impl WeightInfo for TestWeightInfo {
+	fn claim() -> Weight { 0 }
+	fn mint_claim() -> Weight { 0 }
+	fn claim_attest() -> Weight { 0 }
+	fn attest() -> Weight { 0 }
+	fn move_claim() -> Weight { 0 }
 }
 
 /// The kind of a statement an account needs to make for a claim to be valid.
@@ -223,25 +243,11 @@ decl_module! {
 		///
 		/// <weight>
 		/// The weight of this call is invariant over the input parameters.
-		/// - One `eth_recover` operation which involves a keccak hash and a
-		///   ecdsa recover.
-		/// - Three storage reads to check if a claim exists for the user, to
-		///   get the current pot size, to see if there exists a vesting schedule.
-		/// - Up to one storage write for adding a new vesting schedule.
-		/// - One `deposit_creating` Currency call.
-		/// - One storage write to update the total.
-		/// - Two storage removals for vesting and claims information.
-		/// - One deposit event.
+		/// Weight includes logic to validate unsigned `claim` call.
 		///
 		/// Total Complexity: O(1)
-		/// ----------------------------
-		/// Base Weight: 269.7 µs
-		/// DB Weight:
-		/// - Read: Signing, Claims, Total, Claims Vesting, Vesting Vesting, Balance Lock, Account
-		/// - Write: Vesting Vesting, Account, Balance Lock, Total, Claim, Claims Vesting, Signing
-		/// Validate Unsigned: +188.7 µs
 		/// </weight>
-		#[weight = T::DbWeight::get().reads_writes(7, 7) + 270_000_000 + 190_000_000]
+		#[weight = T::WeightInfo::claim()]
 		fn claim(origin, dest: T::AccountId, ethereum_signature: EcdsaSignature) {
 			ensure_none(origin)?;
 
@@ -264,24 +270,11 @@ decl_module! {
 		///
 		/// <weight>
 		/// The weight of this call is invariant over the input parameters.
-		/// - One storage mutate to increase the total claims available.
-		/// - One storage write to add a new claim.
-		/// - Up to one storage write to add a new vesting schedule.
+		/// We assume worst case that both vesting and statement is being inserted.
 		///
 		/// Total Complexity: O(1)
-		/// ---------------------
-		/// Base Weight: 10.46 µs
-		/// DB Weight:
-		/// - Reads: Total
-		/// - Writes: Total, Claims
-		/// - Maybe Write: Vesting, Statement
 		/// </weight>
-		#[weight =
-			T::DbWeight::get().reads_writes(1, 2)
-			+ T::DbWeight::get().writes(vesting_schedule.is_some().into())
-			+ T::DbWeight::get().writes(statement.is_some().into())
-			+ 10_000_000
-		]
+		#[weight = T::WeightInfo::mint_claim()]
 		fn mint_claim(origin,
 			who: EthereumAddress,
 			value: BalanceOf<T>,
@@ -322,26 +315,11 @@ decl_module! {
 		///
 		/// <weight>
 		/// The weight of this call is invariant over the input parameters.
-		/// - One `eth_recover` operation which involves a keccak hash and a
-		///   ecdsa recover.
-		/// - Four storage reads to check if a claim exists for the user, to
-		///   get the current pot size, to see if there exists a vesting schedule, to get the
-		///   required statement.
-		/// - Up to one storage write for adding a new vesting schedule.
-		/// - One `deposit_creating` Currency call.
-		/// - One storage write to update the total.
-		/// - Two storage removals for vesting and claims information.
-		/// - One deposit event.
+		/// Weight includes logic to validate unsigned `claim_attest` call.
 		///
 		/// Total Complexity: O(1)
-		/// ----------------------------
-		/// Base Weight: 270.2 µs
-		/// DB Weight:
-		/// - Read: Signing, Claims, Total, Claims Vesting, Vesting Vesting, Balance Lock, Account
-		/// - Write: Vesting Vesting, Account, Balance Lock, Total, Claim, Claims Vesting, Signing
-		/// Validate Unsigned: +190.1 µs
 		/// </weight>
-		#[weight = T::DbWeight::get().reads_writes(7, 7) + 270_000_000 + 190_000_000]
+		#[weight = T::WeightInfo::claim_attest()]
 		fn claim_attest(origin,
 			dest: T::AccountId,
 			ethereum_signature: EcdsaSignature,
@@ -370,16 +348,13 @@ decl_module! {
 		/// - `statement`: The identity of the statement which is being attested to in the signature.
 		///
 		/// <weight>
+		/// The weight of this call is invariant over the input parameters.
+		/// Weight includes logic to do pre-validation on `attest` call.
+		///
 		/// Total Complexity: O(1)
-		/// ----------------------------
-		/// Base Weight: 93.3 µs
-		/// DB Weight:
-		/// - Read: Preclaims, Signing, Claims, Total, Claims Vesting, Vesting Vesting, Balance Lock, Account
-		/// - Write: Vesting Vesting, Account, Balance Lock, Total, Claim, Claims Vesting, Signing, Preclaims
-		/// Validate PreValidateAttests: +8.631 µs
 		/// </weight>
 		#[weight = (
-			T::DbWeight::get().reads_writes(8, 8) + 90_000_000 + 10_000_000,
+			T::WeightInfo::attest(),
 			DispatchClass::Normal,
 			Pays::No
 		)]
@@ -393,16 +368,12 @@ decl_module! {
 			Preclaims::<T>::remove(&who);
 		}
 
-		#[weight = (
-			T::DbWeight::get().reads_writes(4, 4) + 100_000_000_000,
-			DispatchClass::Normal,
-			Pays::No
-		)]
+		#[weight = T::WeightInfo::move_claim()]
 		fn move_claim(origin,
 			old: EthereumAddress,
 			new: EthereumAddress,
 			maybe_preclaim: Option<T::AccountId>,
-		) {
+		) -> DispatchResultWithPostInfo {
 			T::MoveClaimOrigin::try_origin(origin).map(|_| ()).or_else(ensure_root)?;
 
 			Claims::<T>::take(&old).map(|c| Claims::<T>::insert(&new, c));
@@ -411,6 +382,7 @@ decl_module! {
 			maybe_preclaim.map(|preclaim| Preclaims::<T>::mutate(&preclaim, |maybe_o|
 				if maybe_o.as_ref().map_or(false, |o| o == &old) { *maybe_o = Some(new) }
 			));
+			Ok(Pays::No.into())
 		}
 	}
 }
@@ -495,16 +467,14 @@ impl<T: Config> sp_runtime::traits::ValidateUnsigned for Module<T> {
 
 		let (maybe_signer, maybe_statement) = match call {
 			// <weight>
-			// Base Weight: 188.7 µs (includes the full logic of `validate_unsigned`)
-			// DB Weight: 2 Read (Claims, Signing)
+			// The weight of this logic is included in the `claim` dispatchable.
 			// </weight>
 			Call::claim(account, ethereum_signature) => {
 				let data = account.using_encoded(to_ascii_hex);
 				(Self::eth_recover(&ethereum_signature, &data, &[][..]), None)
 			}
 			// <weight>
-			// Base Weight: 190.1 µs (includes the full logic of `validate_unsigned`)
-			// DB Weight: 2 Read (Claims, Signing)
+			// The weight of this logic is included in the `claim_attest` dispatchable.
 			// </weight>
 			Call::claim_attest(account, ethereum_signature, statement) => {
 				let data = account.using_encoded(to_ascii_hex);
@@ -578,8 +548,7 @@ impl<T: Config + Send + Sync> SignedExtension for PrevalidateAttests<T> where
 	}
 
 	// <weight>
-	// Base Weight: 8.631 µs
-	// DB Weight: 2 Read (Preclaims, Signing)
+	// The weight of this logic is included in the `attest` dispatchable.
 	// </weight>
 	fn validate(
 		&self,
@@ -724,6 +693,7 @@ mod tests {
 		type VestingSchedule = Vesting;
 		type Prefix = Prefix;
 		type MoveClaimOrigin = frame_system::EnsureSignedBy<Six, u64>;
+		type WeightInfo = TestWeightInfo;
 	}
 	type System = frame_system::Module<Test>;
 	type Balances = pallet_balances::Module<Test>;
@@ -1197,33 +1167,44 @@ mod benchmarking {
 	}
 
 	benchmarks! {
-		_ {
-			// Create claims in storage. Two are created at a time!
-			let c in 0 .. MAX_CLAIMS / 2 => {
+		_ { }
+
+		// Benchmark `claim` including `validate_unsigned` logic.
+		claim {
+			let c = MAX_CLAIMS;
+
+			for i in 0 .. c / 2 {
 				create_claim::<T>(c)?;
 				create_claim_attest::<T>(u32::max_value() - c)?;
-			};
-		}
+			}
 
-		// Benchmark `claim` for different users.
-		claim {
-			let u in 0 .. 1000;
-			let secret_key = secp256k1::SecretKey::parse(&keccak_256(&u.encode())).unwrap();
+			let secret_key = secp256k1::SecretKey::parse(&keccak_256(&c.encode())).unwrap();
 			let eth_address = eth(&secret_key);
-			let account: T::AccountId = account("user", u, SEED);
+			let account: T::AccountId = account("user", c, SEED);
 			let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into()));
 			let signature = sig::<T>(&secret_key, &account.encode(), &[][..]);
 			super::Module::<T>::mint_claim(RawOrigin::Root.into(), eth_address, VALUE.into(), vesting, None)?;
 			assert_eq!(Claims::<T>::get(eth_address), Some(VALUE.into()));
-		}: _(RawOrigin::None, account, signature)
+			let source = sp_runtime::transaction_validity::TransactionSource::External;
+			let call = Call::<T>::claim(account.clone(), signature.clone());
+		}: {
+			super::Module::<T>::validate_unsigned(source, &call)?;
+			super::Module::<T>::claim(RawOrigin::None.into(), account, signature)?;
+		}
 		verify {
 			assert_eq!(Claims::<T>::get(eth_address), None);
 		}
 
 		// Benchmark `mint_claim` when there already exists `c` claims in storage.
 		mint_claim {
-			let c in ...;
-			let eth_address = account("eth_address", c, SEED);
+			let c = MAX_CLAIMS;
+
+			for i in 0 .. c / 2 {
+				create_claim::<T>(c)?;
+				create_claim_attest::<T>(u32::max_value() - c)?;
+			}
+
+			let eth_address = account("eth_address", 0, SEED);
 			let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into()));
 			let statement = StatementKind::Regular;
 		}: _(RawOrigin::Root, eth_address, VALUE.into(), vesting, Some(statement))
@@ -1231,75 +1212,55 @@ mod benchmarking {
 			assert_eq!(Claims::<T>::get(eth_address), Some(VALUE.into()));
 		}
 
-		// Benchmark `claim_attest` for different users.
+		// Benchmark `claim_attest` including `validate_unsigned` logic.
 		claim_attest {
-			let u in 0 .. 1000;
-			let attest_u = u32::max_value() - u;
-			let secret_key = secp256k1::SecretKey::parse(&keccak_256(&attest_u.encode())).unwrap();
+			let c = MAX_CLAIMS;
+
+			for i in 0 .. c / 2 {
+				create_claim::<T>(c)?;
+				create_claim_attest::<T>(u32::max_value() - c)?;
+			}
+
+			// Crate signature
+			let attest_c = u32::max_value() - c;
+			let secret_key = secp256k1::SecretKey::parse(&keccak_256(&attest_c.encode())).unwrap();
 			let eth_address = eth(&secret_key);
-			let account: T::AccountId = account("user", u, SEED);
+			let account: T::AccountId = account("user", c, SEED);
 			let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into()));
 			let statement = StatementKind::Regular;
 			let signature = sig::<T>(&secret_key, &account.encode(), statement.to_text());
 			super::Module::<T>::mint_claim(RawOrigin::Root.into(), eth_address, VALUE.into(), vesting, Some(statement))?;
 			assert_eq!(Claims::<T>::get(eth_address), Some(VALUE.into()));
-		}: _(RawOrigin::None, account, signature, statement.to_text().to_vec())
+			let call = Call::<T>::claim_attest(account.clone(), signature.clone(), StatementKind::Regular.to_text().to_vec());
+			let source = sp_runtime::transaction_validity::TransactionSource::External;
+		}: {
+			super::Module::<T>::validate_unsigned(source, &call)?;
+			super::Module::<T>::claim_attest(RawOrigin::None.into(), account, signature, statement.to_text().to_vec())?;
+		}
 		verify {
 			assert_eq!(Claims::<T>::get(eth_address), None);
 		}
 
-		// Benchmark `attest` for different users.
+		// Benchmark `attest` including prevalidate logic.
 		attest {
-			let u in 0 .. 1000;
-			let attest_u = u32::max_value() - u;
-			let secret_key = secp256k1::SecretKey::parse(&keccak_256(&attest_u.encode())).unwrap();
+			let c = MAX_CLAIMS;
+
+			for i in 0 .. c / 2 {
+				create_claim::<T>(c)?;
+				create_claim_attest::<T>(u32::max_value() - c)?;
+			}
+
+			let attest_c = u32::max_value() - c;
+			let secret_key = secp256k1::SecretKey::parse(&keccak_256(&attest_c.encode())).unwrap();
 			let eth_address = eth(&secret_key);
-			let account: T::AccountId = account("user", u, SEED);
+			let account: T::AccountId = account("user", c, SEED);
 			let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into()));
 			let statement = StatementKind::Regular;
 			let signature = sig::<T>(&secret_key, &account.encode(), statement.to_text());
 			super::Module::<T>::mint_claim(RawOrigin::Root.into(), eth_address, VALUE.into(), vesting, Some(statement))?;
 			Preclaims::<T>::insert(&account, eth_address);
 			assert_eq!(Claims::<T>::get(eth_address), Some(VALUE.into()));
-		}: _(RawOrigin::Signed(account), statement.to_text().to_vec())
-		verify {
-			assert_eq!(Claims::<T>::get(eth_address), None);
-		}
 
-		// Benchmark the time it takes to execute `validate_unsigned` for `claim`
-		validate_unsigned_claim {
-			let c in ...;
-			// Crate signature
-			let secret_key = secp256k1::SecretKey::parse(&keccak_256(&c.encode())).unwrap();
-			let account: T::AccountId = account("user", c, SEED);
-			let signature = sig::<T>(&secret_key, &account.encode(), &[][..]);
-			let call = Call::<T>::claim(account, signature);
-			let source = sp_runtime::transaction_validity::TransactionSource::External;
-		}: {
-			super::Module::<T>::validate_unsigned(source, &call)?
-		}
-
-		// Benchmark the time it takes to execute `validate_unsigned` for `claim_attest`
-		validate_unsigned_claim_attest {
-			let c in ...;
-			// Crate signature
-			let attest_c = u32::max_value() - c;
-			let secret_key = secp256k1::SecretKey::parse(&keccak_256(&attest_c.encode())).unwrap();
-			let account: T::AccountId = account("user", c, SEED);
-			let signature = sig::<T>(&secret_key, &account.encode(), StatementKind::Regular.to_text());
-			let call = Call::<T>::claim_attest(account, signature, StatementKind::Regular.to_text().to_vec());
-			let source = sp_runtime::transaction_validity::TransactionSource::External;
-		}: {
-			super::Module::<T>::validate_unsigned(source, &call)?
-		}
-
-		validate_prevalidate_attests {
-			let c in ...;
-			let attest_c = u32::max_value() - c;
-			let secret_key = secp256k1::SecretKey::parse(&keccak_256(&attest_c.encode())).unwrap();
-			let eth_address = eth(&secret_key);
-			let account: T::AccountId = account("user", c, SEED);
-			Preclaims::<T>::insert(&account, eth_address);
 			let call = super::Call::attest(StatementKind::Regular.to_text().to_vec());
 			// We have to copy the validate statement here because of trait issues... :(
 			let validate = |who: &T::AccountId, call: &super::Call<T>| -> DispatchResult {
@@ -1312,10 +1273,41 @@ mod benchmarking {
 				Ok(())
 			};
 		}: {
-			validate(&account, &call)?
+			validate(&account, &call)?;
+			super::Module::<T>::attest(RawOrigin::Signed(account).into(), statement.to_text().to_vec())?;
+		}
+		verify {
+			assert_eq!(Claims::<T>::get(eth_address), None);
+		}
+
+		move_claim {
+			let c = MAX_CLAIMS;
+
+			for i in 0 .. c / 2 {
+				create_claim::<T>(c)?;
+				create_claim_attest::<T>(u32::max_value() - c)?;
+			}
+
+			let attest_c = u32::max_value() - c;
+			let secret_key = secp256k1::SecretKey::parse(&keccak_256(&attest_c.encode())).unwrap();
+			let eth_address = eth(&secret_key);
+
+			let new_secret_key = secp256k1::SecretKey::parse(&keccak_256(&(u32::max_value()/2).encode())).unwrap();
+			let new_eth_address = eth(&new_secret_key);
+
+			let account: T::AccountId = account("user", c, SEED);
+			Preclaims::<T>::insert(&account, eth_address);
+
+			assert!(Claims::<T>::contains_key(eth_address));
+			assert!(!Claims::<T>::contains_key(new_eth_address));
+		}: _(RawOrigin::Root, eth_address, new_eth_address, Some(account))
+		verify {
+			assert!(!Claims::<T>::contains_key(eth_address));
+			assert!(Claims::<T>::contains_key(new_eth_address));
 		}
 
 		// Benchmark the time it takes to do `repeat` number of keccak256 hashes
+		#[extra]
 		keccak256 {
 			let i in 0 .. 10_000;
 			let bytes = (i).encode();
@@ -1326,6 +1318,7 @@ mod benchmarking {
 		}
 
 		// Benchmark the time it takes to do `repeat` number of `eth_recover`
+		#[extra]
 		eth_recover {
 			let i in 0 .. 1_000;
 			// Crate signature
@@ -1354,9 +1347,7 @@ mod benchmarking {
 				assert_ok!(test_benchmark_mint_claim::<Test>());
 				assert_ok!(test_benchmark_claim_attest::<Test>());
 				assert_ok!(test_benchmark_attest::<Test>());
-				assert_ok!(test_benchmark_validate_unsigned_claim::<Test>());
-				assert_ok!(test_benchmark_validate_unsigned_claim_attest::<Test>());
-				assert_ok!(test_benchmark_validate_prevalidate_attests::<Test>());
+				assert_ok!(test_benchmark_move_claim::<Test>());
 				assert_ok!(test_benchmark_keccak256::<Test>());
 				assert_ok!(test_benchmark_eth_recover::<Test>());
 			});
diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs
index 937da9dc90..0fd0bdc8aa 100644
--- a/polkadot/runtime/kusama/src/lib.rs
+++ b/polkadot/runtime/kusama/src/lib.rs
@@ -709,6 +709,7 @@ impl claims::Config for Runtime {
 	type VestingSchedule = Vesting;
 	type Prefix = Prefix;
 	type MoveClaimOrigin = pallet_collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>;
+	type WeightInfo = weights::runtime_common_claims::WeightInfo<Runtime>;
 }
 
 parameter_types! {
@@ -1331,7 +1332,7 @@ sp_api::impl_runtime_apis! {
 			let mut batches = Vec::<BenchmarkBatch>::new();
 			let params = (&config, &whitelist);
 			// Polkadot
-			add_benchmark!(params, batches, claims, Claims);
+			add_benchmark!(params, batches, runtime_common::claims, Claims);
 			// Substrate
 			add_benchmark!(params, batches, pallet_balances, Balances);
 			add_benchmark!(params, batches, pallet_bounties, Bounties);
diff --git a/polkadot/runtime/kusama/src/weights/mod.rs b/polkadot/runtime/kusama/src/weights/mod.rs
index f8c7cb230b..177e167173 100644
--- a/polkadot/runtime/kusama/src/weights/mod.rs
+++ b/polkadot/runtime/kusama/src/weights/mod.rs
@@ -34,3 +34,4 @@ pub mod pallet_tips;
 pub mod pallet_treasury;
 pub mod pallet_utility;
 pub mod pallet_vesting;
+pub mod runtime_common_claims;
diff --git a/polkadot/runtime/kusama/src/weights/runtime_common_claims.rs b/polkadot/runtime/kusama/src/weights/runtime_common_claims.rs
new file mode 100644
index 0000000000..16f1bd7eeb
--- /dev/null
+++ b/polkadot/runtime/kusama/src/weights/runtime_common_claims.rs
@@ -0,0 +1,71 @@
+// Copyright 2017-2020 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+//! Autogenerated weights for runtime_common::claims
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-12-30, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/polkadot
+// benchmark
+// --chain=kusama-dev
+// --steps=50
+// --repeat=20
+// --pallet=runtime_common::claims
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --header=./file_header.txt
+// --output=./runtime/kusama/src/weights/runtime_common_claims.rs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::Weight};
+use sp_std::marker::PhantomData;
+
+/// Weight functions for runtime_common::claims.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> runtime_common::claims::WeightInfo for WeightInfo<T> {
+	fn claim() -> Weight {
+		(466_963_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+			.saturating_add(T::DbWeight::get().writes(7 as Weight))
+	}
+	fn mint_claim() -> Weight {
+		(19_167_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+	}
+	fn claim_attest() -> Weight {
+		(471_682_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+			.saturating_add(T::DbWeight::get().writes(7 as Weight))
+	}
+	fn attest() -> Weight {
+		(156_820_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(8 as Weight))
+			.saturating_add(T::DbWeight::get().writes(8 as Weight))
+	}
+	fn move_claim() -> Weight {
+		(39_992_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(7 as Weight))
+	}
+}
diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs
index c08d14ff8b..8027abd546 100644
--- a/polkadot/runtime/polkadot/src/lib.rs
+++ b/polkadot/runtime/polkadot/src/lib.rs
@@ -761,6 +761,7 @@ impl claims::Config for Runtime {
 	type Prefix = Prefix;
 	/// At least 3/4 of the council must agree to a claim move before it can happen.
 	type MoveClaimOrigin = pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, CouncilCollective>;
+	type WeightInfo = weights::runtime_common_claims::WeightInfo<Runtime>;
 }
 
 parameter_types! {
@@ -1327,7 +1328,7 @@ sp_api::impl_runtime_apis! {
 			let mut batches = Vec::<BenchmarkBatch>::new();
 			let params = (&config, &whitelist);
 			// Polkadot
-			add_benchmark!(params, batches, claims, Claims);
+			add_benchmark!(params, batches, runtime_common::claims, Claims);
 			// Substrate
 			add_benchmark!(params, batches, pallet_balances, Balances);
 			add_benchmark!(params, batches, pallet_bounties, Bounties);
diff --git a/polkadot/runtime/polkadot/src/weights/mod.rs b/polkadot/runtime/polkadot/src/weights/mod.rs
index 0411000b1c..cb9ea434b7 100644
--- a/polkadot/runtime/polkadot/src/weights/mod.rs
+++ b/polkadot/runtime/polkadot/src/weights/mod.rs
@@ -34,3 +34,4 @@ pub mod pallet_utility;
 pub mod pallet_vesting;
 pub mod pallet_bounties;
 pub mod pallet_tips;
+pub mod runtime_common_claims;
diff --git a/polkadot/runtime/polkadot/src/weights/runtime_common_claims.rs b/polkadot/runtime/polkadot/src/weights/runtime_common_claims.rs
new file mode 100644
index 0000000000..da6996bb2b
--- /dev/null
+++ b/polkadot/runtime/polkadot/src/weights/runtime_common_claims.rs
@@ -0,0 +1,71 @@
+// Copyright 2017-2020 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+//! Autogenerated weights for runtime_common::claims
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-12-30, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/polkadot
+// benchmark
+// --chain=polkadot-dev
+// --steps=50
+// --repeat=20
+// --pallet=runtime_common::claims
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --header=./file_header.txt
+// --output=./runtime/polkadot/src/weights/runtime_common_claims.rs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::Weight};
+use sp_std::marker::PhantomData;
+
+/// Weight functions for runtime_common::claims.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> runtime_common::claims::WeightInfo for WeightInfo<T> {
+	fn claim() -> Weight {
+		(466_905_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+			.saturating_add(T::DbWeight::get().writes(7 as Weight))
+	}
+	fn mint_claim() -> Weight {
+		(19_003_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+	}
+	fn claim_attest() -> Weight {
+		(471_915_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+			.saturating_add(T::DbWeight::get().writes(7 as Weight))
+	}
+	fn attest() -> Weight {
+		(156_649_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(8 as Weight))
+			.saturating_add(T::DbWeight::get().writes(8 as Weight))
+	}
+	fn move_claim() -> Weight {
+		(39_612_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(7 as Weight))
+	}
+}
diff --git a/polkadot/runtime/test-runtime/src/lib.rs b/polkadot/runtime/test-runtime/src/lib.rs
index d9c367c5d8..fadac2343b 100644
--- a/polkadot/runtime/test-runtime/src/lib.rs
+++ b/polkadot/runtime/test-runtime/src/lib.rs
@@ -424,6 +424,7 @@ impl claims::Config for Runtime {
 	type VestingSchedule = Vesting;
 	type Prefix = Prefix;
 	type MoveClaimOrigin = frame_system::EnsureRoot<AccountId>;
+	type WeightInfo = claims::TestWeightInfo;
 }
 
 parameter_types! {