From 97fed8907925e2ddfd6a82ee1241674245a93b26 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Wed, 22 Apr 2020 09:51:55 +0200
Subject: [PATCH] Companion for substrate/5686 (#1008)

* Companion for substrate/5686

* Update substrate
---
 polkadot/Cargo.lock                         | 305 ++++++++++----------
 polkadot/runtime/common/src/attestations.rs |   4 +-
 polkadot/runtime/common/src/claims.rs       |   5 +-
 polkadot/runtime/common/src/crowdfund.rs    |  16 +-
 polkadot/runtime/common/src/parachains.rs   |   8 +-
 polkadot/runtime/common/src/registrar.rs    |  16 +-
 polkadot/runtime/common/src/slots.rs        |  14 +-
 polkadot/runtime/westend/src/lib.rs         |   2 +-
 8 files changed, 184 insertions(+), 186 deletions(-)

diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index 940d6a7d07e..587078230f9 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -126,9 +126,9 @@ dependencies = [
 
 [[package]]
 name = "arc-swap"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d663a8e9a99154b5fb793032533f6328da35e23aac63d5c152279aa8ba356825"
+checksum = "b585a98a234c46fc563103e9278c9391fde1f4e6850334da895d27edb9580f62"
 
 [[package]]
 name = "arrayref"
@@ -275,9 +275,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace-sys"
-version = "0.1.35"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de8aba10a69c8e8d7622c5710229485ec32e9d55fdad160ea559c086fdcd118"
+checksum = "78848718ee1255a2485d1309ad9cdecfc2e7d0362dd11c6829364c6b35ae1bc7"
 dependencies = [
  "cc",
  "libc",
@@ -441,9 +441,9 @@ dependencies = [
 
 [[package]]
 name = "bs58"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b170cd256a3f9fa6b9edae3e44a7dfdfc77e8124dbc3e2612d75f9c3e2396dae"
+checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb"
 
 [[package]]
 name = "bstr"
@@ -1003,18 +1003,18 @@ dependencies = [
 
 [[package]]
 name = "enumflags2"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a80e524ebf194285b57e5e7944018721c7fffc673253f5183f7accd88a2a3b0c"
+checksum = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0"
 dependencies = [
  "enumflags2_derive",
 ]
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ed9afacaea0301eefb738c9deea725e6d53938004597cdc518a8cf9a7aa2f03"
+checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
 dependencies = [
  "proc-macro2 1.0.10",
  "quote 1.0.3",
@@ -1227,7 +1227,7 @@ checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 [[package]]
 name = "fork-tree"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1235,7 +1235,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1252,7 +1252,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-benchmarking",
  "parity-scale-codec",
@@ -1271,7 +1271,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1286,7 +1286,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "11.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1297,7 +1297,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "bitmask",
  "frame-metadata",
@@ -1321,7 +1321,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support-procedural-tools",
  "proc-macro2 1.0.10",
@@ -1332,7 +1332,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1344,7 +1344,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "proc-macro2 1.0.10",
  "quote 1.0.3",
@@ -1354,7 +1354,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1370,7 +1370,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -1892,9 +1892,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.13.4"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6081100e960d9d74734659ffc9cc91daf1c0fc7aceb8eaa94ee1a3f5046f2e"
+checksum = "96816e1d921eca64d208a85aab4f7798455a8e34229ee5a88c935bdee1b78b14"
 dependencies = [
  "bytes 0.5.4",
  "futures-channel",
@@ -1923,7 +1923,7 @@ dependencies = [
  "bytes 0.5.4",
  "ct-logs",
  "futures-util",
- "hyper 0.13.4",
+ "hyper 0.13.5",
  "log 0.4.8",
  "rustls",
  "rustls-native-certs",
@@ -3252,7 +3252,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3270,7 +3270,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3287,7 +3287,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3308,7 +3308,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3323,7 +3323,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3339,7 +3339,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3354,7 +3354,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3368,7 +3368,7 @@ dependencies = [
 [[package]]
 name = "pallet-finality-tracker"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3384,7 +3384,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3402,7 +3402,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -3418,7 +3418,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3437,7 +3437,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3453,7 +3453,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3467,7 +3467,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3481,7 +3481,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3496,7 +3496,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3509,7 +3509,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -3524,7 +3524,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3539,7 +3539,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3557,7 +3557,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3572,7 +3572,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3593,7 +3593,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.10",
@@ -3604,7 +3604,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3618,7 +3618,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3635,7 +3635,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3648,7 +3648,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -3666,7 +3666,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3679,7 +3679,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3693,7 +3693,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3708,7 +3708,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -3866,7 +3866,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.7.1",
+ "parking_lot_core 0.7.2",
 ]
 
 [[package]]
@@ -3886,9 +3886,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e136c1904604defe99ce5fd71a28d473fa60a12255d511aa78a9ddf11237aeb"
+checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
 dependencies = [
  "cfg-if",
  "cloudabi",
@@ -5042,9 +5042,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.3.6"
+version = "1.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3"
+checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -5219,7 +5219,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "bytes 0.5.4",
  "derive_more 0.99.5",
@@ -5246,7 +5246,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -5262,7 +5262,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "impl-trait-for-tuples",
  "sc-chain-spec-derive",
@@ -5278,7 +5278,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.10",
@@ -5289,7 +5289,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "ansi_term 0.12.1",
  "app_dirs",
@@ -5331,7 +5331,7 @@ dependencies = [
 [[package]]
 name = "sc-client"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "derive_more 0.99.5",
  "fnv",
@@ -5368,7 +5368,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "derive_more 0.99.5",
  "fnv",
@@ -5402,7 +5402,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -5432,7 +5432,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "derive_more 0.99.5",
  "fork-tree",
@@ -5474,7 +5474,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -5487,7 +5487,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "futures 0.3.4",
  "futures-timer 3.0.2",
@@ -5508,7 +5508,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "log 0.4.8",
  "sc-client-api",
@@ -5522,7 +5522,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "derive_more 0.99.5",
  "lazy_static",
@@ -5550,7 +5550,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "derive_more 0.99.5",
  "log 0.4.8",
@@ -5567,7 +5567,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "log 0.4.8",
  "parity-scale-codec",
@@ -5582,7 +5582,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "cranelift-codegen",
  "cranelift-wasm",
@@ -5603,7 +5603,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "assert_matches",
  "finality-grandpa",
@@ -5639,7 +5639,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.4",
@@ -5656,7 +5656,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "derive_more 0.99.5",
  "hex",
@@ -5671,7 +5671,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "bitflags",
  "bytes 0.5.4",
@@ -5723,7 +5723,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "futures 0.3.4",
  "futures-timer 3.0.2",
@@ -5739,7 +5739,7 @@ dependencies = [
 [[package]]
 name = "sc-network-test"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "env_logger 0.7.1",
  "futures 0.3.4",
@@ -5765,13 +5765,13 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "bytes 0.5.4",
  "fnv",
  "futures 0.3.4",
  "futures-timer 3.0.2",
- "hyper 0.13.4",
+ "hyper 0.13.5",
  "hyper-rustls",
  "log 0.4.8",
  "num_cpus",
@@ -5792,7 +5792,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "futures 0.3.4",
  "libp2p",
@@ -5805,7 +5805,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "futures 0.3.4",
  "hash-db",
@@ -5838,7 +5838,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "derive_more 0.99.5",
  "futures 0.3.4",
@@ -5862,7 +5862,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-http-server",
@@ -5877,7 +5877,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "derive_more 0.99.5",
  "exit-future",
@@ -5928,7 +5928,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "log 0.4.8",
  "parity-scale-codec",
@@ -5942,7 +5942,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "bytes 0.5.4",
  "futures 0.3.4",
@@ -5964,7 +5964,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "erased-serde",
  "log 0.4.8",
@@ -5979,7 +5979,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "derive_more 0.99.5",
  "futures 0.3.4",
@@ -5999,7 +5999,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "derive_more 0.99.5",
  "futures 0.3.4",
@@ -6384,7 +6384,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "derive_more 0.99.5",
  "log 0.4.8",
@@ -6396,7 +6396,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -6411,7 +6411,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -6423,7 +6423,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6435,7 +6435,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.11",
@@ -6449,7 +6449,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6461,7 +6461,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -6472,7 +6472,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6484,7 +6484,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "derive_more 0.99.5",
  "log 0.4.8",
@@ -6500,7 +6500,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "serde",
  "serde_json",
@@ -6509,7 +6509,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "derive_more 0.99.5",
  "futures 0.3.4",
@@ -6532,7 +6532,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6546,7 +6546,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6562,7 +6562,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -6574,7 +6574,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -6615,7 +6615,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "kvdb",
  "parking_lot 0.10.2",
@@ -6624,7 +6624,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "proc-macro2 1.0.10",
  "quote 1.0.3",
@@ -6634,7 +6634,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "environmental",
  "sp-std",
@@ -6644,7 +6644,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6657,7 +6657,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-tracker"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -6667,7 +6667,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "derive_more 0.99.5",
  "parity-scale-codec",
@@ -6679,7 +6679,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "futures 0.3.4",
  "hash-db",
@@ -6699,7 +6699,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -6710,7 +6710,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -6719,7 +6719,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "backtrace",
  "log 0.4.8",
@@ -6728,7 +6728,7 @@ dependencies = [
 [[package]]
 name = "sp-phragmen"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6740,7 +6740,7 @@ dependencies = [
 [[package]]
 name = "sp-phragmen-compact"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.10",
@@ -6751,7 +6751,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "serde",
  "sp-core",
@@ -6760,7 +6760,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "hash256-std-hasher",
  "impl-trait-for-tuples",
@@ -6781,7 +6781,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -6796,7 +6796,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -6808,7 +6808,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "serde",
  "serde_json",
@@ -6817,7 +6817,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -6828,7 +6828,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -6838,7 +6838,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "hash-db",
  "log 0.4.8",
@@ -6857,12 +6857,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 
 [[package]]
 name = "sp-storage"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "impl-serde 0.2.3",
  "ref-cast",
@@ -6874,7 +6874,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -6888,7 +6888,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "tracing",
 ]
@@ -6896,7 +6896,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "derive_more 0.99.5",
  "futures 0.3.4",
@@ -6911,7 +6911,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -6925,7 +6925,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "futures 0.3.4",
  "futures-core",
@@ -6936,7 +6936,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "impl-serde 0.2.3",
  "parity-scale-codec",
@@ -6948,7 +6948,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7076,7 +7076,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "chrono",
  "clear_on_drop",
@@ -7103,7 +7103,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "platforms",
 ]
@@ -7111,7 +7111,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.4",
@@ -7132,12 +7132,12 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "async-std",
  "derive_more 0.99.5",
  "futures-util",
- "hyper 0.13.4",
+ "hyper 0.13.5",
  "log 0.4.8",
  "prometheus",
  "tokio 0.2.18",
@@ -7146,7 +7146,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "futures 0.3.4",
  "hash-db",
@@ -7166,7 +7166,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "cfg-if",
  "frame-executive",
@@ -7205,7 +7205,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime-client"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 dependencies = [
  "futures 0.3.4",
  "parity-scale-codec",
@@ -7223,7 +7223,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder-runner"
 version = "1.0.5"
-source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
+source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44"
 
 [[package]]
 name = "substrate-wasm-builder-runner"
@@ -7379,9 +7379,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.13.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a0338198966bde7feb14b011a33d404a62a6e03b843352c71512a2a002634b7"
+checksum = "1cac193374347e7c263c5f547524f36ff8ec6702d56c8799c8331d26dffe8c1e"
 dependencies = [
  "cfg-if",
  "doc-comment",
@@ -7546,12 +7546,11 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.1.42"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
 dependencies = [
  "libc",
- "redox_syscall",
  "winapi 0.3.8",
 ]
 
@@ -8448,9 +8447,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa515c5163a99cc82bab70fd3bfdd36d827be85de63737b40fcef2ce084a436e"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 dependencies = [
  "winapi 0.3.8",
 ]
diff --git a/polkadot/runtime/common/src/attestations.rs b/polkadot/runtime/common/src/attestations.rs
index 848b0b0ce3b..5bc2e4867f1 100644
--- a/polkadot/runtime/common/src/attestations.rs
+++ b/polkadot/runtime/common/src/attestations.rs
@@ -25,7 +25,7 @@ use frame_support::{
 	decl_storage, decl_module, decl_error, ensure,
 	dispatch::DispatchResult,
 	traits::Get,
-	weights::{MINIMUM_WEIGHT, SimpleDispatchInfo},
+	weights::{MINIMUM_WEIGHT, DispatchClass},
 };
 
 use primitives::{Hash, parachain::{AttestedCandidate, AbridgedCandidateReceipt, Id as ParaId}};
@@ -134,7 +134,7 @@ decl_module! {
 		type Error = Error<T>;
 
 		/// Provide candidate receipts for parachains, in ascending order by id.
-		#[weight = SimpleDispatchInfo::FixedMandatory(MINIMUM_WEIGHT)]
+		#[weight = (MINIMUM_WEIGHT, DispatchClass::Mandatory)]
 		fn more_attestations(origin, _more: MoreAttestations) -> DispatchResult {
 			ensure_none(origin)?;
 			ensure!(!DidUpdate::exists(), Error::<T>::TooManyAttestations);
diff --git a/polkadot/runtime/common/src/claims.rs b/polkadot/runtime/common/src/claims.rs
index bf7b0f14cba..f54928db6a5 100644
--- a/polkadot/runtime/common/src/claims.rs
+++ b/polkadot/runtime/common/src/claims.rs
@@ -19,7 +19,6 @@
 use sp_std::prelude::*;
 use sp_io::{hashing::keccak_256, crypto::secp256k1_ecdsa_recover};
 use frame_support::{decl_event, decl_storage, decl_module, decl_error};
-use frame_support::weights::SimpleDispatchInfo;
 use frame_support::traits::{Currency, Get, VestingSchedule};
 use system::{ensure_root, ensure_none};
 use codec::{Encode, Decode};
@@ -184,7 +183,7 @@ decl_module! {
 		///
 		/// Total Complexity: O(1)
 		/// </weight>
-		#[weight = SimpleDispatchInfo::FixedNormal(1_000_000_000)]
+		#[weight = 1_000_000_000]
 		fn claim(origin, dest: T::AccountId, ethereum_signature: EcdsaSignature) {
 			ensure_none(origin)?;
 
@@ -231,7 +230,7 @@ decl_module! {
 		///
 		/// Total Complexity: O(1)
 		/// </weight>
-		#[weight = SimpleDispatchInfo::FixedNormal(30_000_000)]
+		#[weight = 30_000_000]
 		fn mint_claim(origin,
 			who: EthereumAddress,
 			value: BalanceOf<T>,
diff --git a/polkadot/runtime/common/src/crowdfund.rs b/polkadot/runtime/common/src/crowdfund.rs
index c4ca0a26024..fc8de552a3f 100644
--- a/polkadot/runtime/common/src/crowdfund.rs
+++ b/polkadot/runtime/common/src/crowdfund.rs
@@ -71,7 +71,7 @@ use frame_support::{
 	traits::{
 		Currency, Get, OnUnbalanced, WithdrawReason, ExistenceRequirement::AllowDeath
 	},
-	weights::{MINIMUM_WEIGHT, SimpleDispatchInfo},
+	weights::MINIMUM_WEIGHT,
 };
 use system::ensure_signed;
 use sp_runtime::{ModuleId,
@@ -250,7 +250,7 @@ decl_module! {
 		fn deposit_event() = default;
 
 		/// Create a new crowdfunding campaign for a parachain slot deposit for the current auction.
-		#[weight = SimpleDispatchInfo::FixedNormal(100_000_000)]
+		#[weight = 100_000_000]
 		fn create(origin,
 			#[compact] cap: BalanceOf<T>,
 			#[compact] first_slot: T::BlockNumber,
@@ -294,7 +294,7 @@ decl_module! {
 		/// Contribute to a crowd sale. This will transfer some balance over to fund a parachain
 		/// slot. It will be withdrawable in two instances: the parachain becomes retired; or the
 		/// slot is unable to be purchased and the timeout expires.
-		#[weight = SimpleDispatchInfo::FixedNormal(MINIMUM_WEIGHT)]
+		#[weight = MINIMUM_WEIGHT]
 		fn contribute(origin, #[compact] index: FundIndex, #[compact] value: BalanceOf<T>) {
 			let who = ensure_signed(origin)?;
 
@@ -353,7 +353,7 @@ decl_module! {
 		/// - `index` is the fund index that `origin` owns and whose deploy data will be set.
 		/// - `code_hash` is the hash of the parachain's Wasm validation function.
 		/// - `initial_head_data` is the parachain's initial head data.
-		#[weight = SimpleDispatchInfo::FixedNormal(MINIMUM_WEIGHT)]
+		#[weight = MINIMUM_WEIGHT]
 		fn fix_deploy_data(origin,
 			#[compact] index: FundIndex,
 			code_hash: T::Hash,
@@ -379,7 +379,7 @@ decl_module! {
 		///
 		/// - `index` is the fund index that `origin` owns and whose deploy data will be set.
 		/// - `para_id` is the parachain index that this fund won.
-		#[weight = SimpleDispatchInfo::FixedNormal(MINIMUM_WEIGHT)]
+		#[weight = MINIMUM_WEIGHT]
 		fn onboard(origin,
 			#[compact] index: FundIndex,
 			#[compact] para_id: ParaId
@@ -408,7 +408,7 @@ decl_module! {
 		}
 
 		/// Note that a successful fund has lost its parachain slot, and place it into retirement.
-		#[weight = SimpleDispatchInfo::FixedNormal(MINIMUM_WEIGHT)]
+		#[weight = MINIMUM_WEIGHT]
 		fn begin_retirement(origin, #[compact] index: FundIndex) {
 			let _ = ensure_signed(origin)?;
 
@@ -430,7 +430,7 @@ decl_module! {
 		}
 
 		/// Withdraw full balance of a contributor to an unsuccessful or off-boarded fund.
-		#[weight = SimpleDispatchInfo::FixedNormal(MINIMUM_WEIGHT)]
+		#[weight = MINIMUM_WEIGHT]
 		fn withdraw(origin, #[compact] index: FundIndex) {
 			let who = ensure_signed(origin)?;
 
@@ -461,7 +461,7 @@ decl_module! {
 		/// Remove a fund after either: it was unsuccessful and it timed out; or it was successful
 		/// but it has been retired from its parachain slot. This places any deposits that were not
 		/// withdrawn into the treasury.
-		#[weight = SimpleDispatchInfo::FixedNormal(MINIMUM_WEIGHT)]
+		#[weight = MINIMUM_WEIGHT]
 		fn dissolve(origin, #[compact] index: FundIndex) {
 			let _ = ensure_signed(origin)?;
 
diff --git a/polkadot/runtime/common/src/parachains.rs b/polkadot/runtime/common/src/parachains.rs
index 631f8d34ce4..33f19786397 100644
--- a/polkadot/runtime/common/src/parachains.rs
+++ b/polkadot/runtime/common/src/parachains.rs
@@ -35,8 +35,8 @@ use sp_staking::{
 };
 use frame_support::{
 	traits::KeyOwnerProofSystem,
-	dispatch::IsSubType,
-	weights::{SimpleDispatchInfo, Weight, MINIMUM_WEIGHT},
+	dispatch::{IsSubType},
+	weights::{DispatchClass, Weight, MINIMUM_WEIGHT},
 };
 use primitives::{
 	Balance,
@@ -571,7 +571,7 @@ decl_module! {
 		}
 
 		/// Provide candidate receipts for parachains, in ascending order by id.
-		#[weight = SimpleDispatchInfo::FixedMandatory(1_000_000_000)]
+		#[weight = (1_000_000_000, DispatchClass::Mandatory)]
 		pub fn set_heads(origin, heads: Vec<AttestedCandidate>) -> DispatchResult {
 			ensure_none(origin)?;
 			ensure!(!<DidUpdate>::exists(), Error::<T>::TooManyHeadUpdates);
@@ -651,7 +651,7 @@ decl_module! {
 		///
 		/// The weight is 0; in order to avoid DoS a `SignedExtension` validation
 		/// is implemented.
-		#[weight = SimpleDispatchInfo::FixedNormal(0)]
+		#[weight = 0]
 		pub fn report_double_vote(
 			origin,
 			report: DoubleVoteReport<
diff --git a/polkadot/runtime/common/src/registrar.rs b/polkadot/runtime/common/src/registrar.rs
index 8867e72842c..927095f0923 100644
--- a/polkadot/runtime/common/src/registrar.rs
+++ b/polkadot/runtime/common/src/registrar.rs
@@ -31,7 +31,7 @@ use sp_runtime::{
 use frame_support::{
 	decl_storage, decl_module, decl_event, decl_error, ensure,
 	dispatch::{DispatchResult, IsSubType}, traits::{Get, Currency, ReservableCurrency},
-	weights::{SimpleDispatchInfo, Weight, MINIMUM_WEIGHT},
+	weights::{DispatchClass, Weight, MINIMUM_WEIGHT},
 };
 use system::{self, ensure_root, ensure_signed};
 use primitives::parachain::{
@@ -264,7 +264,7 @@ decl_module! {
 		///
 		/// Unlike the `Registrar` trait function of the same name, this
 		/// checks the code and head data against size limits.
-		#[weight = SimpleDispatchInfo::FixedOperational(5_000_000_000)]
+		#[weight = (5_000_000_000, DispatchClass::Operational)]
 		pub fn register_para(origin,
 			#[compact] id: ParaId,
 			info: ParaInfo,
@@ -289,7 +289,7 @@ decl_module! {
 		}
 
 		/// Deregister a parachain with given id
-		#[weight = SimpleDispatchInfo::FixedOperational(10_000_000)]
+		#[weight = (10_000_000, DispatchClass::Operational)]
 		pub fn deregister_para(origin, #[compact] id: ParaId) -> DispatchResult {
 			ensure_root(origin)?;
 			<Self as Registrar<T::AccountId>>::deregister_para(id)
@@ -300,7 +300,7 @@ decl_module! {
 		/// - `count`: The number of parathreads.
 		///
 		/// Must be called from Root origin.
-		#[weight = SimpleDispatchInfo::FixedNormal(MINIMUM_WEIGHT)]
+		#[weight = MINIMUM_WEIGHT]
 		fn set_thread_count(origin, count: u32) {
 			ensure_root(origin)?;
 			ThreadCount::put(count);
@@ -314,7 +314,7 @@ decl_module! {
 		/// Unlike `register_para`, this function does check that the maximum code size
 		/// and head data size are respected, as parathread registration is an atomic
 		/// action.
-		#[weight = SimpleDispatchInfo::FixedNormal(MINIMUM_WEIGHT)]
+		#[weight = MINIMUM_WEIGHT]
 		fn register_parathread(origin,
 			code: ValidationCode,
 			initial_head_data: HeadData,
@@ -354,7 +354,7 @@ decl_module! {
 		/// This is a kind of special transaction that should be heavily prioritized in the
 		/// transaction pool according to the `value`; only `ThreadCount` of them may be presented
 		/// in any single block.
-		#[weight = SimpleDispatchInfo::FixedNormal(MINIMUM_WEIGHT)]
+		#[weight = MINIMUM_WEIGHT]
 		fn select_parathread(origin,
 			#[compact] _id: ParaId,
 			_collator: CollatorId,
@@ -371,7 +371,7 @@ decl_module! {
 		/// Ensure that before calling this that any funds you want emptied from the parathread's
 		/// account is moved out; after this it will be impossible to retrieve them (without
 		/// governance intervention).
-		#[weight = SimpleDispatchInfo::FixedNormal(MINIMUM_WEIGHT)]
+		#[weight = MINIMUM_WEIGHT]
 		fn deregister_parathread(origin) {
 			let id = parachains::ensure_parachain(<T as Trait>::Origin::from(origin))?;
 
@@ -395,7 +395,7 @@ decl_module! {
 		/// `ParaId` to be a long-term identifier of a notional "parachain". However, their
 		/// scheduling info (i.e. whether they're a parathread or parachain), auction information
 		/// and the auction deposit are switched.
-		#[weight = SimpleDispatchInfo::FixedNormal(MINIMUM_WEIGHT)]
+		#[weight = MINIMUM_WEIGHT]
 		fn swap(origin, #[compact] other: ParaId) {
 			let id = parachains::ensure_parachain(<T as Trait>::Origin::from(origin))?;
 
diff --git a/polkadot/runtime/common/src/slots.rs b/polkadot/runtime/common/src/slots.rs
index ba4c6fbd1eb..5bd3403b6ec 100644
--- a/polkadot/runtime/common/src/slots.rs
+++ b/polkadot/runtime/common/src/slots.rs
@@ -26,7 +26,7 @@ use codec::{Encode, Decode, Codec};
 use frame_support::{
 	decl_module, decl_storage, decl_event, decl_error, ensure, dispatch::DispatchResult,
 	traits::{Currency, ReservableCurrency, WithdrawReason, ExistenceRequirement, Get, Randomness},
-	weights::{MINIMUM_WEIGHT, SimpleDispatchInfo, Weight},
+	weights::{MINIMUM_WEIGHT, DispatchClass, Weight},
 };
 use primitives::parachain::{
 	SwapAux, PARACHAIN_INFO, Id as ParaId, ValidationCode, HeadData,
@@ -309,7 +309,7 @@ decl_module! {
 		/// This can only happen when there isn't already an auction in progress and may only be
 		/// called by the root origin. Accepts the `duration` of this auction and the
 		/// `lease_period_index` of the initial lease period of the four that are to be auctioned.
-		#[weight = SimpleDispatchInfo::FixedOperational(100_000_000)]
+		#[weight = (100_000_000, DispatchClass::Operational)]
 		pub fn new_auction(origin,
 			#[compact] duration: T::BlockNumber,
 			#[compact] lease_period_index: LeasePeriodOf<T>
@@ -344,7 +344,7 @@ decl_module! {
 		/// absolute lease period index value, not an auction-specific offset.
 		/// - `amount` is the amount to bid to be held as deposit for the parachain should the
 		/// bid win. This amount is held throughout the range.
-		#[weight = SimpleDispatchInfo::FixedNormal(500_000_000)]
+		#[weight = 500_000_000]
 		pub fn bid(origin,
 			#[compact] sub: SubId,
 			#[compact] auction_index: AuctionIndex,
@@ -372,7 +372,7 @@ decl_module! {
 		/// absolute lease period index value, not an auction-specific offset.
 		/// - `amount` is the amount to bid to be held as deposit for the parachain should the
 		/// bid win. This amount is held throughout the range.
-		#[weight = SimpleDispatchInfo::FixedNormal(500_000_000)]
+		#[weight = 500_000_000]
 		fn bid_renew(origin,
 			#[compact] auction_index: AuctionIndex,
 			#[compact] first_slot: LeasePeriodOf<T>,
@@ -391,7 +391,7 @@ decl_module! {
 		/// The origin *must* be a parachain account.
 		///
 		/// - `dest` is the destination account to receive the parachain's deposit.
-		#[weight = SimpleDispatchInfo::FixedNormal(1_000_000_000)]
+		#[weight = 1_000_000_000]
 		pub fn set_offboarding(origin, dest: <T::Lookup as StaticLookup>::Source) {
 			let who = ensure_signed(origin)?;
 			let dest = T::Lookup::lookup(dest)?;
@@ -407,7 +407,7 @@ decl_module! {
 		/// - `para_id` is the parachain ID allotted to the winning bidder.
 		/// - `code_hash` is the hash of the parachain's Wasm validation function.
 		/// - `initial_head_data` is the parachain's initial head data.
-		#[weight = SimpleDispatchInfo::FixedNormal(500_000_000)]
+		#[weight = 500_000_000]
 		pub fn fix_deploy_data(origin,
 			#[compact] sub: SubId,
 			#[compact] para_id: ParaId,
@@ -449,7 +449,7 @@ decl_module! {
 		/// - `_origin` is irrelevant.
 		/// - `para_id` is the parachain ID whose code will be elaborated.
 		/// - `code` is the preimage of the registered `code_hash` of `para_id`.
-		#[weight = SimpleDispatchInfo::FixedNormal(5_000_000_000)]
+		#[weight = 5_000_000_000]
 		pub fn elaborate_deploy_data(
 			_origin,
 			#[compact] para_id: ParaId,
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index 20883ff3003..94738af9e4c 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -41,7 +41,7 @@ use sp_runtime::{
 	curve::PiecewiseLinear,
 	traits::{
 		BlakeTwo256, Block as BlockT, SignedExtension, OpaqueKeys, ConvertInto, IdentityLookup,
-		DispatchInfoOf, StaticLookup, Extrinsic as ExtrinsicT, SaturatedConversion, Verify,
+		DispatchInfoOf, Extrinsic as ExtrinsicT, SaturatedConversion, Verify,
 	},
 };
 #[cfg(feature = "runtime-benchmarks")]
-- 
GitLab