diff --git a/Cargo.lock b/Cargo.lock
index 28e97cb6c6ef..6ec5dc057dfd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -268,7 +268,7 @@ dependencies = [
  "futures-lite",
  "multitask",
  "parking",
- "scoped-tls",
+ "scoped-tls 1.0.0",
  "waker-fn",
 ]
 
@@ -659,9 +659,12 @@ dependencies = [
 
 [[package]]
 name = "bytes"
-version = "0.5.6"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
+checksum = "118cf036fbb97d0816e3c34b2d7a1e8cfc60f68fcf63d550ddbe9bd5f59c213b"
+dependencies = [
+ "loom",
+]
 
 [[package]]
 name = "c_linked_list"
@@ -1482,7 +1485,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1490,7 +1493,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1508,7 +1511,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-benchmarking",
  "parity-scale-codec",
@@ -1526,7 +1529,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1541,7 +1544,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "11.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1552,7 +1555,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "bitmask",
  "frame-metadata",
@@ -1577,7 +1580,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support-procedural-tools",
  "proc-macro2 1.0.18",
@@ -1588,7 +1591,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1600,7 +1603,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "proc-macro2 1.0.18",
  "quote 1.0.7",
@@ -1610,7 +1613,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1626,7 +1629,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1640,7 +1643,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -1879,7 +1882,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "futures 0.3.5",
  "memchr",
  "pin-project",
@@ -1891,6 +1894,19 @@ version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
 
+[[package]]
+name = "generator"
+version = "0.6.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "add72f17bb81521258fcc8a7a3245b1e184e916bfbe34f0ea89558f440df5c68"
+dependencies = [
+ "cc",
+ "libc",
+ "log 0.4.11",
+ "rustc_version",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "generic-array"
 version = "0.12.3"
@@ -2026,7 +2042,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79b7246d7e4b979c03fa093da39cfb3617a96bbeee6310af63991668d7e843ff"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "fnv",
  "futures-core",
  "futures-sink",
@@ -2177,7 +2193,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "fnv",
  "itoa",
 ]
@@ -2200,7 +2216,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "http 0.2.1",
 ]
 
@@ -2255,7 +2271,7 @@ version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6e7655b9594024ad0ee439f3b5a7299369dc2a3f459b47c696f9ff676f9aa1f"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -2279,7 +2295,7 @@ version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "ct-logs",
  "futures-util",
  "hyper 0.13.6",
