diff --git a/Cargo.lock b/Cargo.lock
index 65138d5778bf..ce187e142584 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1428,16 +1428,16 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "fork-tree"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "parity-scale-codec",
 ]
 
 [[package]]
 name = "frame-benchmarking"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1454,8 +1454,8 @@ dependencies = [
 
 [[package]]
 name = "frame-benchmarking-cli"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-benchmarking",
  "parity-scale-codec",
@@ -1472,8 +1472,8 @@ dependencies = [
 
 [[package]]
 name = "frame-executive"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1488,8 +1488,8 @@ dependencies = [
 
 [[package]]
 name = "frame-metadata"
-version = "11.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "12.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1499,8 +1499,8 @@ dependencies = [
 
 [[package]]
 name = "frame-support"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "bitmask",
  "frame-metadata",
@@ -1524,8 +1524,8 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support-procedural-tools",
  "proc-macro2 1.0.18",
@@ -1535,8 +1535,8 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural-tools"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1547,8 +1547,8 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural-tools-derive"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "proc-macro2 1.0.18",
  "quote 1.0.7",
@@ -1557,8 +1557,8 @@ dependencies = [
 
 [[package]]
 name = "frame-system"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1573,8 +1573,8 @@ dependencies = [
 
 [[package]]
 name = "frame-system-benchmarking"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1587,8 +1587,8 @@ dependencies = [
 
 [[package]]
 name = "frame-system-rpc-runtime-api"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -3755,8 +3755,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-authority-discovery"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3771,8 +3771,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-authorship"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3786,8 +3786,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-babe"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3811,8 +3811,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-balances"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3825,8 +3825,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-collective"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3841,8 +3841,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-democracy"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3856,8 +3856,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-elections-phragmen"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3871,8 +3871,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-finality-tracker"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3887,8 +3887,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-grandpa"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3909,8 +3909,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-identity"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -3925,8 +3925,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-im-online"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3945,8 +3945,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-indices"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3961,8 +3961,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-membership"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3975,8 +3975,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-multisig"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3990,8 +3990,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-nicks"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4004,8 +4004,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-offences"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4019,8 +4019,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-offences-benchmarking"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4040,8 +4040,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-proxy"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4055,8 +4055,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-randomness-collective-flip"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4068,8 +4068,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-recovery"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4083,8 +4083,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-scheduler"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4098,8 +4098,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-session"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4118,8 +4118,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-session-benchmarking"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4134,8 +4134,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-society"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4148,8 +4148,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-staking"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4170,8 +4170,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-staking-reward-curve"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -4181,8 +4181,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-sudo"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4195,8 +4195,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-timestamp"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4213,8 +4213,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4230,8 +4230,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4248,8 +4248,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -4261,8 +4261,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-treasury"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4276,8 +4276,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-utility"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4292,8 +4292,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-vesting"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -6423,8 +6423,8 @@ dependencies = [
 
 [[package]]
 name = "sc-authority-discovery"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "bytes 0.5.6",
  "derive_more 0.99.9",
@@ -6451,8 +6451,8 @@ dependencies = [
 
 [[package]]
 name = "sc-basic-authorship"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -6475,8 +6475,8 @@ dependencies = [
 
 [[package]]
 name = "sc-block-builder"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -6492,8 +6492,8 @@ dependencies = [
 
 [[package]]
 name = "sc-chain-spec"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -6509,8 +6509,8 @@ dependencies = [
 
 [[package]]
 name = "sc-chain-spec-derive"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -6520,8 +6520,8 @@ dependencies = [
 
 [[package]]
 name = "sc-cli"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -6569,8 +6569,8 @@ dependencies = [
 
 [[package]]
 name = "sc-client-api"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "derive_more 0.99.9",
  "fnv",
@@ -6605,8 +6605,8 @@ dependencies = [
 
 [[package]]
 name = "sc-client-db"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -6635,8 +6635,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -6646,8 +6646,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-babe"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "derive_more 0.99.9",
  "fork-tree",
@@ -6690,8 +6690,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-babe-rpc"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -6714,8 +6714,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-epochs"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -6727,8 +6727,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-slots"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -6750,8 +6750,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-uncles"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "log 0.4.11",
  "sc-client-api",
@@ -6764,8 +6764,8 @@ dependencies = [
 
 [[package]]
 name = "sc-executor"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "derive_more 0.99.9",
  "lazy_static",
@@ -6792,8 +6792,8 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-common"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "derive_more 0.99.9",
  "log 0.4.11",
@@ -6809,8 +6809,8 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-wasmi"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "log 0.4.11",
  "parity-scale-codec",
@@ -6824,8 +6824,8 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-wasmtime"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "log 0.4.11",
  "parity-scale-codec",
@@ -6842,8 +6842,8 @@ dependencies = [
 
 [[package]]
 name = "sc-finality-grandpa"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "derive_more 0.99.9",
  "finality-grandpa",
@@ -6879,8 +6879,8 @@ dependencies = [
 
 [[package]]
 name = "sc-finality-grandpa-rpc"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "derive_more 0.99.9",
  "finality-grandpa",
@@ -6903,8 +6903,8 @@ dependencies = [
 
 [[package]]
 name = "sc-informant"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.5",
@@ -6921,8 +6921,8 @@ dependencies = [
 
 [[package]]
 name = "sc-keystore"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "derive_more 0.99.9",
  "hex",
@@ -6937,8 +6937,8 @@ dependencies = [
 
 [[package]]
 name = "sc-light"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -6956,8 +6956,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "async-std",
  "async-trait",
@@ -7010,8 +7010,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network-gossip"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -7025,8 +7025,8 @@ dependencies = [
 
 [[package]]
 name = "sc-offchain"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -7052,8 +7052,8 @@ dependencies = [
 
 [[package]]
 name = "sc-peerset"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "futures 0.3.5",
  "libp2p",
@@ -7065,8 +7065,8 @@ dependencies = [
 
 [[package]]
 name = "sc-proposer-metrics"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "log 0.4.11",
  "substrate-prometheus-endpoint",
@@ -7074,8 +7074,8 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -7106,8 +7106,8 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-api"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -7130,8 +7130,8 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-server"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "futures 0.1.29",
  "jsonrpc-core",
@@ -7148,8 +7148,8 @@ dependencies = [
 
 [[package]]
 name = "sc-service"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "derive_more 0.99.9",
  "directories",
@@ -7210,8 +7210,8 @@ dependencies = [
 
 [[package]]
 name = "sc-state-db"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "log 0.4.11",
  "parity-scale-codec",
@@ -7224,8 +7224,8 @@ dependencies = [
 
 [[package]]
 name = "sc-telemetry"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -7245,8 +7245,8 @@ dependencies = [
 
 [[package]]
 name = "sc-tracing"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "erased-serde",
  "log 0.4.11",
@@ -7264,8 +7264,8 @@ dependencies = [
 
 [[package]]
 name = "sc-transaction-graph"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -7285,8 +7285,8 @@ dependencies = [
 
 [[package]]
 name = "sc-transaction-pool"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -7752,8 +7752,8 @@ dependencies = [
 
 [[package]]
 name = "sp-allocator"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "derive_more 0.99.9",
  "log 0.4.11",
@@ -7764,8 +7764,8 @@ dependencies = [
 
 [[package]]
 name = "sp-api"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -7779,8 +7779,8 @@ dependencies = [
 
 [[package]]
 name = "sp-api-proc-macro"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -7791,8 +7791,8 @@ dependencies = [
 
 [[package]]
 name = "sp-application-crypto"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -7803,8 +7803,8 @@ dependencies = [
 
 [[package]]
 name = "sp-arithmetic"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.12",
@@ -7816,8 +7816,8 @@ dependencies = [
 
 [[package]]
 name = "sp-authority-discovery"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7828,8 +7828,8 @@ dependencies = [
 
 [[package]]
 name = "sp-authorship"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -7839,8 +7839,8 @@ dependencies = [
 
 [[package]]
 name = "sp-block-builder"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7851,8 +7851,8 @@ dependencies = [
 
 [[package]]
 name = "sp-blockchain"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "derive_more 0.99.9",
  "log 0.4.11",
@@ -7868,8 +7868,8 @@ dependencies = [
 
 [[package]]
 name = "sp-chain-spec"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "serde",
  "serde_json",
@@ -7877,8 +7877,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -7903,8 +7903,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-babe"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -7922,8 +7922,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-slots"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -7931,8 +7931,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-vrf"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -7943,8 +7943,8 @@ dependencies = [
 
 [[package]]
 name = "sp-core"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -7987,8 +7987,8 @@ dependencies = [
 
 [[package]]
 name = "sp-database"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "kvdb",
  "parking_lot 0.10.2",
@@ -7996,8 +7996,8 @@ dependencies = [
 
 [[package]]
 name = "sp-debug-derive"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "proc-macro2 1.0.18",
  "quote 1.0.7",
@@ -8006,8 +8006,8 @@ dependencies = [
 
 [[package]]
 name = "sp-externalities"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8017,8 +8017,8 @@ dependencies = [
 
 [[package]]
 name = "sp-finality-grandpa"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "finality-grandpa",
  "log 0.4.11",
@@ -8033,8 +8033,8 @@ dependencies = [
 
 [[package]]
 name = "sp-finality-tracker"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -8043,8 +8043,8 @@ dependencies = [
 
 [[package]]
 name = "sp-inherents"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "derive_more 0.99.9",
  "parity-scale-codec",
@@ -8055,8 +8055,8 @@ dependencies = [
 
 [[package]]
 name = "sp-io"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -8078,8 +8078,8 @@ dependencies = [
 
 [[package]]
 name = "sp-keyring"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -8089,8 +8089,8 @@ dependencies = [
 
 [[package]]
 name = "sp-npos-elections"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8101,8 +8101,8 @@ dependencies = [
 
 [[package]]
 name = "sp-npos-elections-compact"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -8112,8 +8112,8 @@ dependencies = [
 
 [[package]]
 name = "sp-offchain"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -8122,8 +8122,8 @@ dependencies = [
 
 [[package]]
 name = "sp-panic-handler"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "backtrace",
  "log 0.4.11",
@@ -8131,8 +8131,8 @@ dependencies = [
 
 [[package]]
 name = "sp-rpc"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "serde",
  "sp-core",
@@ -8140,8 +8140,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -8162,8 +8162,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -8178,8 +8178,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface-proc-macro"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -8190,8 +8190,8 @@ dependencies = [
 
 [[package]]
 name = "sp-serializer"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "serde",
  "serde_json",
@@ -8199,8 +8199,8 @@ dependencies = [
 
 [[package]]
 name = "sp-session"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8212,8 +8212,8 @@ dependencies = [
 
 [[package]]
 name = "sp-staking"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8222,8 +8222,8 @@ dependencies = [
 
 [[package]]
 name = "sp-state-machine"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "hash-db",
  "log 0.4.11",
@@ -8243,13 +8243,13 @@ dependencies = [
 
 [[package]]
 name = "sp-std"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 
 [[package]]
 name = "sp-storage"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8261,8 +8261,8 @@ dependencies = [
 
 [[package]]
 name = "sp-timestamp"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8275,8 +8275,8 @@ dependencies = [
 
 [[package]]
 name = "sp-tracing"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "log 0.4.11",
  "parity-scale-codec",
@@ -8288,8 +8288,8 @@ dependencies = [
 
 [[package]]
 name = "sp-transaction-pool"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -8303,8 +8303,8 @@ dependencies = [
 
 [[package]]
 name = "sp-trie"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -8317,8 +8317,8 @@ dependencies = [
 
 [[package]]
 name = "sp-utils"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "futures 0.3.5",
  "futures-core",
@@ -8329,8 +8329,8 @@ dependencies = [
 
 [[package]]
 name = "sp-version"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8341,8 +8341,8 @@ dependencies = [
 
 [[package]]
 name = "sp-wasm-interface"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8482,8 +8482,8 @@ dependencies = [
 
 [[package]]
 name = "substrate-browser-utils"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -8508,16 +8508,16 @@ dependencies = [
 
 [[package]]
 name = "substrate-build-script-utils"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "platforms",
 ]
 
 [[package]]
 name = "substrate-frame-rpc-system"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.5",
@@ -8539,8 +8539,8 @@ dependencies = [
 
 [[package]]
 name = "substrate-prometheus-endpoint"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "async-std",
  "derive_more 0.99.9",
@@ -8553,8 +8553,8 @@ dependencies = [
 
 [[package]]
 name = "substrate-test-client"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "futures 0.1.29",
  "futures 0.3.5",
@@ -8579,8 +8579,8 @@ dependencies = [
 
 [[package]]
 name = "substrate-test-utils"
-version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "futures 0.3.5",
  "substrate-test-utils-derive",
@@ -8589,8 +8589,8 @@ dependencies = [
 
 [[package]]
 name = "substrate-test-utils-derive"
-version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#75d987ba6bc4317f3f9783a1524f68904f282970"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca"
 dependencies = [
  "proc-macro-crate",
  "quote 1.0.7",
diff --git a/runtime/common/src/claims.rs b/runtime/common/src/claims.rs
index b8e89c4c9555..c66eee03f194 100644
--- a/runtime/common/src/claims.rs
+++ b/runtime/common/src/claims.rs
@@ -686,7 +686,7 @@ mod tests {
 		type MaximumBlockLength = MaximumBlockLength;
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
 		type OnKilledAccount = Balances;
diff --git a/runtime/common/src/crowdfund.rs b/runtime/common/src/crowdfund.rs
index fba53daa67a1..139b09ac3d7f 100644
--- a/runtime/common/src/crowdfund.rs
+++ b/runtime/common/src/crowdfund.rs
@@ -620,7 +620,7 @@ mod tests {
 		type MaximumBlockLength = MaximumBlockLength;
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
 		type OnKilledAccount = Balances;
diff --git a/runtime/common/src/dummy.rs b/runtime/common/src/dummy.rs
deleted file mode 100644
index 21908b0cb136..000000000000
--- a/runtime/common/src/dummy.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 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/>.
-
-//! A dummy module for holding place of modules in a runtime.
-
-use frame_support::{decl_module, decl_storage, decl_event};
-
-pub trait Trait<I: Instance = DefaultInstance>: frame_system::Trait {
-	type Event: Into<<Self as frame_system::Trait>::Event>;
-}
-
-decl_module! {
-	pub struct Module<T: Trait<I>, I: Instance = DefaultInstance> for enum Call where origin: T::Origin {
-	}
-}
-
-decl_storage! {
-	trait Store for Module<T: Trait<I>, I: Instance = DefaultInstance> as Dummy { }
-}
-
-decl_event!{
-	pub enum Event<T, I: Instance = DefaultInstance> where
-		<T as frame_system::Trait>::AccountId
-	{
-		Dummy(AccountId),
-	}
-}
diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
index 50218d39d51e..f2cabd877b94 100644
--- a/runtime/common/src/lib.rs
+++ b/runtime/common/src/lib.rs
@@ -26,8 +26,6 @@ pub mod purchase;
 pub mod impls;
 pub mod paras_sudo_wrapper;
 
-pub mod dummy;
-
 use primitives::v1::{BlockNumber, ValidatorId};
 use sp_runtime::{Perquintill, Perbill, FixedPointNumber, traits::Saturating};
 use frame_support::{
@@ -165,7 +163,7 @@ mod multiplier_tests {
 		type MaximumBlockLength = MaximumBlockLength;
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
diff --git a/runtime/common/src/purchase.rs b/runtime/common/src/purchase.rs
index e69f910ce9cd..876ac695ac22 100644
--- a/runtime/common/src/purchase.rs
+++ b/runtime/common/src/purchase.rs
@@ -449,7 +449,7 @@ mod tests {
 		type MaximumBlockLength = MaximumBlockLength;
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
 		type OnKilledAccount = Balances;
diff --git a/runtime/common/src/slots.rs b/runtime/common/src/slots.rs
index 0353ce7a3236..2e38a94fbc83 100644
--- a/runtime/common/src/slots.rs
+++ b/runtime/common/src/slots.rs
@@ -989,7 +989,7 @@ mod tests {
 		type MaximumBlockLength = MaximumBlockLength;
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
 		type OnKilledAccount = Balances;
diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
index db64e126bfe9..63aa7b90120b 100644
--- a/runtime/kusama/src/lib.rs
+++ b/runtime/kusama/src/lib.rs
@@ -29,7 +29,7 @@ use primitives::v1::{
 	PersistedValidationData, Signature, ValidationCode, ValidationData, ValidatorId, ValidatorIndex,
 };
 use runtime_common::{
-	dummy, claims, SlowAdjustingFeeUpdate,
+	claims, SlowAdjustingFeeUpdate,
 	impls::{CurrencyToVoteHandler, ToAuthor},
 	NegativeImbalance, BlockHashCount, MaximumBlockWeight, AvailableBlockRatio,
 	MaximumBlockLength, BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight,
@@ -145,7 +145,7 @@ impl frame_system::Trait for Runtime {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = Version;
-	type ModuleToIndex = ModuleToIndex;
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -193,6 +193,8 @@ impl pallet_babe::Trait for Runtime {
 
 	type HandleEquivocation =
 		pallet_babe::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
+
+	type WeightInfo = ();
 }
 
 parameter_types! {
@@ -457,7 +459,7 @@ impl pallet_elections_phragmen::Trait for Runtime {
 	type DesiredRunnersUp = DesiredRunnersUp;
 	type TermDuration = TermDuration;
 	type ModuleId = ElectionsPhragmenModuleId;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_elections_phragmen::WeightInfo;
 }
 
 parameter_types! {
@@ -549,7 +551,6 @@ impl pallet_offences::Trait for Runtime {
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
-	type WeightInfo = ();
 }
 
 impl pallet_authority_discovery::Trait for Runtime {}
@@ -587,6 +588,8 @@ impl pallet_grandpa::Trait for Runtime {
 	)>>::IdentificationTuple;
 
 	type HandleEquivocation = pallet_grandpa::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
+
+	type WeightInfo = ();
 }
 
 parameter_types! {
@@ -783,10 +786,6 @@ parameter_types! {
 	pub const MaxPending: u16 = 32;
 }
 
-impl<I: frame_support::traits::Instance> dummy::Trait<I> for Runtime {
-	type Event = Event;
-}
-
 /// The type used to represent the kinds of proxying allowed.
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug)]
 pub enum ProxyType {
@@ -825,10 +824,6 @@ impl InstanceFilter<Call> for ProxyType {
 				Call::TechnicalMembership(..) |
 				Call::Treasury(..) |
 				Call::Claims(..) |
-				Call::DummyParachains(..) |
-				Call::DummyAttestations(..) |
-				Call::DummySlots(..) |
-				Call::DummyRegistrar(..) |
 				Call::Utility(..) |
 				Call::Identity(..) |
 				Call::Society(..) |
@@ -888,11 +883,34 @@ impl pallet_proxy::Trait for Runtime {
 pub struct CustomOnRuntimeUpgrade;
 impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
 	fn on_runtime_upgrade() -> frame_support::weights::Weight {
-		if pallet_scheduler::Module::<Runtime>::migrate_v1_to_t2() {
-			<Runtime as frame_system::Trait>::MaximumBlockWeight::get()
-		} else {
-			<Runtime as frame_system::Trait>::DbWeight::get().reads(1) + 500_000_000
+		// Update scheduler origin usage
+		#[derive(Encode, Decode)]
+		#[allow(non_camel_case_types)]
+		pub enum OldOriginCaller {
+			system(frame_system::Origin<Runtime>),
+			pallet_collective_Instance1(
+				pallet_collective::Origin<Runtime, pallet_collective::Instance1>
+			),
+			pallet_collective_Instance2(
+				pallet_collective::Origin<Runtime, pallet_collective::Instance2>
+			),
+		}
+
+		impl Into<OriginCaller> for OldOriginCaller {
+			fn into(self) -> OriginCaller {
+				match self {
+					OldOriginCaller::system(o) => OriginCaller::system(o),
+					OldOriginCaller::pallet_collective_Instance1(o) =>
+						OriginCaller::pallet_collective_Instance1(o),
+					OldOriginCaller::pallet_collective_Instance2(o) =>
+						OriginCaller::pallet_collective_Instance2(o),
+				}
+			}
 		}
+
+		pallet_scheduler::Module::<Runtime>::migrate_origin::<OldOriginCaller>();
+
+		<Runtime as frame_system::Trait>::MaximumBlockWeight::get()
 	}
 }
 
@@ -903,68 +921,62 @@ construct_runtime! {
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
 		// Basic stuff; balances is uncallable initially.
-		System: frame_system::{Module, Call, Storage, Config, Event<T>},
-		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Storage},
+		System: frame_system::{Module, Call, Storage, Config, Event<T>} = 0,
+		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Storage} = 32,
 
 		// Must be before session.
-		Babe: pallet_babe::{Module, Call, Storage, Config, Inherent, ValidateUnsigned},
+		Babe: pallet_babe::{Module, Call, Storage, Config, Inherent, ValidateUnsigned} = 1,
 
-		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
-		Indices: pallet_indices::{Module, Call, Storage, Config<T>, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		TransactionPayment: pallet_transaction_payment::{Module, Storage},
+		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent} = 2,
+		Indices: pallet_indices::{Module, Call, Storage, Config<T>, Event<T>} = 3,
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>} = 4,
+		TransactionPayment: pallet_transaction_payment::{Module, Storage} = 33,
 
 		// Consensus support.
-		Authorship: pallet_authorship::{Module, Call, Storage},
-		Staking: pallet_staking::{Module, Call, Storage, Config<T>, Event<T>, ValidateUnsigned},
-		Offences: pallet_offences::{Module, Call, Storage, Event},
-		Historical: session_historical::{Module},
-		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
-		FinalityTracker: pallet_finality_tracker::{Module, Call, Storage, Inherent},
-		Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned},
-		ImOnline: pallet_im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
-		AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config},
+		Authorship: pallet_authorship::{Module, Call, Storage} = 5,
+		Staking: pallet_staking::{Module, Call, Storage, Config<T>, Event<T>, ValidateUnsigned} = 6,
+		Offences: pallet_offences::{Module, Call, Storage, Event} = 7,
+		Historical: session_historical::{Module} = 34,
+		Session: pallet_session::{Module, Call, Storage, Event, Config<T>} = 8,
+		FinalityTracker: pallet_finality_tracker::{Module, Call, Storage, Inherent} = 9,
+		Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned} = 10,
+		ImOnline: pallet_im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 11,
+		AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config} = 12,
 
 		// Governance stuff; uncallable initially.
-		Democracy: pallet_democracy::{Module, Call, Storage, Config, Event<T>},
-		Council: pallet_collective::<Instance1>::{Module, Call, Storage, Origin<T>, Event<T>, Config<T>},
-		TechnicalCommittee: pallet_collective::<Instance2>::{Module, Call, Storage, Origin<T>, Event<T>, Config<T>},
-		ElectionsPhragmen: pallet_elections_phragmen::{Module, Call, Storage, Event<T>, Config<T>},
-		TechnicalMembership: pallet_membership::<Instance1>::{Module, Call, Storage, Event<T>, Config<T>},
-		Treasury: pallet_treasury::{Module, Call, Storage, Event<T>},
+		Democracy: pallet_democracy::{Module, Call, Storage, Config, Event<T>} = 13,
+		Council: pallet_collective::<Instance1>::{Module, Call, Storage, Origin<T>, Event<T>, Config<T>} = 14,
+		TechnicalCommittee: pallet_collective::<Instance2>::{Module, Call, Storage, Origin<T>, Event<T>, Config<T>} = 15,
+		ElectionsPhragmen: pallet_elections_phragmen::{Module, Call, Storage, Event<T>, Config<T>} = 16,
+		TechnicalMembership: pallet_membership::<Instance1>::{Module, Call, Storage, Event<T>, Config<T>} = 17,
+		Treasury: pallet_treasury::{Module, Call, Storage, Event<T>} = 18,
 
 		// Claims. Usable initially.
-		Claims: claims::{Module, Call, Storage, Event<T>, Config<T>, ValidateUnsigned},
-
-		// Old parachains stuff. All dummies to avoid messing up the transaction indices.
-		DummyParachains: dummy::<Instance0>::{Module, Call},
-		DummyAttestations: dummy::<Instance1>::{Module, Call},
-		DummySlots: dummy::<Instance2>::{Module, Call, Event<T>},
-		DummyRegistrar: dummy::<Instance3>::{Module, Call, Event<T>},
+		Claims: claims::{Module, Call, Storage, Event<T>, Config<T>, ValidateUnsigned} = 19,
 
 		// Utility module.
-		Utility: pallet_utility::{Module, Call, Event},
+		Utility: pallet_utility::{Module, Call, Event} = 24,
 
 		// Less simple identity module.
-		Identity: pallet_identity::{Module, Call, Storage, Event<T>},
+		Identity: pallet_identity::{Module, Call, Storage, Event<T>} = 25,
 
 		// Society module.
-		Society: pallet_society::{Module, Call, Storage, Event<T>},
+		Society: pallet_society::{Module, Call, Storage, Event<T>} = 26,
 
 		// Social recovery module.
-		Recovery: pallet_recovery::{Module, Call, Storage, Event<T>},
+		Recovery: pallet_recovery::{Module, Call, Storage, Event<T>} = 27,
 
 		// Vesting. Usable initially, but removed once all vesting is finished.
-		Vesting: pallet_vesting::{Module, Call, Storage, Event<T>, Config<T>},
+		Vesting: pallet_vesting::{Module, Call, Storage, Event<T>, Config<T>} = 28,
 
 		// System scheduler.
-		Scheduler: pallet_scheduler::{Module, Call, Storage, Event<T>},
+		Scheduler: pallet_scheduler::{Module, Call, Storage, Event<T>} = 29,
 
 		// Proxy module. Late addition.
-		Proxy: pallet_proxy::{Module, Call, Storage, Event<T>},
+		Proxy: pallet_proxy::{Module, Call, Storage, Event<T>} = 30,
 
 		// Multisig module. Late addition.
-		Multisig: pallet_multisig::{Module, Call, Storage, Event<T>},
+		Multisig: pallet_multisig::{Module, Call, Storage, Event<T>} = 31,
 	}
 }
 
diff --git a/runtime/kusama/src/weights/mod.rs b/runtime/kusama/src/weights/mod.rs
index 9aa57bd71fd3..3818a53ccd28 100644
--- a/runtime/kusama/src/weights/mod.rs
+++ b/runtime/kusama/src/weights/mod.rs
@@ -27,3 +27,4 @@ pub mod pallet_timestamp;
 pub mod pallet_treasury;
 pub mod pallet_utility;
 pub mod pallet_vesting;
+pub mod pallet_elections_phragmen;
diff --git a/runtime/kusama/src/weights/pallet_elections_phragmen.rs b/runtime/kusama/src/weights/pallet_elections_phragmen.rs
new file mode 100644
index 000000000000..f7ce1620a1f5
--- /dev/null
+++ b/runtime/kusama/src/weights/pallet_elections_phragmen.rs
@@ -0,0 +1,89 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+pub struct WeightInfo;
+impl pallet_elections_phragmen::WeightInfo for WeightInfo {
+	fn vote(v: u32, ) -> Weight {
+		(91_489_000 as Weight)
+			.saturating_add((199_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(DbWeight::get().reads(5 as Weight))
+			.saturating_add(DbWeight::get().writes(2 as Weight))
+	}
+	fn vote_update(v: u32, ) -> Weight {
+		(56_511_000 as Weight)
+			.saturating_add((245_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(DbWeight::get().reads(5 as Weight))
+			.saturating_add(DbWeight::get().writes(2 as Weight))
+	}
+	fn remove_voter() -> Weight {
+		(76_714_000 as Weight)
+			.saturating_add(DbWeight::get().reads(2 as Weight))
+			.saturating_add(DbWeight::get().writes(2 as Weight))
+	}
+	fn report_defunct_voter_correct(c: u32, v: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((1_743_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((31_750_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(DbWeight::get().reads(7 as Weight))
+			.saturating_add(DbWeight::get().writes(3 as Weight))
+	}
+	fn report_defunct_voter_incorrect(c: u32, v: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((1_733_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((31_861_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(DbWeight::get().reads(6 as Weight))
+			.saturating_add(DbWeight::get().writes(2 as Weight))
+	}
+	fn submit_candidacy(c: u32, ) -> Weight {
+		(74_714_000 as Weight)
+			.saturating_add((315_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(DbWeight::get().reads(3 as Weight))
+			.saturating_add(DbWeight::get().writes(1 as Weight))
+	}
+	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
+		(50_408_000 as Weight)
+			.saturating_add((159_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(DbWeight::get().reads(1 as Weight))
+			.saturating_add(DbWeight::get().writes(1 as Weight))
+	}
+	fn renounce_candidacy_members() -> Weight {
+		(79_626_000 as Weight)
+			.saturating_add(DbWeight::get().reads(3 as Weight))
+			.saturating_add(DbWeight::get().writes(4 as Weight))
+	}
+	fn renounce_candidacy_runners_up() -> Weight {
+		(49_715_000 as Weight)
+			.saturating_add(DbWeight::get().reads(1 as Weight))
+			.saturating_add(DbWeight::get().writes(1 as Weight))
+	}
+	fn remove_member_with_replacement() -> Weight {
+		(76_572_000 as Weight)
+			.saturating_add(DbWeight::get().reads(4 as Weight))
+			.saturating_add(DbWeight::get().writes(5 as Weight))
+	}
+	fn remove_member_wrong_refund() -> Weight {
+		(8_777_000 as Weight)
+			.saturating_add(DbWeight::get().reads(1 as Weight))
+	}
+}
diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs
index 59e494091e0b..3d08653ee12d 100644
--- a/runtime/parachains/src/mock.rs
+++ b/runtime/parachains/src/mock.rs
@@ -88,7 +88,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u128>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
index 7eddf78f2f2b..99843d384c60 100644
--- a/runtime/polkadot/src/lib.rs
+++ b/runtime/polkadot/src/lib.rs
@@ -21,7 +21,7 @@
 #![recursion_limit="256"]
 
 use runtime_common::{
-	dummy, claims, SlowAdjustingFeeUpdate,
+	claims, SlowAdjustingFeeUpdate,
 	impls::{CurrencyToVoteHandler, ToAuthor},
 	NegativeImbalance, BlockHashCount, MaximumBlockWeight, AvailableBlockRatio,
 	MaximumBlockLength, BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight,
@@ -112,11 +112,6 @@ pub struct BaseFilter;
 impl Filter<Call> for BaseFilter {
 	fn filter(call: &Call) -> bool {
 		match call {
-			// Parachains stuff
-			Call::DummyParachains(_) | Call::DummyAttestations(_) | Call::DummySlots(_) | Call::DummyRegistrar(_) |
-			Call::DummyPurchase(_) =>
-				false,
-
 			// These modules are all allowed to be called by transactions:
 			Call::Democracy(_) | Call::Council(_) | Call::TechnicalCommittee(_) |
 			Call::TechnicalMembership(_) | Call::Treasury(_) | Call::ElectionsPhragmen(_) |
@@ -163,7 +158,7 @@ impl frame_system::Trait for Runtime {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = Version;
-	type ModuleToIndex = ModuleToIndex;
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -210,7 +205,9 @@ impl pallet_babe::Trait for Runtime {
 	)>>::IdentificationTuple;
 
 	type HandleEquivocation =
-	pallet_babe::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
+		pallet_babe::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
+
+	type WeightInfo = ();
 }
 
 parameter_types! {
@@ -513,7 +510,7 @@ impl pallet_elections_phragmen::Trait for Runtime {
 	type DesiredMembers = DesiredMembers;
 	type DesiredRunnersUp = DesiredRunnersUp;
 	type TermDuration = TermDuration;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_elections_phragmen::WeightInfo;
 }
 
 parameter_types! {
@@ -605,7 +602,6 @@ impl pallet_offences::Trait for Runtime {
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
-	type WeightInfo = ();
 }
 
 impl pallet_authority_discovery::Trait for Runtime {}
@@ -643,6 +639,8 @@ impl pallet_grandpa::Trait for Runtime {
 	type KeyOwnerProofSystem = Historical;
 
 	type HandleEquivocation = pallet_grandpa::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
+
+	type WeightInfo = ();
 }
 
 parameter_types! {
@@ -775,10 +773,6 @@ parameter_types! {
 	pub const MaxPending: u16 = 32;
 }
 
-impl<I: frame_support::traits::Instance> dummy::Trait<I> for Runtime {
-	type Event = Event;
-}
-
 /// The type used to represent the kinds of proxying allowed.
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug)]
 pub enum ProxyType {
@@ -848,10 +842,6 @@ impl InstanceFilter<Call> for ProxyType {
 				Call::ElectionsPhragmen(..) |
 				Call::TechnicalMembership(..) |
 				Call::Treasury(..) |
-				Call::DummyParachains(..) |
-				Call::DummyAttestations(..) |
-				Call::DummySlots(..) |
-				Call::DummyRegistrar(..) |
 				Call::Claims(..) |
 				Call::Vesting(pallet_vesting::Call::vest(..)) |
 				Call::Vesting(pallet_vesting::Call::vest_other(..)) |
@@ -903,7 +893,36 @@ impl pallet_proxy::Trait for Runtime {
 pub struct CustomOnRuntimeUpgrade;
 impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
 	fn on_runtime_upgrade() -> frame_support::weights::Weight {
-		purchase::remove_pallet::<Runtime>()
+		purchase::remove_pallet::<Runtime>();
+
+		// Update scheduler origin usage
+		#[derive(Encode, Decode)]
+		#[allow(non_camel_case_types)]
+		pub enum OldOriginCaller {
+			system(frame_system::Origin<Runtime>),
+			pallet_collective_Instance1(
+				pallet_collective::Origin<Runtime, pallet_collective::Instance1>
+			),
+			pallet_collective_Instance2(
+				pallet_collective::Origin<Runtime, pallet_collective::Instance2>
+			),
+		}
+
+		impl Into<OriginCaller> for OldOriginCaller {
+			fn into(self) -> OriginCaller {
+				match self {
+					OldOriginCaller::system(o) => OriginCaller::system(o),
+					OldOriginCaller::pallet_collective_Instance1(o) =>
+						OriginCaller::pallet_collective_Instance1(o),
+					OldOriginCaller::pallet_collective_Instance2(o) =>
+						OriginCaller::pallet_collective_Instance2(o),
+				}
+			}
+		}
+
+		pallet_scheduler::Module::<Runtime>::migrate_origin::<OldOriginCaller>();
+
+		<Runtime as frame_system::Trait>::MaximumBlockWeight::get()
 	}
 }
 
@@ -914,61 +933,52 @@ construct_runtime! {
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
 		// Basic stuff; balances is uncallable initially.
-		System: frame_system::{Module, Call, Storage, Config, Event<T>},
-		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Storage},
-		Scheduler: pallet_scheduler::{Module, Call, Storage, Event<T>},
+		System: frame_system::{Module, Call, Storage, Config, Event<T>} = 0,
+		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Storage} = 31,
+		Scheduler: pallet_scheduler::{Module, Call, Storage, Event<T>} = 1,
 
 		// Must be before session.
-		Babe: pallet_babe::{Module, Call, Storage, Config, Inherent, ValidateUnsigned},
+		Babe: pallet_babe::{Module, Call, Storage, Config, Inherent, ValidateUnsigned} = 2,
 
-		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
-		Indices: pallet_indices::{Module, Call, Storage, Config<T>, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		TransactionPayment: pallet_transaction_payment::{Module, Storage},
+		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent} = 3,
+		Indices: pallet_indices::{Module, Call, Storage, Config<T>, Event<T>} = 4,
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>} = 5,
+		TransactionPayment: pallet_transaction_payment::{Module, Storage} = 32,
 
 		// Consensus support.
-		Authorship: pallet_authorship::{Module, Call, Storage},
-		Staking: pallet_staking::{Module, Call, Storage, Config<T>, Event<T>, ValidateUnsigned},
-		Offences: pallet_offences::{Module, Call, Storage, Event},
-		Historical: session_historical::{Module},
-		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
-		FinalityTracker: pallet_finality_tracker::{Module, Call, Storage, Inherent},
-		Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned},
-		ImOnline: pallet_im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
-		AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config},
+		Authorship: pallet_authorship::{Module, Call, Storage} = 6,
+		Staking: pallet_staking::{Module, Call, Storage, Config<T>, Event<T>, ValidateUnsigned} = 7,
+		Offences: pallet_offences::{Module, Call, Storage, Event} = 8,
+		Historical: session_historical::{Module} = 33,
+		Session: pallet_session::{Module, Call, Storage, Event, Config<T>} = 9,
+		FinalityTracker: pallet_finality_tracker::{Module, Call, Storage, Inherent} = 10,
+		Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned} = 11,
+		ImOnline: pallet_im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 12,
+		AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config} = 13,
 
 		// Governance stuff.
-		Democracy: pallet_democracy::{Module, Call, Storage, Config, Event<T>},
-		Council: pallet_collective::<Instance1>::{Module, Call, Storage, Origin<T>, Event<T>, Config<T>},
-		TechnicalCommittee: pallet_collective::<Instance2>::{Module, Call, Storage, Origin<T>, Event<T>, Config<T>},
-		ElectionsPhragmen: pallet_elections_phragmen::{Module, Call, Storage, Event<T>, Config<T>},
-		TechnicalMembership: pallet_membership::<Instance1>::{Module, Call, Storage, Event<T>, Config<T>},
-		Treasury: pallet_treasury::{Module, Call, Storage, Event<T>},
-
-		// Old parachains stuff. All dummies to avoid messing up the transaction indices.
-		DummyParachains: dummy::<Instance0>::{Module, Call},
-		DummyAttestations: dummy::<Instance1>::{Module, Call},
-		DummySlots: dummy::<Instance2>::{Module, Call, Event<T>},
-		DummyRegistrar: dummy::<Instance3>::{Module, Call, Event<T>},
+		Democracy: pallet_democracy::{Module, Call, Storage, Config, Event<T>} = 14,
+		Council: pallet_collective::<Instance1>::{Module, Call, Storage, Origin<T>, Event<T>, Config<T>} = 15,
+		TechnicalCommittee: pallet_collective::<Instance2>::{Module, Call, Storage, Origin<T>, Event<T>, Config<T>} = 16,
+		ElectionsPhragmen: pallet_elections_phragmen::{Module, Call, Storage, Event<T>, Config<T>} = 17,
+		TechnicalMembership: pallet_membership::<Instance1>::{Module, Call, Storage, Event<T>, Config<T>} = 18,
+		Treasury: pallet_treasury::{Module, Call, Storage, Event<T>} = 19,
 
 		// Claims. Usable initially.
-		Claims: claims::{Module, Call, Storage, Event<T>, Config<T>, ValidateUnsigned},
+		Claims: claims::{Module, Call, Storage, Event<T>, Config<T>, ValidateUnsigned} = 24,
 		// Vesting. Usable initially, but removed once all vesting is finished.
-		Vesting: pallet_vesting::{Module, Call, Storage, Event<T>, Config<T>},
+		Vesting: pallet_vesting::{Module, Call, Storage, Event<T>, Config<T>} = 25,
 		// Cunning utilities. Usable initially.
-		Utility: pallet_utility::{Module, Call, Event},
-
-		// Old spot for the purchase pallet. Can be replaced later by a new pallet.
-		DummyPurchase: dummy::<Instance4>::{Module, Call, Event<T>},
+		Utility: pallet_utility::{Module, Call, Event} = 26,
 
 		// Identity. Late addition.
-		Identity: pallet_identity::{Module, Call, Storage, Event<T>},
+		Identity: pallet_identity::{Module, Call, Storage, Event<T>} = 28,
 
 		// Proxy module. Late addition.
-		Proxy: pallet_proxy::{Module, Call, Storage, Event<T>},
+		Proxy: pallet_proxy::{Module, Call, Storage, Event<T>} = 29,
 
 		// Multisig dispatch. Late addition.
-		Multisig: pallet_multisig::{Module, Call, Storage, Event<T>},
+		Multisig: pallet_multisig::{Module, Call, Storage, Event<T>} = 30,
 	}
 }
 
diff --git a/runtime/polkadot/src/weights/mod.rs b/runtime/polkadot/src/weights/mod.rs
index 9aa57bd71fd3..3818a53ccd28 100644
--- a/runtime/polkadot/src/weights/mod.rs
+++ b/runtime/polkadot/src/weights/mod.rs
@@ -27,3 +27,4 @@ pub mod pallet_timestamp;
 pub mod pallet_treasury;
 pub mod pallet_utility;
 pub mod pallet_vesting;
+pub mod pallet_elections_phragmen;
diff --git a/runtime/polkadot/src/weights/pallet_elections_phragmen.rs b/runtime/polkadot/src/weights/pallet_elections_phragmen.rs
new file mode 100644
index 000000000000..f7ce1620a1f5
--- /dev/null
+++ b/runtime/polkadot/src/weights/pallet_elections_phragmen.rs
@@ -0,0 +1,89 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+pub struct WeightInfo;
+impl pallet_elections_phragmen::WeightInfo for WeightInfo {
+	fn vote(v: u32, ) -> Weight {
+		(91_489_000 as Weight)
+			.saturating_add((199_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(DbWeight::get().reads(5 as Weight))
+			.saturating_add(DbWeight::get().writes(2 as Weight))
+	}
+	fn vote_update(v: u32, ) -> Weight {
+		(56_511_000 as Weight)
+			.saturating_add((245_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(DbWeight::get().reads(5 as Weight))
+			.saturating_add(DbWeight::get().writes(2 as Weight))
+	}
+	fn remove_voter() -> Weight {
+		(76_714_000 as Weight)
+			.saturating_add(DbWeight::get().reads(2 as Weight))
+			.saturating_add(DbWeight::get().writes(2 as Weight))
+	}
+	fn report_defunct_voter_correct(c: u32, v: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((1_743_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((31_750_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(DbWeight::get().reads(7 as Weight))
+			.saturating_add(DbWeight::get().writes(3 as Weight))
+	}
+	fn report_defunct_voter_incorrect(c: u32, v: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((1_733_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((31_861_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(DbWeight::get().reads(6 as Weight))
+			.saturating_add(DbWeight::get().writes(2 as Weight))
+	}
+	fn submit_candidacy(c: u32, ) -> Weight {
+		(74_714_000 as Weight)
+			.saturating_add((315_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(DbWeight::get().reads(3 as Weight))
+			.saturating_add(DbWeight::get().writes(1 as Weight))
+	}
+	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
+		(50_408_000 as Weight)
+			.saturating_add((159_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(DbWeight::get().reads(1 as Weight))
+			.saturating_add(DbWeight::get().writes(1 as Weight))
+	}
+	fn renounce_candidacy_members() -> Weight {
+		(79_626_000 as Weight)
+			.saturating_add(DbWeight::get().reads(3 as Weight))
+			.saturating_add(DbWeight::get().writes(4 as Weight))
+	}
+	fn renounce_candidacy_runners_up() -> Weight {
+		(49_715_000 as Weight)
+			.saturating_add(DbWeight::get().reads(1 as Weight))
+			.saturating_add(DbWeight::get().writes(1 as Weight))
+	}
+	fn remove_member_with_replacement() -> Weight {
+		(76_572_000 as Weight)
+			.saturating_add(DbWeight::get().reads(4 as Weight))
+			.saturating_add(DbWeight::get().writes(5 as Weight))
+	}
+	fn remove_member_wrong_refund() -> Weight {
+		(8_777_000 as Weight)
+			.saturating_add(DbWeight::get().reads(1 as Weight))
+	}
+}
diff --git a/runtime/polkadot/tests/weights.rs b/runtime/polkadot/tests/weights.rs
deleted file mode 100644
index be9fd79ad4e4..000000000000
--- a/runtime/polkadot/tests/weights.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 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/>.
-
-//! Tests to make sure that Polkadot's weights and fees match what we
-//! expect from Substrate.
-//!
-//! These test are not meant to be exhaustive, as it is inevitable that
-//! weights in Substrate will change. Instead they are supposed to provide
-//! some sort of indicator that calls we consider important (e.g pallet_balances::transfer)
-//! have not suddenly changed from under us.
-//!
-//! Some of the tests in this crate print insightful logs. Run with:
-//!
-//! ```
-//! $ cargo test -p polkadot-runtime -- --nocapture --test-threads=1
-//! ```
-
-use frame_support::weights::{constants::*, GetDispatchInfo};
-use polkadot_runtime::{self, Runtime};
-use runtime_common::MaximumBlockWeight;
-
-use pallet_elections_phragmen::Call as PhragmenCall;
-use pallet_session::Call as SessionCall;
-use frame_system::Call as SystemCall;
-
-type DbWeight = <Runtime as frame_system::Trait>::DbWeight;
-
-#[test]
-fn sanity_check_weight_per_time_constants_are_as_expected() {
-	// These values comes from Substrate, we want to make sure that if it
-	// ever changes we don't accidentally break Polkadot
-	assert_eq!(WEIGHT_PER_SECOND, 1_000_000_000_000);
-	assert_eq!(WEIGHT_PER_MILLIS, WEIGHT_PER_SECOND / 1000);
-	assert_eq!(WEIGHT_PER_MICROS, WEIGHT_PER_MILLIS / 1000);
-	assert_eq!(WEIGHT_PER_NANOS, WEIGHT_PER_MICROS / 1000);
-}
-
-#[test]
-fn weight_of_system_set_code_is_correct() {
-	// #[weight = (T::MaximumBlockWeight::get(), DispatchClass::Operational)]
-	let expected_weight = MaximumBlockWeight::get();
-	let weight = SystemCall::set_code::<Runtime>(vec![]).get_dispatch_info().weight;
-
-	assert_eq!(weight, expected_weight);
-}
-
-#[test]
-fn weight_of_session_set_keys_is_correct() {
-	// #[weight = 200_000_000
-	// 	+ T::DbWeight::get().reads(2 + T::Keys::key_ids().len() as Weight)
-	// 	+ T::DbWeight::get().writes(1 + T::Keys::key_ids().len() as Weight)]
-	//
-	// Polkadot has five possible session keys, so we default to key_ids.len() = 5
-	let expected_weight = 200_000_000 + (DbWeight::get().read * (2 + 5)) + (DbWeight::get().write * (1 + 5));
-	let weight = SessionCall::set_keys::<Runtime>(Default::default(), Default::default()).get_dispatch_info().weight;
-
-	assert_eq!(weight, expected_weight);
-}
-
-#[test]
-fn weight_of_session_purge_keys_is_correct() {
-	// #[weight = 120_000_000
-	// 	+ T::DbWeight::get().reads_writes(2, 1 + T::Keys::key_ids().len() as Weight)]
-	//
-	// Polkadot has five possible session keys, so we default to key_ids.len() = 5
-	let expected_weight = 120_000_000 + (DbWeight::get().read * 2) + (DbWeight::get().write * (1 + 5));
-	let weight = SessionCall::purge_keys::<Runtime>().get_dispatch_info().weight;
-
-	assert_eq!(weight, expected_weight);
-}
-
-#[test]
-fn weight_of_phragmen_vote_is_correct() {
-	// #[weight = 100_000_000]
-	let expected_weight = 350_000_000;
-	let weight = PhragmenCall::vote::<Runtime>(Default::default(), Default::default()).get_dispatch_info().weight;
-
-	assert_eq!(weight, expected_weight);
-}
-
-#[test]
-fn weight_of_phragmen_submit_candidacy_is_correct() {
-	let expected_weight = WEIGHT_PER_MICROS * 35 + 1 * 375 * WEIGHT_PER_NANOS + DbWeight::get().reads_writes(4, 1);
-	let weight = PhragmenCall::submit_candidacy::<Runtime>(1).get_dispatch_info().weight;
-
-	assert_eq!(weight, expected_weight);
-}
-
-#[test]
-fn weight_of_phragmen_renounce_candidacy_is_correct() {
-	let expected_weight = 46 * WEIGHT_PER_MICROS + DbWeight::get().reads_writes(2, 2);
-	let weight = PhragmenCall::renounce_candidacy::<Runtime>(pallet_elections_phragmen::Renouncing::Member)
-		.get_dispatch_info().weight;
-
-	assert_eq!(weight, expected_weight);
-}
diff --git a/runtime/rococo-v1/src/lib.rs b/runtime/rococo-v1/src/lib.rs
index a3f714ca1f75..9e3dd13c8e3f 100644
--- a/runtime/rococo-v1/src/lib.rs
+++ b/runtime/rococo-v1/src/lib.rs
@@ -437,7 +437,7 @@ impl frame_system::Trait for Runtime {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = Version;
-	type ModuleToIndex = ModuleToIndex;
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -611,7 +611,6 @@ impl pallet_offences::Trait for Runtime {
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
-	type WeightInfo = ();
 }
 
 impl pallet_authority_discovery::Trait for Runtime {}
@@ -681,6 +680,8 @@ impl pallet_babe::Trait for Runtime {
 
 	type HandleEquivocation =
 		pallet_babe::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
+
+	type WeightInfo = ();
 }
 
 parameter_types! {
@@ -714,6 +715,8 @@ impl pallet_grandpa::Trait for Runtime {
 	)>>::IdentificationTuple;
 
 	type HandleEquivocation = pallet_grandpa::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
+
+	type WeightInfo = ();
 }
 
 parameter_types! {
diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs
index 27bc8a45f366..7ff1ea916c36 100644
--- a/runtime/test-runtime/src/lib.rs
+++ b/runtime/test-runtime/src/lib.rs
@@ -128,7 +128,7 @@ impl frame_system::Trait for Runtime {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = Version;
-	type ModuleToIndex = ModuleToIndex;
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -167,6 +167,8 @@ impl pallet_babe::Trait for Runtime {
 	)>>::IdentificationTuple;
 
 	type HandleEquivocation = ();
+
+	type WeightInfo = ();
 }
 
 parameter_types! {
@@ -333,6 +335,8 @@ impl pallet_grandpa::Trait for Runtime {
 	)>>::IdentificationTuple;
 
 	type HandleEquivocation = ();
+
+	type WeightInfo = ();
 }
 
 impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for Runtime where
@@ -388,7 +392,6 @@ impl pallet_offences::Trait for Runtime {
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
-	type WeightInfo = ();
 }
 
 impl pallet_authority_discovery::Trait for Runtime {}
diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs
index 977e09218fc2..9d4d51d98edf 100644
--- a/runtime/westend/src/lib.rs
+++ b/runtime/westend/src/lib.rs
@@ -28,7 +28,7 @@ use primitives::v1::{
 	PersistedValidationData, Signature, ValidationCode, ValidationData, ValidatorId, ValidatorIndex,
 };
 use runtime_common::{
-	dummy, purchase, SlowAdjustingFeeUpdate,
+	purchase, SlowAdjustingFeeUpdate,
 	impls::{CurrencyToVoteHandler, ToAuthor},
 	BlockHashCount, MaximumBlockWeight, AvailableBlockRatio, MaximumBlockLength,
 	BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, MaximumExtrinsicWeight,
@@ -136,7 +136,7 @@ impl frame_system::Trait for Runtime {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = Version;
-	type ModuleToIndex = ModuleToIndex;
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -184,6 +184,8 @@ impl pallet_babe::Trait for Runtime {
 
 	type HandleEquivocation =
 		pallet_babe::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
+
+	type WeightInfo = ();
 }
 
 parameter_types! {
@@ -356,7 +358,6 @@ impl pallet_offences::Trait for Runtime {
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
-	type WeightInfo = ();
 }
 
 impl pallet_authority_discovery::Trait for Runtime {}
@@ -394,6 +395,8 @@ impl pallet_grandpa::Trait for Runtime {
 	)>>::IdentificationTuple;
 
 	type HandleEquivocation = pallet_grandpa::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
+
+	type WeightInfo = ();
 }
 
 parameter_types! {
@@ -587,9 +590,6 @@ impl InstanceFilter<Call> for ProxyType {
 				Call::Grandpa(..) |
 				Call::ImOnline(..) |
 				Call::AuthorityDiscovery(..) |
-				Call::DummyParachains(..) |
-				Call::DummyAttestations(..) |
-				Call::DummyRegistrar(..) |
 				Call::Utility(..) |
 				Call::Identity(..) |
 				Call::Recovery(pallet_recovery::Call::as_recovered(..)) |
@@ -647,10 +647,6 @@ impl pallet_proxy::Trait for Runtime {
 	type AnnouncementDepositFactor = AnnouncementDepositFactor;
 }
 
-impl<I: frame_support::traits::Instance> dummy::Trait<I> for Runtime {
-	type Event = Event;
-}
-
 construct_runtime! {
 	pub enum Runtime where
 		Block = Block,
@@ -658,56 +654,51 @@ construct_runtime! {
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
 		// Basic stuff; balances is uncallable initially.
-		System: frame_system::{Module, Call, Storage, Config, Event<T>},
-		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Storage},
+		System: frame_system::{Module, Call, Storage, Config, Event<T>} = 0,
+		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Storage} = 25,
 
 		// Must be before session.
-		Babe: pallet_babe::{Module, Call, Storage, Config, Inherent, ValidateUnsigned},
+		Babe: pallet_babe::{Module, Call, Storage, Config, Inherent, ValidateUnsigned} = 1,
 
-		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
-		Indices: pallet_indices::{Module, Call, Storage, Config<T>, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		TransactionPayment: pallet_transaction_payment::{Module, Storage},
+		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent} = 2,
+		Indices: pallet_indices::{Module, Call, Storage, Config<T>, Event<T>} = 3,
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>} = 4,
+		TransactionPayment: pallet_transaction_payment::{Module, Storage} = 26,
 
 		// Consensus support.
-		Authorship: pallet_authorship::{Module, Call, Storage},
-		Staking: pallet_staking::{Module, Call, Storage, Config<T>, Event<T>, ValidateUnsigned},
-		Offences: pallet_offences::{Module, Call, Storage, Event},
-		Historical: session_historical::{Module},
-		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
-		FinalityTracker: pallet_finality_tracker::{Module, Call, Storage, Inherent},
-		Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned},
-		ImOnline: pallet_im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
-		AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config},
-
-		// Old Parachains stuff. All dummies to avoid messing up the transaction indices.
-		DummyParachains: dummy::<Instance0>::{Module, Call},
-		DummyAttestations: dummy::<Instance1>::{Module, Call},
-		DummyRegistrar: dummy::<Instance2>::{Module, Call, Event<T>},
+		Authorship: pallet_authorship::{Module, Call, Storage} = 5,
+		Staking: pallet_staking::{Module, Call, Storage, Config<T>, Event<T>, ValidateUnsigned} = 6,
+		Offences: pallet_offences::{Module, Call, Storage, Event} = 7,
+		Historical: session_historical::{Module} = 27,
+		Session: pallet_session::{Module, Call, Storage, Event, Config<T>} = 8,
+		FinalityTracker: pallet_finality_tracker::{Module, Call, Storage, Inherent} = 9,
+		Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned} = 10,
+		ImOnline: pallet_im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 11,
+		AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config} = 12,
 
 		// Utility module.
-		Utility: pallet_utility::{Module, Call, Event},
+		Utility: pallet_utility::{Module, Call, Event} = 16,
 
 		// Less simple identity module.
-		Identity: pallet_identity::{Module, Call, Storage, Event<T>},
+		Identity: pallet_identity::{Module, Call, Storage, Event<T>} = 17,
 
 		// Social recovery module.
-		Recovery: pallet_recovery::{Module, Call, Storage, Event<T>},
+		Recovery: pallet_recovery::{Module, Call, Storage, Event<T>} = 18,
 
 		// Vesting. Usable initially, but removed once all vesting is finished.
-		Vesting: pallet_vesting::{Module, Call, Storage, Event<T>, Config<T>},
+		Vesting: pallet_vesting::{Module, Call, Storage, Event<T>, Config<T>} = 19,
 
 		// System scheduler.
-		Scheduler: pallet_scheduler::{Module, Call, Storage, Event<T>},
+		Scheduler: pallet_scheduler::{Module, Call, Storage, Event<T>} = 20,
 
 		// Sudo.
-		Sudo: pallet_sudo::{Module, Call, Storage, Event<T>, Config<T>},
+		Sudo: pallet_sudo::{Module, Call, Storage, Event<T>, Config<T>} = 21,
 
 		// Proxy module. Late addition.
-		Proxy: pallet_proxy::{Module, Call, Storage, Event<T>},
+		Proxy: pallet_proxy::{Module, Call, Storage, Event<T>} = 22,
 
 		// Multisig module. Late addition.
-		Multisig: pallet_multisig::{Module, Call, Storage, Event<T>},
+		Multisig: pallet_multisig::{Module, Call, Storage, Event<T>} = 23,
 	}
 }