@@ -2783,7 +2799,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76c101edbb9c06955fd4085b77d2abc31cf3650134d77068b35c44967756ada8"
 dependencies = [
  "atomic",
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "futures 0.3.5",
  "lazy_static",
  "libp2p-core",
@@ -2907,7 +2923,7 @@ checksum = "0828b4f0c76c2edc68da574e391ce981bac5316d65785cddfe8c273d4c9bd4bb"
 dependencies = [
  "base64 0.11.0",
  "byteorder 1.3.4",
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "fnv",
  "futures 0.3.5",
  "futures_codec",
@@ -2948,7 +2964,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca9b4ccc868863317af3f65eb241811ceadd971d133183040140f5496037e0ae"
 dependencies = [
  "arrayvec 0.5.1",
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "either",
  "fnv",
  "futures 0.3.5",
@@ -2996,7 +3012,7 @@ version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df9e79541e71590846f773efce1b6d0538804992ee54ff2f407e05d63a9ddc23"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "fnv",
  "futures 0.3.5",
  "futures_codec",
@@ -3012,7 +3028,7 @@ version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0beba6459d06153f5f8e23da3df1d2183798b1f457c7c9468ff99760bcbcc60b"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "curve25519-dalek",
  "futures 0.3.5",
  "lazy_static",
@@ -3049,7 +3065,7 @@ version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3a61dfd53d1264ddff1206e4827193efaa72bab27782dfcd63c0dec120a1875"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "futures 0.3.5",
  "futures_codec",
  "libp2p-core",
@@ -3323,6 +3339,17 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "loom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ecc775857611e1df29abba5c41355cdf540e7e9d4acfdf0f355eefee82330b7"
+dependencies = [
+ "cfg-if",
+ "generator",
+ "scoped-tls 0.1.2",
+]
+
 [[package]]
 name = "lru"
 version = "0.4.3"
@@ -3573,7 +3600,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9157e87afbc2ef0d84cc0345423d715f445edde00141c93721c162de35a05e5"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "futures 0.3.5",
  "log 0.4.11",
  "pin-project",
@@ -3815,7 +3842,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3831,7 +3858,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3846,7 +3873,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3871,7 +3898,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3885,7 +3912,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3901,7 +3928,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3916,7 +3943,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3931,7 +3958,7 @@ dependencies = [
 [[package]]
 name = "pallet-finality-tracker"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3947,7 +3974,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3969,7 +3996,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -3985,7 +4012,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4005,7 +4032,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4021,7 +4048,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4035,7 +4062,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4050,7 +4077,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4064,7 +4091,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4079,7 +4106,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4100,7 +4127,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4115,7 +4142,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4128,7 +4155,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4143,7 +4170,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4158,7 +4185,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4178,7 +4205,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4194,7 +4221,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4208,7 +4235,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4230,7 +4257,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -4241,7 +4268,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4255,7 +4282,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4273,7 +4300,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4290,7 +4317,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4308,7 +4335,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -4321,7 +4348,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4336,7 +4363,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4352,7 +4379,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4380,9 +4407,9 @@ dependencies = [
 
 [[package]]
 name = "parity-multiaddr"
-version = "0.9.2"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2165a93382a93de55868dcbfa11e4a8f99676a9164eee6a2b4a9479ad319c257"
+checksum = "cc20af3143a62c16e7c9e92ea5c6ae49f7d271d97d4d8fe73afc28f0514a3d0f"
 dependencies = [
  "arrayref",
  "bs58",
@@ -5212,7 +5239,6 @@ name = "polkadot-rpc"
 version = "0.8.23"
 dependencies = [
  "jsonrpc-core",
- "jsonrpc-pubsub",
  "pallet-transaction-payment-rpc",
  "parity-scale-codec",
  "polkadot-primitives",
@@ -5864,7 +5890,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce49aefe0a6144a45de32927c77bd2859a5f7677b55f220ae5b744e87389c212"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "prost-derive",
 ]
 
@@ -5874,7 +5900,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02b10678c913ecbd69350e8535c3aef91a8676c0773fc1d7b95cdd196d7f2f26"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "heck",
  "itertools 0.8.2",
  "log 0.4.11",
@@ -5905,7 +5931,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1834f67c0697c001304b75be76f67add9c89742eda3a085ad8ee0bb38c3417aa"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "prost",
 ]
 
@@ -6540,9 +6566,9 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "derive_more 0.99.9",
  "either",
  "futures 0.3.5",
@@ -6568,7 +6594,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -6592,7 +6618,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -6609,7 +6635,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -6626,7 +6652,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -6637,7 +6663,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -6684,7 +6710,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "derive_more 0.99.9",
  "fnv",
@@ -6720,7 +6746,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -6750,7 +6776,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -6761,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "derive_more 0.99.9",
  "fork-tree",
@@ -6805,7 +6831,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -6829,7 +6855,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -6842,7 +6868,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -6865,7 +6891,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "log 0.4.11",
  "sc-client-api",
@@ -6879,7 +6905,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "derive_more 0.99.9",
  "lazy_static",
@@ -6907,7 +6933,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "derive_more 0.99.9",
  "log 0.4.11",
@@ -6924,7 +6950,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "log 0.4.11",
  "parity-scale-codec",
@@ -6939,14 +6965,14 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "log 0.4.11",
  "parity-scale-codec",
  "parity-wasm",
  "pwasm-utils",
  "sc-executor-common",
- "scoped-tls",
+ "scoped-tls 1.0.0",
  "sp-allocator",
  "sp-core",
  "sp-runtime-interface",
@@ -6957,7 +6983,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "derive_more 0.99.9",
  "finality-grandpa",
@@ -6994,7 +7020,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "derive_more 0.99.9",
  "finality-grandpa",
@@ -7016,7 +7042,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.5",
@@ -7034,7 +7060,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "derive_more 0.99.9",
  "hex",
@@ -7050,7 +7076,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -7069,13 +7095,13 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "async-std",
  "async-trait",
  "bitflags",
  "bs58",
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "derive_more 0.99.9",
  "either",
  "erased-serde",
@@ -7123,7 +7149,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -7138,9 +7164,9 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "fnv",
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -7165,7 +7191,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "futures 0.3.5",
  "libp2p",
@@ -7178,7 +7204,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "log 0.4.11",
  "substrate-prometheus-endpoint",
@@ -7187,7 +7213,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -7219,7 +7245,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -7243,7 +7269,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-http-server",
@@ -7259,7 +7285,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "derive_more 0.99.9",
  "directories",
@@ -7320,7 +7346,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "log 0.4.11",
  "parity-scale-codec",
@@ -7334,7 +7360,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -7355,7 +7381,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "erased-serde",
  "log 0.4.11",
@@ -7373,7 +7399,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -7394,7 +7420,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -7445,6 +7471,12 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "scoped-tls"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28"
+
 [[package]]
 name = "scoped-tls"
 version = "1.0.0"
@@ -7779,7 +7811,7 @@ dependencies = [
  "futures-util",
  "libc",
  "once_cell 1.4.0",
- "scoped-tls",
+ "scoped-tls 1.0.0",
  "slab",
  "socket2",
  "wepoll-sys-stjepang",
@@ -7849,7 +7881,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85457366ae0c6ce56bf05a958aef14cd38513c236568618edbcd9a8c52cb80b0"
 dependencies = [
  "base64 0.12.3",
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "flate2",
  "futures 0.3.5",
  "httparse",
@@ -7861,7 +7893,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "derive_more 0.99.9",
  "log 0.4.11",
@@ -7873,7 +7905,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -7888,7 +7920,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -7900,7 +7932,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -7912,7 +7944,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.12",
@@ -7925,7 +7957,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7937,7 +7969,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -7948,7 +7980,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7960,7 +7992,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "derive_more 0.99.9",
  "log 0.4.11",
@@ -7977,7 +8009,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "serde",
  "serde_json",
@@ -7986,7 +8018,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -8012,7 +8044,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -8031,7 +8063,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8040,7 +8072,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -8052,7 +8084,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -8096,7 +8128,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "kvdb",
  "parking_lot 0.10.2",
@@ -8105,7 +8137,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "proc-macro2 1.0.18",
  "quote 1.0.7",
@@ -8115,7 +8147,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8126,7 +8158,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "finality-grandpa",
  "log 0.4.11",
@@ -8142,7 +8174,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-tracker"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -8152,7 +8184,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "derive_more 0.99.9",
  "parity-scale-codec",
@@ -8164,7 +8196,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -8185,7 +8217,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -8196,7 +8228,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8208,7 +8240,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -8219,7 +8251,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -8229,7 +8261,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "backtrace",
  "log 0.4.11",
@@ -8238,7 +8270,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "serde",
  "sp-core",
@@ -8247,7 +8279,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -8269,7 +8301,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -8285,7 +8317,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -8297,7 +8329,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "serde",
  "serde_json",
@@ -8306,7 +8338,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8319,7 +8351,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8329,7 +8361,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "hash-db",
  "log 0.4.11",
@@ -8350,12 +8382,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 
 [[package]]
 name = "sp-storage"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8368,7 +8400,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8382,7 +8414,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "log 0.4.11",
  "rental",
@@ -8392,7 +8424,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -8407,7 +8439,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -8421,7 +8453,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "futures 0.3.5",
  "futures-core",
@@ -8433,7 +8465,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8445,7 +8477,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8586,7 +8618,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -8612,7 +8644,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "platforms",
 ]
@@ -8620,7 +8652,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.5",
@@ -8643,7 +8675,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "async-std",
  "derive_more 0.99.9",
@@ -8657,7 +8689,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "futures 0.1.29",
  "futures 0.3.5",
@@ -8683,7 +8715,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "2.0.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "futures 0.3.5",
  "substrate-test-utils-derive",
@@ -8693,7 +8725,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.8.0-rc6"
-source = "git+https://github.com/paritytech/substrate#5fa2fddec607f27de2b480feaeb2e068ac5f4f34"
+source = "git+https://github.com/paritytech/substrate#55d55f5a7265dcab630f3bba3c707a5252dad6fc"
 dependencies = [
  "proc-macro-crate",
  "quote 1.0.7",
@@ -8968,7 +9000,7 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d099fa27b9702bed751524694adbe393e18b36b204da91eb1cbbbbb4a5ee2d58"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "fnv",
  "futures-core",
  "iovec",
@@ -9227,7 +9259,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "futures-core",
  "futures-sink",
  "log 0.4.11",
@@ -9468,7 +9500,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "669d776983b692a906c881fcd0cfb34271a48e197e4d6cb8df32b05bfc3d3fa5"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 0.5.5",
  "futures-io",
  "futures-util",
  "futures_codec",
diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs
index 80bd0e240629..c8295c29c55c 100644
--- a/node/service/src/lib.rs
+++ b/node/service/src/lib.rs
@@ -158,7 +158,10 @@ fn new_partial<RuntimeApi, Executor>(config: &mut Configuration) -> Result<
 		consensus_common::DefaultImportQueue<Block, FullClient<RuntimeApi, Executor>>,
 		sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, Executor>>,
 		(
-			impl Fn(polkadot_rpc::DenyUnsafe, polkadot_rpc::SubscriptionManager) -> polkadot_rpc::RpcExtension,
+			impl Fn(
+				polkadot_rpc::DenyUnsafe,
+				polkadot_rpc::SubscriptionTaskExecutor,
+			) -> polkadot_rpc::RpcExtension,
 			(
 				babe::BabeBlockImport<
 					Block, FullClient<RuntimeApi, Executor>, FullGrandpaBlockImport<RuntimeApi, Executor>
@@ -245,7 +248,7 @@ fn new_partial<RuntimeApi, Executor>(config: &mut Configuration) -> Result<
 		let transaction_pool = transaction_pool.clone();
 		let select_chain = select_chain.clone();
 
-		move |deny_unsafe, subscriptions| -> polkadot_rpc::RpcExtension {
+		move |deny_unsafe, subscription_executor| -> polkadot_rpc::RpcExtension {
 			let deps = polkadot_rpc::FullDeps {
 				client: client.clone(),
 				pool: transaction_pool.clone(),
@@ -260,7 +263,7 @@ fn new_partial<RuntimeApi, Executor>(config: &mut Configuration) -> Result<
 					shared_voter_state: shared_voter_state.clone(),
 					shared_authority_set: shared_authority_set.clone(),
 					justification_stream: justification_stream.clone(),
-					subscriptions,
+					subscription_executor,
 				},
 			};
 
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index ed4aa0ac09e1..50b965060053 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -6,7 +6,6 @@ edition = "2018"
 
 [dependencies]
 jsonrpc-core = "14.0.3"
-jsonrpc-pubsub = "14.0.3"
 polkadot-primitives = { path = "../primitives" }
 sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master"  }
 sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master"  }
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index 4867e14f15d5..2714db4d3054 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -29,8 +29,7 @@ use sp_consensus_babe::BabeApi;
 use sc_client_api::light::{Fetcher, RemoteBlockchain};
 use sc_consensus_babe::Epoch;
 use sp_block_builder::BlockBuilder;
-pub use sc_rpc::DenyUnsafe;
-pub use jsonrpc_pubsub::manager::SubscriptionManager;
+pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor};
 
 /// A type representing all RPC extensions.
 pub type RpcExtension = jsonrpc_core::IoHandler<sc_rpc::Metadata>;
@@ -66,7 +65,7 @@ pub struct GrandpaDeps {
 	/// Receives notifications about justification events from Grandpa.
 	pub justification_stream: sc_finality_grandpa::GrandpaJustificationStream<Block>,
 	/// Subscription manager to keep track of pubsub subscribers.
-	pub subscriptions: jsonrpc_pubsub::manager::SubscriptionManager,
+	pub subscription_executor: sc_rpc::SubscriptionTaskExecutor,
 }
 
 /// Full client dependencies
@@ -120,7 +119,7 @@ pub fn create_full<C, P, SC>(deps: FullDeps<C, P, SC>) -> RpcExtension where
 		shared_voter_state,
 		shared_authority_set,
 		justification_stream,
-		subscriptions,
+		subscription_executor,
 	} = grandpa;
 
 	io.extend_with(
@@ -146,7 +145,7 @@ pub fn create_full<C, P, SC>(deps: FullDeps<C, P, SC>) -> RpcExtension where
 			shared_authority_set,
 			shared_voter_state,
 			justification_stream,
-			subscriptions,
+			subscription_executor,
 		))
 	);
 	io
diff --git a/service/src/lib.rs b/service/src/lib.rs
index e322f4ce8519..c79c9d1d5636 100644
--- a/service/src/lib.rs
+++ b/service/src/lib.rs
@@ -121,7 +121,10 @@ pub fn new_partial<RuntimeApi, Executor>(config: &mut Configuration, test: bool)
 		consensus_common::DefaultImportQueue<Block, FullClient<RuntimeApi, Executor>>,
 		sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, Executor>>,
 		(
-			impl Fn(polkadot_rpc::DenyUnsafe, polkadot_rpc::SubscriptionManager) -> polkadot_rpc::RpcExtension,
+			impl Fn(
+				polkadot_rpc::DenyUnsafe,
+				polkadot_rpc::SubscriptionTaskExecutor,
+			) -> polkadot_rpc::RpcExtension,
 			(
 				babe::BabeBlockImport<
 					Block, FullClient<RuntimeApi, Executor>, FullGrandpaBlockImport<RuntimeApi, Executor>
@@ -213,7 +216,7 @@ pub fn new_partial<RuntimeApi, Executor>(config: &mut Configuration, test: bool)
 		let transaction_pool = transaction_pool.clone();
 		let select_chain = select_chain.clone();
 
-		move |deny_unsafe, subscriptions| -> polkadot_rpc::RpcExtension {
+		move |deny_unsafe, subscription_executor| -> polkadot_rpc::RpcExtension {
 			let deps = polkadot_rpc::FullDeps {
 				client: client.clone(),
 				pool: transaction_pool.clone(),
@@ -228,7 +231,7 @@ pub fn new_partial<RuntimeApi, Executor>(config: &mut Configuration, test: bool)
 					shared_voter_state: shared_voter_state.clone(),
 					shared_authority_set: shared_authority_set.clone(),
 					justification_stream: justification_stream.clone(),
-					subscriptions,
+					subscription_executor,
 				},
 			};