diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index fa4eadac5e..cb7df47f3d 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -94,7 +94,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -238,7 +238,7 @@ dependencies = [
  "slab",
  "socket2",
  "waker-fn",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -273,7 +273,7 @@ dependencies = [
  "libc",
  "once_cell",
  "signal-hook",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -343,7 +343,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0de5164e5edbf51c45fb8c2d9664ae1c095cce1b265ecf7569093c0d66ef690"
 dependencies = [
- "bytes 1.1.0",
+ "bytes",
  "futures-sink",
  "futures-util",
  "memchr",
@@ -373,7 +373,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
  "hermit-abi",
  "libc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -433,7 +433,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "beefy-primitives",
  "fnv",
@@ -467,15 +467,12 @@ dependencies = [
 [[package]]
 name = "beefy-gadget-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "beefy-gadget",
  "beefy-primitives",
  "futures 0.3.21",
- "jsonrpc-core",
- "jsonrpc-core-client",
- "jsonrpc-derive",
- "jsonrpc-pubsub",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.0",
@@ -490,12 +487,12 @@ dependencies = [
 [[package]]
 name = "beefy-merkle-tree"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 
 [[package]]
 name = "beefy-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -901,16 +898,6 @@ version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
-[[package]]
-name = "bytes"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
-dependencies = [
- "byteorder",
- "iovec",
-]
-
 [[package]]
 name = "bytes"
 version = "1.1.0"
@@ -1036,7 +1023,7 @@ dependencies = [
  "num-integer",
  "num-traits",
  "time",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -1651,7 +1638,7 @@ checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
 dependencies = [
  "libc",
  "redox_users 0.3.5",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -1662,7 +1649,7 @@ checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
 dependencies = [
  "libc",
  "redox_users 0.4.0",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -1673,7 +1660,7 @@ checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
 dependencies = [
  "libc",
  "redox_users 0.4.0",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -1912,7 +1899,7 @@ checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
 dependencies = [
  "errno-dragonfly",
  "libc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -2014,7 +2001,7 @@ checksum = "f5aa1e3ae159e592ad222dc90c5acbad632b527779ba88486abe92782ab268bd"
 dependencies = [
  "expander 0.0.4",
  "indexmap",
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn",
@@ -2091,7 +2078,7 @@ dependencies = [
  "cc",
  "lazy_static",
  "libc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -2149,7 +2136,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2161,13 +2148,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
 dependencies = [
  "matches",
- "percent-encoding 2.1.0",
+ "percent-encoding",
 ]
 
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2189,7 +2176,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "Inflector",
  "chrono",
@@ -2239,9 +2226,9 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn",
@@ -2250,7 +2237,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -2266,7 +2253,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2294,7 +2281,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2324,7 +2311,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -2336,10 +2323,10 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-support-procedural-tools-derive",
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn",
@@ -2348,7 +2335,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2358,7 +2345,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-support",
  "frame-support-test-pallet",
@@ -2381,7 +2368,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test-pallet"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2392,7 +2379,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-support",
  "log",
@@ -2409,7 +2396,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2424,7 +2411,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2433,7 +2420,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-support",
  "sp-api",
@@ -2456,7 +2443,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "libloading 0.5.2",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -2466,7 +2453,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
 dependencies = [
  "libc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -2475,22 +2462,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
 
-[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -2613,7 +2584,6 @@ version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
 dependencies = [
- "futures 0.1.31",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -2629,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "generate-bags"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "chrono",
  "frame-election-provider-support",
@@ -2715,7 +2685,7 @@ dependencies = [
  "libc",
  "libgit2-sys",
  "log",
- "url 2.2.2",
+ "url",
 ]
 
 [[package]]
@@ -2767,7 +2737,7 @@ version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9f1f717ddc7b2ba36df7e871fd88db79326551d3d6f1fc406fbfd28b582ff8e"
 dependencies = [
- "bytes 1.1.0",
+ "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
@@ -2919,7 +2889,7 @@ checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
 dependencies = [
  "libc",
  "match_cfg",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -2928,7 +2898,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b"
 dependencies = [
- "bytes 1.1.0",
+ "bytes",
  "fnv",
  "itoa 0.4.8",
 ]
@@ -2939,7 +2909,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
 dependencies = [
- "bytes 1.1.0",
+ "bytes",
  "http",
  "pin-project-lite 0.2.7",
 ]
@@ -2977,7 +2947,7 @@ version = "0.14.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2"
 dependencies = [
- "bytes 1.1.0",
+ "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -3018,24 +2988,13 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
- "bytes 1.1.0",
+ "bytes",
  "hyper",
  "native-tls",
  "tokio",
  "tokio-native-tls",
 ]
 
-[[package]]
-name = "idna"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
 [[package]]
 name = "idna"
 version = "0.2.3"
@@ -3054,7 +3013,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9"
 dependencies = [
  "libc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -3151,15 +3110,6 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6"
 
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "ip_network"
 version = "0.4.1"
@@ -3174,7 +3124,7 @@ checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98"
 dependencies = [
  "socket2",
  "widestring",
- "winapi 0.3.9",
+ "winapi",
  "winreg 0.7.0",
 ]
 
@@ -3223,157 +3173,28 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "jsonrpc-client-transports"
-version = "18.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a"
-dependencies = [
- "derive_more",
- "futures 0.3.21",
- "jsonrpc-core",
- "jsonrpc-pubsub",
- "log",
- "serde",
- "serde_json",
- "url 1.7.2",
-]
-
-[[package]]
-name = "jsonrpc-core"
-version = "18.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"
-dependencies = [
- "futures 0.3.21",
- "futures-executor",
- "futures-util",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
-[[package]]
-name = "jsonrpc-core-client"
-version = "18.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0"
-dependencies = [
- "futures 0.3.21",
- "jsonrpc-client-transports",
-]
-
-[[package]]
-name = "jsonrpc-derive"
-version = "18.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b939a78fa820cdfcb7ee7484466746a7377760970f6f9c6fe19f9edcc8a38d2"
-dependencies = [
- "proc-macro-crate 0.1.5",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "jsonrpc-http-server"
-version = "18.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff"
-dependencies = [
- "futures 0.3.21",
- "hyper",
- "jsonrpc-core",
- "jsonrpc-server-utils",
- "log",
- "net2",
- "parking_lot 0.11.2",
- "unicase",
-]
-
-[[package]]
-name = "jsonrpc-ipc-server"
-version = "18.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "382bb0206323ca7cda3dcd7e245cea86d37d02457a02a975e3378fb149a48845"
-dependencies = [
- "futures 0.3.21",
- "jsonrpc-core",
- "jsonrpc-server-utils",
- "log",
- "parity-tokio-ipc",
- "parking_lot 0.11.2",
- "tower-service",
-]
-
-[[package]]
-name = "jsonrpc-pubsub"
-version = "18.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011"
-dependencies = [
- "futures 0.3.21",
- "jsonrpc-core",
- "lazy_static",
- "log",
- "parking_lot 0.11.2",
- "rand 0.7.3",
- "serde",
-]
-
-[[package]]
-name = "jsonrpc-server-utils"
-version = "18.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4"
-dependencies = [
- "bytes 1.1.0",
- "futures 0.3.21",
- "globset",
- "jsonrpc-core",
- "lazy_static",
- "log",
- "tokio",
- "tokio-stream",
- "tokio-util 0.6.9",
- "unicase",
-]
-
-[[package]]
-name = "jsonrpc-ws-server"
-version = "18.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f892c7d766369475ab7b0669f417906302d7c0fb521285c0a0c92e52e7c8e946"
-dependencies = [
- "futures 0.3.21",
- "jsonrpc-core",
- "jsonrpc-server-utils",
- "log",
- "parity-ws",
- "parking_lot 0.11.2",
- "slab",
-]
-
 [[package]]
 name = "jsonrpsee"
-version = "0.10.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91dc760c341fa81173f9a434931aaf32baad5552b0230cc6c93e8fb7eaad4c19"
+checksum = "ad6f9ff3481f3069c92474b697c104502f7e9191d29b34bfa38ae9a19415f1cd"
 dependencies = [
  "jsonrpsee-core",
+ "jsonrpsee-http-server",
  "jsonrpsee-proc-macros",
  "jsonrpsee-types",
  "jsonrpsee-ws-client",
+ "jsonrpsee-ws-server",
+ "tracing",
 ]
 
 [[package]]
 name = "jsonrpsee-client-transport"
-version = "0.10.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765f7a36d5087f74e3b3b47805c2188fef8eb54afcb587b078d9f8ebfe9c7220"
+checksum = "4358e100faf43b2f3b7b0ecf0ad4ce3e6275fe12fda8428dedda2979751dd184"
 dependencies = [
- "futures 0.3.21",
+ "futures-util",
  "http",
  "jsonrpsee-core",
  "jsonrpsee-types",
@@ -3390,18 +3211,22 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.10.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82ef77ecd20c2254d54f5da8c0738eacca61e6b6511268a8f2753e3148c6c706"
+checksum = "8e1d26ab3868749d6f716345a5fbd3334a100c0709fe464bd9189ee9d78adcde"
 dependencies = [
  "anyhow",
  "arrayvec 0.7.2",
+ "async-lock",
  "async-trait",
  "beef",
  "futures-channel",
+ "futures-timer",
  "futures-util",
  "hyper",
  "jsonrpsee-types",
+ "parking_lot 0.12.0",
+ "rand 0.8.5",
  "rustc-hash",
  "serde",
  "serde_json",
@@ -3412,12 +3237,31 @@ dependencies = [
 ]
 
 [[package]]
-name = "jsonrpsee-proc-macros"
-version = "0.10.1"
+name = "jsonrpsee-http-server"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7291c72805bc7d413b457e50d8ef3e87aa554da65ecbbc278abb7dfc283e7f0"
+checksum = "ee87f19a7a01a55248fc4b4861d822331c4fd60151d99e7ac9c6771999132671"
 dependencies = [
- "proc-macro-crate 1.1.3",
+ "futures-channel",
+ "futures-util",
+ "globset",
+ "hyper",
+ "jsonrpsee-core",
+ "jsonrpsee-types",
+ "lazy_static",
+ "serde_json",
+ "tokio",
+ "tracing",
+ "unicase",
+]
+
+[[package]]
+name = "jsonrpsee-proc-macros"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b75da57d54817577801c2f7a1b638610819dfd86f0470c21a2af81b06eb41ba6"
+dependencies = [
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn",
@@ -3425,9 +3269,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.10.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b6aa52f322cbf20c762407629b8300f39bcc0cf0619840d9252a2f65fd2dd9"
+checksum = "f5fe5a629443d17a30ff564881ba68881a710fd7eb02a538087b0bc51cb4962c"
 dependencies = [
  "anyhow",
  "beef",
@@ -3439,15 +3283,32 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-ws-client"
-version = "0.10.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd66d18bab78d956df24dd0d2e41e4c00afbb818fda94a98264bdd12ce8506ac"
+checksum = "ba31eb2b9a4b73d8833f53fe55e579516289f8b31adb6104b3dbc629755acf7d"
 dependencies = [
  "jsonrpsee-client-transport",
  "jsonrpsee-core",
  "jsonrpsee-types",
 ]
 
+[[package]]
+name = "jsonrpsee-ws-server"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "179fe584af5c0145f922c581770d073c661a514ae6cdfa5b1a0bce41fdfdf646"
+dependencies = [
+ "futures-channel",
+ "futures-util",
+ "jsonrpsee-core",
+ "jsonrpsee-types",
+ "serde_json",
+ "soketto",
+ "tokio",
+ "tokio-util 0.7.1",
+ "tracing",
+]
+
 [[package]]
 name = "k256"
 version = "0.10.4"
@@ -3466,16 +3327,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
 
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
 [[package]]
 name = "kusama-runtime"
 version = "0.9.19"
@@ -3676,7 +3527,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
 dependencies = [
  "cc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -3686,7 +3537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "afe203d669ec979b7128619bae5a63b7b42e9203c1b29146079ee05e2f604b52"
 dependencies = [
  "cfg-if 1.0.0",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -3702,7 +3553,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "475ce2ac4a9727e53a519f6ee05b38abfcba8f0d39c4d24f103d184e36fd5b0f"
 dependencies = [
  "atomic",
- "bytes 1.1.0",
+ "bytes",
  "futures 0.3.21",
  "futures-timer",
  "getrandom 0.2.3",
@@ -3846,7 +3697,7 @@ dependencies = [
  "asynchronous-codec",
  "base64",
  "byteorder",
- "bytes 1.1.0",
+ "bytes",
  "fnv",
  "futures 0.3.21",
  "hex_fmt",
@@ -3890,7 +3741,7 @@ checksum = "564e6bd64d177446399ed835b9451a8825b07929d6daa6a94e6405592974725e"
 dependencies = [
  "arrayvec 0.5.2",
  "asynchronous-codec",
- "bytes 1.1.0",
+ "bytes",
  "either",
  "fnv",
  "futures 0.3.21",
@@ -3954,7 +3805,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "442eb0c9fff0bf22a34f015724b4143ce01877e079ed0963c722d94c07c72160"
 dependencies = [
  "asynchronous-codec",
- "bytes 1.1.0",
+ "bytes",
  "futures 0.3.21",
  "libp2p-core",
  "log",
@@ -3971,7 +3822,7 @@ version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9dd7e0c94051cda67123be68cf6b65211ba3dde7277be9068412de3e7ffd63ef"
 dependencies = [
- "bytes 1.1.0",
+ "bytes",
  "curve25519-dalek 3.2.0",
  "futures 0.3.21",
  "lazy_static",
@@ -4010,7 +3861,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "962c0fb0e7212fb96a69b87f2d09bcefd317935239bdc79cda900e7a8897a3fe"
 dependencies = [
  "asynchronous-codec",
- "bytes 1.1.0",
+ "bytes",
  "futures 0.3.21",
  "libp2p-core",
  "log",
@@ -4041,7 +3892,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3aa754cb7bccef51ebc3c458c6bbcef89d83b578a9925438389be841527d408f"
 dependencies = [
  "asynchronous-codec",
- "bytes 1.1.0",
+ "bytes",
  "either",
  "futures 0.3.21",
  "futures-timer",
@@ -4090,7 +3941,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e6a6fc6c9ad95661f46989473b34bd2993d14a4de497ff3b2668a910d4b869"
 dependencies = [
  "async-trait",
- "bytes 1.1.0",
+ "bytes",
  "futures 0.3.21",
  "instant",
  "libp2p-core",
@@ -4188,7 +4039,7 @@ dependencies = [
  "quicksink",
  "rw-stream-sink",
  "soketto",
- "url 2.2.2",
+ "url",
  "webpki-roots",
 ]
 
@@ -4445,7 +4296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
 dependencies = [
  "libc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -4564,25 +4415,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "mio"
-version = "0.6.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
-dependencies = [
- "cfg-if 0.1.10",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
- "libc",
- "log",
- "miow 0.2.2",
- "net2",
- "slab",
- "winapi 0.2.8",
-]
-
 [[package]]
 name = "mio"
 version = "0.8.2"
@@ -4591,34 +4423,10 @@ checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"
 dependencies = [
  "libc",
  "log",
- "miow 0.3.7",
+ "miow",
  "ntapi",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "mio-extras"
-version = "2.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
-dependencies = [
- "lazycell",
- "log",
- "mio 0.6.23",
- "slab",
-]
-
-[[package]]
-name = "miow"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
-dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
+ "winapi",
 ]
 
 [[package]]
@@ -4627,7 +4435,7 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -4647,11 +4455,11 @@ dependencies = [
  "byteorder",
  "data-encoding",
  "multihash",
- "percent-encoding 2.1.0",
+ "percent-encoding",
  "serde",
  "static_assertions",
  "unsigned-varint",
- "url 2.2.2",
+ "url",
 ]
 
 [[package]]
@@ -4688,7 +4496,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd"
 dependencies = [
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -4708,7 +4516,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "363a84be6453a70e63513660f4894ef815daf88e3356bffcda9ca27d810ce83b"
 dependencies = [
- "bytes 1.1.0",
+ "bytes",
  "futures 0.3.21",
  "log",
  "pin-project 1.0.10",
@@ -4778,17 +4586,6 @@ dependencies = [
  "tempfile",
 ]
 
-[[package]]
-name = "net2"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "netlink-packet-core"
 version = "0.4.2"
@@ -4833,7 +4630,7 @@ version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef8785b8141e8432aa45fceb922a7e876d7da3fad37fa7e7ec702ace3aa0826b"
 dependencies = [
- "bytes 1.1.0",
+ "bytes",
  "futures 0.3.21",
  "log",
  "netlink-packet-core",
@@ -4848,7 +4645,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e4c9f9547a08241bee7b6558b9b98e1f290d187de8b7cfca2bbb4937bcaa8f8"
 dependencies = [
  "async-io",
- "bytes 1.1.0",
+ "bytes",
  "futures 0.3.21",
  "libc",
  "log",
@@ -4921,7 +4718,7 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -5090,7 +4887,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -5111,7 +4908,7 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4"
 [[package]]
 name = "pallet-assets"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5125,7 +4922,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5141,7 +4938,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5156,7 +4953,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5180,7 +4977,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5200,7 +4997,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list-remote-tests"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-election-provider-support",
  "frame-support",
@@ -5214,13 +5011,12 @@ dependencies = [
  "sp-std",
  "sp-storage",
  "sp-tracing",
- "tokio",
 ]
 
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5235,7 +5031,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "beefy-primitives",
  "frame-support",
@@ -5251,7 +5047,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "beefy-merkle-tree",
  "beefy-primitives",
@@ -5274,7 +5070,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5356,7 +5152,7 @@ dependencies = [
 [[package]]
 name = "pallet-child-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5375,7 +5171,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5392,7 +5188,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5408,7 +5204,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5431,7 +5227,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5444,7 +5240,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5462,7 +5258,7 @@ dependencies = [
 [[package]]
 name = "pallet-gilt"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5477,7 +5273,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5500,7 +5296,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5516,7 +5312,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5536,7 +5332,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5553,7 +5349,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5570,7 +5366,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "ckb-merkle-mountain-range",
  "frame-benchmarking",
@@ -5588,11 +5384,9 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
- "jsonrpc-core",
- "jsonrpc-core-client",
- "jsonrpc-derive",
+ "jsonrpsee",
  "parity-scale-codec",
  "serde",
  "sp-api",
@@ -5605,7 +5399,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5620,7 +5414,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5634,7 +5428,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5649,7 +5443,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-benchmarking"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5668,7 +5462,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5685,7 +5479,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5708,7 +5502,7 @@ dependencies = [
 [[package]]
 name = "pallet-preimage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5724,7 +5518,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5739,7 +5533,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5754,7 +5548,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5770,7 +5564,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5791,7 +5585,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5807,7 +5601,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5821,7 +5615,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5844,9 +5638,9 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn",
@@ -5855,7 +5649,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -5864,7 +5658,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5878,7 +5672,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5896,7 +5690,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5915,7 +5709,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5932,11 +5726,9 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
- "jsonrpc-core",
- "jsonrpc-core-client",
- "jsonrpc-derive",
+ "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec",
  "sp-api",
@@ -5949,7 +5741,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5960,7 +5752,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5977,7 +5769,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5993,7 +5785,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6091,7 +5883,7 @@ version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8"
 dependencies = [
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn",
@@ -6103,20 +5895,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f"
 
-[[package]]
-name = "parity-tokio-ipc"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6"
-dependencies = [
- "futures 0.3.21",
- "libc",
- "log",
- "rand 0.7.3",
- "tokio",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "parity-util-mem"
 version = "0.11.0"
@@ -6132,7 +5910,7 @@ dependencies = [
  "smallvec",
  "tikv-jemalloc-ctl",
  "tikv-jemallocator",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -6161,24 +5939,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92"
 
-[[package]]
-name = "parity-ws"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5983d3929ad50f12c3eb9a6743f19d691866ecd44da74c0a3308c3f8a56df0c6"
-dependencies = [
- "byteorder",
- "bytes 0.4.12",
- "httparse",
- "log",
- "mio 0.6.23",
- "mio-extras",
- "rand 0.7.3",
- "sha-1 0.8.2",
- "slab",
- "url 2.2.2",
-]
-
 [[package]]
 name = "parking"
 version = "2.0.0"
@@ -6217,7 +5977,7 @@ dependencies = [
  "libc",
  "redox_syscall 0.2.10",
  "smallvec",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -6263,12 +6023,6 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
-[[package]]
-name = "percent-encoding"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
-
 [[package]]
 name = "percent-encoding"
 version = "2.1.0"
@@ -6703,7 +6457,7 @@ dependencies = [
  "always-assert",
  "assert_matches",
  "async-trait",
- "bytes 1.1.0",
+ "bytes",
  "futures 0.3.21",
  "futures-timer",
  "parity-scale-codec",
@@ -7272,7 +7026,7 @@ version = "0.9.19"
 dependencies = [
  "assert_matches",
  "expander 0.0.6",
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn",
@@ -7354,7 +7108,7 @@ version = "0.9.19"
 dependencies = [
  "beefy-gadget",
  "beefy-gadget-rpc",
- "jsonrpc-core",
+ "jsonrpsee",
  "pallet-mmr-rpc",
  "pallet-transaction-payment-rpc",
  "polkadot-primitives",
@@ -7941,7 +7695,7 @@ dependencies = [
  "libc",
  "log",
  "wepoll-ffi",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -8022,9 +7776,9 @@ dependencies = [
 
 [[package]]
 name = "pretty_assertions"
-version = "1.0.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0cfe1b2403f172ba0f234e500906ee0a3e493fb81092dac23ebefe129301cc"
+checksum = "c89f989ac94207d048d92db058e4f6ec7342b0971fc58d1271ca148b799b3563"
 dependencies = [
  "ansi_term",
  "ctor",
@@ -8059,15 +7813,6 @@ dependencies = [
  "uint",
 ]
 
-[[package]]
-name = "proc-macro-crate"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
-dependencies = [
- "toml",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "1.1.3"
@@ -8165,7 +7910,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
 dependencies = [
- "bytes 1.1.0",
+ "bytes",
  "prost-derive",
 ]
 
@@ -8175,7 +7920,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5"
 dependencies = [
- "bytes 1.1.0",
+ "bytes",
  "heck 0.3.3",
  "itertools",
  "lazy_static",
@@ -8208,7 +7953,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
 dependencies = [
- "bytes 1.1.0",
+ "bytes",
  "prost",
 ]
 
@@ -8518,7 +8263,7 @@ dependencies = [
  "bitflags",
  "libc",
  "mach",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -8543,7 +8288,7 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "env_logger 0.9.0",
  "jsonrpsee",
@@ -8563,7 +8308,7 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -8573,7 +8318,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb"
 dependencies = [
  "base64",
- "bytes 1.1.0",
+ "bytes",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -8588,14 +8333,14 @@ dependencies = [
  "log",
  "mime",
  "native-tls",
- "percent-encoding 2.1.0",
+ "percent-encoding",
  "pin-project-lite 0.2.7",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "tokio",
  "tokio-native-tls",
- "url 2.2.2",
+ "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -8641,7 +8386,7 @@ dependencies = [
  "spin",
  "untrusted",
  "web-sys",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -8748,7 +8493,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb"
 dependencies = [
  "libc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -8816,7 +8561,7 @@ dependencies = [
  "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -8921,7 +8666,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "log",
  "sp-core",
@@ -8932,7 +8677,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -8959,7 +8704,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -8982,7 +8727,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -8998,7 +8743,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "impl-trait-for-tuples",
  "memmap2 0.5.0",
@@ -9015,9 +8760,9 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn",
@@ -9026,7 +8771,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "chrono",
  "clap",
@@ -9065,7 +8810,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "fnv",
  "futures 0.3.21",
@@ -9093,7 +8838,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -9118,7 +8863,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -9142,7 +8887,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -9185,12 +8930,10 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "futures 0.3.21",
- "jsonrpc-core",
- "jsonrpc-core-client",
- "jsonrpc-derive",
+ "jsonrpsee",
  "sc-consensus-babe",
  "sc-consensus-epochs",
  "sc-rpc-api",
@@ -9209,7 +8952,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -9222,7 +8965,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -9247,7 +8990,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "sc-client-api",
  "sp-authorship",
@@ -9258,7 +9001,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "lazy_static",
  "lru 0.7.5",
@@ -9285,7 +9028,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -9302,7 +9045,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9317,7 +9060,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -9335,7 +9078,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "ahash",
  "async-trait",
@@ -9375,14 +9118,11 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "finality-grandpa",
  "futures 0.3.21",
- "jsonrpc-core",
- "jsonrpc-core-client",
- "jsonrpc-derive",
- "jsonrpc-pubsub",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "sc-client-api",
@@ -9399,7 +9139,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "ansi_term",
  "futures 0.3.21",
@@ -9416,7 +9156,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "async-trait",
  "hex",
@@ -9431,12 +9171,12 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "async-trait",
  "asynchronous-codec",
  "bitflags",
- "bytes 1.1.0",
+ "bytes",
  "cid",
  "either",
  "fnv",
@@ -9482,7 +9222,7 @@ dependencies = [
 [[package]]
 name = "sc-network-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "futures 0.3.21",
  "libp2p",
@@ -9495,7 +9235,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "ahash",
  "futures 0.3.21",
@@ -9512,7 +9252,7 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "bitflags",
  "either",
@@ -9541,9 +9281,9 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
- "bytes 1.1.0",
+ "bytes",
  "fnv",
  "futures 0.3.21",
  "futures-timer",
@@ -9569,7 +9309,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "futures 0.3.21",
  "libp2p",
@@ -9582,7 +9322,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -9591,12 +9331,11 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "futures 0.3.21",
  "hash-db",
- "jsonrpc-core",
- "jsonrpc-pubsub",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.0",
@@ -9622,13 +9361,10 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "futures 0.3.21",
- "jsonrpc-core",
- "jsonrpc-core-client",
- "jsonrpc-derive",
- "jsonrpc-pubsub",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.0",
@@ -9648,14 +9384,10 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "futures 0.3.21",
- "jsonrpc-core",
- "jsonrpc-http-server",
- "jsonrpc-ipc-server",
- "jsonrpc-pubsub",
- "jsonrpc-ws-server",
+ "jsonrpsee",
  "log",
  "serde_json",
  "substrate-prometheus-endpoint",
@@ -9665,7 +9397,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "async-trait",
  "directories",
@@ -9673,8 +9405,7 @@ dependencies = [
  "futures 0.3.21",
  "futures-timer",
  "hash-db",
- "jsonrpc-core",
- "jsonrpc-pubsub",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "parity-util-mem",
@@ -9731,7 +9462,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9745,11 +9476,9 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
- "jsonrpc-core",
- "jsonrpc-core-client",
- "jsonrpc-derive",
+ "jsonrpsee",
  "parity-scale-codec",
  "sc-chain-spec",
  "sc-client-api",
@@ -9766,7 +9495,7 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "futures 0.3.21",
  "libc",
@@ -9785,7 +9514,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "chrono",
  "futures 0.3.21",
@@ -9803,7 +9532,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "ansi_term",
  "atty",
@@ -9834,9 +9563,9 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn",
@@ -9845,7 +9574,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -9872,7 +9601,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "futures 0.3.21",
  "log",
@@ -9885,7 +9614,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -9915,7 +9644,7 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4260c630e8a8a33429d1688eff2f163f24c65a4e1b1578ef6b565061336e4b6f"
 dependencies = [
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn",
@@ -9928,7 +9657,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
 dependencies = [
  "lazy_static",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -10340,7 +10069,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
 dependencies = [
  "libc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -10350,7 +10079,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2"
 dependencies = [
  "base64",
- "bytes 1.1.0",
+ "bytes",
  "flate2",
  "futures 0.3.21",
  "httparse",
@@ -10362,7 +10091,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "hash-db",
  "log",
@@ -10379,10 +10108,10 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "blake2",
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn",
@@ -10391,7 +10120,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10404,7 +10133,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -10419,7 +10148,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10432,7 +10161,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10444,7 +10173,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -10456,7 +10185,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "futures 0.3.21",
  "log",
@@ -10474,7 +10203,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -10493,7 +10222,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "async-trait",
  "merlin",
@@ -10516,7 +10245,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10530,7 +10259,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10543,7 +10272,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "base58",
  "bitflags",
@@ -10589,7 +10318,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "blake2",
  "byteorder",
@@ -10603,7 +10332,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10614,7 +10343,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.0",
@@ -10623,7 +10352,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10633,7 +10362,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -10644,7 +10373,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -10662,7 +10391,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -10676,7 +10405,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "futures 0.3.21",
  "hash-db",
@@ -10701,7 +10430,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -10712,7 +10441,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -10729,7 +10458,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "thiserror",
  "zstd",
@@ -10738,7 +10467,7 @@ dependencies = [
 [[package]]
 name = "sp-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -10753,7 +10482,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10767,7 +10496,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -10777,7 +10506,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -10787,7 +10516,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -10797,7 +10526,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -10819,7 +10548,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -10836,10 +10565,10 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "Inflector",
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn",
@@ -10848,7 +10577,7 @@ dependencies = [
 [[package]]
 name = "sp-sandbox"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -10862,7 +10591,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "serde",
  "serde_json",
@@ -10871,7 +10600,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10885,7 +10614,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10896,7 +10625,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "hash-db",
  "log",
@@ -10918,12 +10647,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 
 [[package]]
 name = "sp-storage"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -10936,7 +10665,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "log",
  "sp-core",
@@ -10949,7 +10678,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "async-trait",
  "futures-timer",
@@ -10965,7 +10694,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -10977,7 +10706,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -10986,7 +10715,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "async-trait",
  "log",
@@ -11002,7 +10731,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -11018,7 +10747,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -11035,7 +10764,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -11046,7 +10775,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "impl-trait-for-tuples",
  "log",
@@ -11238,7 +10967,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "platforms",
 ]
@@ -11246,18 +10975,17 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.21",
- "jsonrpc-core",
- "jsonrpc-core-client",
- "jsonrpc-derive",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "sc-client-api",
  "sc-rpc-api",
  "sc-transaction-pool-api",
+ "serde_json",
  "sp-api",
  "sp-block-builder",
  "sp-blockchain",
@@ -11268,7 +10996,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "futures-util",
  "hyper",
@@ -11281,11 +11009,9 @@ dependencies = [
 [[package]]
 name = "substrate-state-trie-migration-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
- "jsonrpc-core",
- "jsonrpc-core-client",
- "jsonrpc-derive",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "sc-client-api",
@@ -11304,7 +11030,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -11330,7 +11056,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "futures 0.3.21",
  "substrate-test-utils-derive",
@@ -11340,9 +11066,9 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn",
@@ -11351,7 +11077,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "ansi_term",
  "build-helper",
@@ -11469,7 +11195,7 @@ dependencies = [
  "rand 0.8.5",
  "redox_syscall 0.2.10",
  "remove_dir_all",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -11480,7 +11206,7 @@ checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
 dependencies = [
  "byteorder",
  "dirs",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -11709,7 +11435,7 @@ checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
 dependencies = [
  "libc",
  "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -11761,10 +11487,10 @@ version = "1.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dce653fb475565de9f6fb0614b28bca8df2c430c0cf84bcd9c843f15de5414cc"
 dependencies = [
- "bytes 1.1.0",
+ "bytes",
  "libc",
  "memchr",
- "mio 0.8.2",
+ "mio",
  "num_cpus",
  "once_cell",
  "parking_lot 0.12.0",
@@ -11772,7 +11498,7 @@ dependencies = [
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -11818,17 +11544,6 @@ dependencies = [
  "webpki 0.22.0",
 ]
 
-[[package]]
-name = "tokio-stream"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3"
-dependencies = [
- "futures-core",
- "pin-project-lite 0.2.7",
- "tokio",
-]
-
 [[package]]
 name = "tokio-tungstenite"
 version = "0.17.1"
@@ -11847,7 +11562,7 @@ version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0"
 dependencies = [
- "bytes 1.1.0",
+ "bytes",
  "futures-core",
  "futures-sink",
  "log",
@@ -11861,7 +11576,7 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764"
 dependencies = [
- "bytes 1.1.0",
+ "bytes",
  "futures-core",
  "futures-io",
  "futures-sink",
@@ -11944,7 +11659,7 @@ version = "0.9.19"
 dependencies = [
  "assert_matches",
  "expander 0.0.6",
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn",
@@ -12049,7 +11764,7 @@ dependencies = [
  "futures-channel",
  "futures-io",
  "futures-util",
- "idna 0.2.3",
+ "idna",
  "ipnet",
  "lazy_static",
  "log",
@@ -12057,7 +11772,7 @@ dependencies = [
  "smallvec",
  "thiserror",
  "tinyvec",
- "url 2.2.2",
+ "url",
 ]
 
 [[package]]
@@ -12088,7 +11803,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#43d8c8787ded25dab5db55af5ab65f5d5882a51b"
+source = "git+https://github.com/paritytech/substrate?branch=master#e0ccd008fe8bfaf29357ea87561e60f3baaae08c"
 dependencies = [
  "clap",
  "jsonrpsee",
@@ -12140,14 +11855,14 @@ checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5"
 dependencies = [
  "base64",
  "byteorder",
- "bytes 1.1.0",
+ "bytes",
  "http",
  "httparse",
  "log",
  "rand 0.8.5",
  "sha-1 0.10.0",
  "thiserror",
- "url 2.2.2",
+ "url",
  "utf-8",
 ]
 
@@ -12246,7 +11961,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836"
 dependencies = [
  "asynchronous-codec",
- "bytes 1.1.0",
+ "bytes",
  "futures-io",
  "futures-util",
 ]
@@ -12257,17 +11972,6 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
-[[package]]
-name = "url"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
-dependencies = [
- "idna 0.1.5",
- "matches",
- "percent-encoding 1.0.1",
-]
-
 [[package]]
 name = "url"
 version = "2.2.2"
@@ -12275,9 +11979,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
 dependencies = [
  "form_urlencoded",
- "idna 0.2.3",
+ "idna",
  "matches",
- "percent-encoding 2.1.0",
+ "percent-encoding",
 ]
 
 [[package]]
@@ -12352,7 +12056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
 dependencies = [
  "same-file",
- "winapi 0.3.9",
+ "winapi",
  "winapi-util",
 ]
 
@@ -12546,7 +12250,7 @@ dependencies = [
  "wasmtime-environ",
  "wasmtime-jit",
  "wasmtime-runtime",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -12565,7 +12269,7 @@ dependencies = [
  "serde",
  "sha2 0.9.8",
  "toml",
- "winapi 0.3.9",
+ "winapi",
  "zstd",
 ]
 
@@ -12634,7 +12338,7 @@ dependencies = [
  "wasmtime-environ",
  "wasmtime-jit-debug",
  "wasmtime-runtime",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -12670,7 +12374,7 @@ dependencies = [
  "thiserror",
  "wasmtime-environ",
  "wasmtime-jit-debug",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -12853,12 +12557,6 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
 
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -12869,12 +12567,6 @@ dependencies = [
  "winapi-x86_64-pc-windows-gnu",
 ]
 
-[[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
@@ -12887,7 +12579,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -12988,7 +12680,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -12997,17 +12689,7 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
 dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
+ "winapi",
 ]
 
 [[package]]
@@ -13224,7 +12906,7 @@ dependencies = [
  "tokio",
  "tokio-tungstenite",
  "tracing-gum",
- "url 2.2.2",
+ "url",
 ]
 
 [[package]]
diff --git a/polkadot/node/metrics/src/tests.rs b/polkadot/node/metrics/src/tests.rs
index 50dc2cf711..56e07d9628 100644
--- a/polkadot/node/metrics/src/tests.rs
+++ b/polkadot/node/metrics/src/tests.rs
@@ -25,7 +25,7 @@ use std::collections::HashMap;
 
 const DEFAULT_PROMETHEUS_PORT: u16 = 9616;
 
-#[substrate_test_utils::test]
+#[substrate_test_utils::test(flavor = "multi_thread")]
 async fn runtime_can_publish_metrics() {
 	let mut alice_config =
 		node_config(|| {}, tokio::runtime::Handle::current(), Alice, Vec::new(), true);
diff --git a/polkadot/node/network/protocol/Cargo.toml b/polkadot/node/network/protocol/Cargo.toml
index 313e76a910..e3c766bc58 100644
--- a/polkadot/node/network/protocol/Cargo.toml
+++ b/polkadot/node/network/protocol/Cargo.toml
@@ -21,4 +21,4 @@ rand = "0.8"
 derive_more = "0.99"
 
 [dev-dependencies]
-rand_chacha = "0.3.1"
\ No newline at end of file
+rand_chacha = "0.3.1"
diff --git a/polkadot/node/service/Cargo.toml b/polkadot/node/service/Cargo.toml
index 48fb246232..1acec72b81 100644
--- a/polkadot/node/service/Cargo.toml
+++ b/polkadot/node/service/Cargo.toml
@@ -199,4 +199,4 @@ runtime-metrics = [
 	"polkadot-runtime-parachains/runtime-metrics"
 ]
 
-staging-client = ["polkadot-node-core-provisioner/staging-client"]
\ No newline at end of file
+staging-client = ["polkadot-node-core-provisioner/staging-client"]
diff --git a/polkadot/node/service/src/lib.rs b/polkadot/node/service/src/lib.rs
index 810b0b61aa..312d8f760d 100644
--- a/polkadot/node/service/src/lib.rs
+++ b/polkadot/node/service/src/lib.rs
@@ -444,7 +444,10 @@ fn new_partial<RuntimeApi, ExecutorDispatch, ChainSelection>(
 		sc_consensus::DefaultImportQueue<Block, FullClient<RuntimeApi, ExecutorDispatch>>,
 		sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, ExecutorDispatch>>,
 		(
-			impl service::RpcExtensionBuilder,
+			impl Fn(
+				polkadot_rpc::DenyUnsafe,
+				polkadot_rpc::SubscriptionTaskExecutor,
+			) -> Result<polkadot_rpc::RpcExtension, SubstrateServiceError>,
 			(
 				babe::BabeBlockImport<
 					Block,
@@ -938,7 +941,7 @@ where
 		client: client.clone(),
 		keystore: keystore_container.sync_keystore(),
 		network: network.clone(),
-		rpc_extensions_builder: Box::new(rpc_extensions_builder),
+		rpc_builder: Box::new(rpc_extensions_builder),
 		transaction_pool: transaction_pool.clone(),
 		task_manager: &mut task_manager,
 		system_rpc_tx,
diff --git a/polkadot/node/test/service/src/lib.rs b/polkadot/node/test/service/src/lib.rs
index c1a381e100..e268e375dc 100644
--- a/polkadot/node/test/service/src/lib.rs
+++ b/polkadot/node/test/service/src/lib.rs
@@ -190,9 +190,13 @@ pub fn node_config(
 		rpc_ws: None,
 		rpc_ipc: None,
 		rpc_max_payload: None,
+		rpc_max_request_size: None,
+		rpc_max_response_size: None,
 		rpc_ws_max_connections: None,
 		rpc_cors: None,
 		rpc_methods: Default::default(),
+		rpc_id_provider: None,
+		rpc_max_subs_per_conn: None,
 		ws_max_out_buffer_capacity: None,
 		prometheus_config: None,
 		telemetry_endpoints: None,
diff --git a/polkadot/node/test/service/tests/build-blocks.rs b/polkadot/node/test/service/tests/build-blocks.rs
index 2cbc332e52..6f7951a077 100644
--- a/polkadot/node/test/service/tests/build-blocks.rs
+++ b/polkadot/node/test/service/tests/build-blocks.rs
@@ -18,7 +18,7 @@ use futures::{future, pin_mut, select, FutureExt};
 use polkadot_test_service::*;
 use sp_keyring::Sr25519Keyring;
 
-#[substrate_test_utils::test]
+#[substrate_test_utils::test(flavor = "multi_thread")]
 async fn ensure_test_service_build_blocks() {
 	let mut builder = sc_cli::LoggerBuilder::new("");
 	builder.with_colors(false);
diff --git a/polkadot/node/test/service/tests/call-function.rs b/polkadot/node/test/service/tests/call-function.rs
index 97c722bfbc..5c149766c6 100644
--- a/polkadot/node/test/service/tests/call-function.rs
+++ b/polkadot/node/test/service/tests/call-function.rs
@@ -17,7 +17,7 @@
 use polkadot_test_service::*;
 use sp_keyring::Sr25519Keyring::{Alice, Bob, Charlie};
 
-#[substrate_test_utils::test]
+#[substrate_test_utils::test(flavor = "multi_thread")]
 async fn call_function_actually_work() {
 	let alice_config =
 		node_config(|| {}, tokio::runtime::Handle::current(), Alice, Vec::new(), true);
@@ -30,7 +30,7 @@ async fn call_function_actually_work() {
 	});
 	let output = alice.send_extrinsic(function, Bob).await.unwrap();
 
-	let res = output.result.expect("return value expected");
+	let res = output.result;
 	let json = serde_json::from_str::<serde_json::Value>(res.as_str()).expect("valid JSON");
 	let object = json.as_object().expect("JSON is an object");
 	assert!(object.contains_key("jsonrpc"), "key jsonrpc exists");
diff --git a/polkadot/parachain/test-parachains/adder/collator/tests/integration.rs b/polkadot/parachain/test-parachains/adder/collator/tests/integration.rs
index cb04fc9427..c8ef0a40b2 100644
--- a/polkadot/parachain/test-parachains/adder/collator/tests/integration.rs
+++ b/polkadot/parachain/test-parachains/adder/collator/tests/integration.rs
@@ -20,7 +20,8 @@
 const PUPPET_EXE: &str = env!("CARGO_BIN_EXE_adder_collator_puppet_worker");
 
 // If this test is failing, make sure to run all tests with the `real-overseer` feature being enabled.
-#[substrate_test_utils::test]
+
+#[substrate_test_utils::test(flavor = "multi_thread")]
 async fn collating_using_adder_collator() {
 	use polkadot_primitives::v2::Id as ParaId;
 	use sp_keyring::AccountKeyring::*;
diff --git a/polkadot/parachain/test-parachains/undying/collator/tests/integration.rs b/polkadot/parachain/test-parachains/undying/collator/tests/integration.rs
index 1adbe4e5db..cf00ffa351 100644
--- a/polkadot/parachain/test-parachains/undying/collator/tests/integration.rs
+++ b/polkadot/parachain/test-parachains/undying/collator/tests/integration.rs
@@ -20,7 +20,7 @@
 const PUPPET_EXE: &str = env!("CARGO_BIN_EXE_undying_collator_puppet_worker");
 
 // If this test is failing, make sure to run all tests with the `real-overseer` feature being enabled.
-#[substrate_test_utils::test]
+#[substrate_test_utils::test(flavor = "multi_thread")]
 async fn collating_using_undying_collator() {
 	use polkadot_primitives::v2::Id as ParaId;
 	use sp_keyring::AccountKeyring::*;
diff --git a/polkadot/rpc/Cargo.toml b/polkadot/rpc/Cargo.toml
index 1ba2e5af1d..df916609d4 100644
--- a/polkadot/rpc/Cargo.toml
+++ b/polkadot/rpc/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 
 [dependencies]
-jsonrpc-core = "18.0.0"
+jsonrpsee = { version = "0.12.0", features = ["server"] }
 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/polkadot/rpc/src/lib.rs b/polkadot/rpc/src/lib.rs
index dffff5ac1b..3082b0f97f 100644
--- a/polkadot/rpc/src/lib.rs
+++ b/polkadot/rpc/src/lib.rs
@@ -20,12 +20,12 @@
 
 use std::sync::Arc;
 
+use jsonrpsee::RpcModule;
 use polkadot_primitives::v2::{AccountId, Balance, Block, BlockNumber, Hash, Nonce};
 use sc_client_api::AuxStore;
 use sc_consensus_babe::Epoch;
 use sc_finality_grandpa::FinalityProofProvider;
 pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor};
-use sc_sync_state_rpc::{SyncStateRpcApi, SyncStateRpcHandler};
 use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
@@ -35,7 +35,7 @@ use sp_keystore::SyncCryptoStorePtr;
 use txpool_api::TransactionPool;
 
 /// A type representing all RPC extensions.
-pub type RpcExtension = jsonrpc_core::IoHandler<sc_rpc::Metadata>;
+pub type RpcExtension = RpcModule<()>;
 
 /// Extra dependencies for BABE.
 pub struct BabeDeps {
@@ -115,13 +115,16 @@ where
 	B: sc_client_api::Backend<Block> + Send + Sync + 'static,
 	B::State: sc_client_api::StateBackend<sp_runtime::traits::HashFor<Block>>,
 {
-	use frame_rpc_system::{FullSystem, SystemApi};
-	use pallet_mmr_rpc::{Mmr, MmrApi};
-	use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi};
-	use sc_consensus_babe_rpc::BabeRpcHandler;
-	use sc_finality_grandpa_rpc::{GrandpaApi, GrandpaRpcHandler};
+	use beefy_gadget_rpc::{BeefyApiServer, BeefyRpcHandler};
+	use frame_rpc_system::{SystemApiServer, SystemRpc};
+	use pallet_mmr_rpc::{MmrApiServer, MmrRpc};
+	use pallet_transaction_payment_rpc::{TransactionPaymentApiServer, TransactionPaymentRpc};
+	use sc_consensus_babe_rpc::{BabeApiServer, BabeRpc};
+	use sc_finality_grandpa_rpc::{GrandpaApiServer, GrandpaRpc};
+	use sc_sync_state_rpc::{SyncStateRpc, SyncStateRpcApiServer};
+	use substrate_state_trie_migration_rpc::StateMigrationApiServer;
 
-	let mut io = jsonrpc_core::IoHandler::default();
+	let mut io = RpcModule::new(());
 	let FullDeps { client, pool, select_chain, chain_spec, deny_unsafe, babe, grandpa, beefy } =
 		deps;
 	let BabeDeps { keystore, babe_config, shared_epoch_changes } = babe;
@@ -133,41 +136,47 @@ where
 		finality_provider,
 	} = grandpa;
 
-	io.extend_with(substrate_state_trie_migration_rpc::StateMigrationApi::to_delegate(
-		substrate_state_trie_migration_rpc::MigrationRpc::new(client.clone(), backend, deny_unsafe),
-	));
-
-	io.extend_with(SystemApi::to_delegate(FullSystem::new(client.clone(), pool, deny_unsafe)));
-	io.extend_with(TransactionPaymentApi::to_delegate(TransactionPayment::new(client.clone())));
-	io.extend_with(MmrApi::to_delegate(Mmr::new(client.clone())));
-	io.extend_with(sc_consensus_babe_rpc::BabeApi::to_delegate(BabeRpcHandler::new(
-		client.clone(),
-		shared_epoch_changes.clone(),
-		keystore,
-		babe_config,
-		select_chain,
-		deny_unsafe,
-	)));
-	io.extend_with(GrandpaApi::to_delegate(GrandpaRpcHandler::new(
-		shared_authority_set.clone(),
-		shared_voter_state,
-		justification_stream,
-		subscription_executor,
-		finality_provider,
-	)));
-	io.extend_with(SyncStateRpcApi::to_delegate(SyncStateRpcHandler::new(
-		chain_spec,
-		client,
-		shared_authority_set,
-		shared_epoch_changes,
-	)?));
-
-	let handler: beefy_gadget_rpc::BeefyRpcHandler<Block> = beefy_gadget_rpc::BeefyRpcHandler::new(
-		beefy.beefy_commitment_stream,
-		beefy.beefy_best_block_stream,
-		beefy.subscription_executor,
+	io.merge(
+		substrate_state_trie_migration_rpc::MigrationRpc::new(client.clone(), backend, deny_unsafe)
+			.into_rpc(),
+	)?;
+	io.merge(SystemRpc::new(client.clone(), pool.clone(), deny_unsafe).into_rpc())?;
+	io.merge(TransactionPaymentRpc::new(client.clone()).into_rpc())?;
+	io.merge(MmrRpc::new(client.clone()).into_rpc())?;
+	io.merge(
+		BabeRpc::new(
+			client.clone(),
+			shared_epoch_changes.clone(),
+			keystore,
+			babe_config,
+			select_chain,
+			deny_unsafe,
+		)
+		.into_rpc(),
+	)?;
+	io.merge(
+		GrandpaRpc::new(
+			subscription_executor,
+			shared_authority_set.clone(),
+			shared_voter_state,
+			justification_stream,
+			finality_provider,
+		)
+		.into_rpc(),
+	)?;
+	io.merge(
+		SyncStateRpc::new(chain_spec, client, shared_authority_set, shared_epoch_changes)?
+			.into_rpc(),
+	)?;
+
+	io.merge(
+		BeefyRpcHandler::<Block>::new(
+			beefy.beefy_commitment_stream,
+			beefy.beefy_best_block_stream,
+			beefy.subscription_executor,
+		)?
+		.into_rpc(),
 	)?;
-	io.extend_with(beefy_gadget_rpc::BeefyApi::to_delegate(handler));
 
 	Ok(io)
 }
diff --git a/polkadot/runtime/parachains/Cargo.toml b/polkadot/runtime/parachains/Cargo.toml
index 25f83a5a97..68dc82cce2 100644
--- a/polkadot/runtime/parachains/Cargo.toml
+++ b/polkadot/runtime/parachains/Cargo.toml
@@ -109,4 +109,4 @@ try-runtime = [
 	"pallet-vesting/try-runtime",
 ]
 runtime-metrics = ["sp-tracing/with-tracing", "polkadot-runtime-metrics/runtime-metrics"]
-vstaging = []
\ No newline at end of file
+vstaging = []
diff --git a/polkadot/tests/benchmark_block_works.rs b/polkadot/tests/benchmark_block_works.rs
index 8a3b0de3e4..0994fae675 100644
--- a/polkadot/tests/benchmark_block_works.rs
+++ b/polkadot/tests/benchmark_block_works.rs
@@ -22,7 +22,12 @@ use nix::{
 	sys::signal::{kill, Signal::SIGINT},
 	unistd::Pid,
 };
-use std::{path::Path, process::Command, result::Result, time::Duration};
+use std::{
+	path::Path,
+	process::{self, Command},
+	result::Result,
+	time::Duration,
+};
 use tempfile::tempdir;
 
 pub mod common;
@@ -47,6 +52,8 @@ async fn benchmark_block_works() {
 /// Builds a chain with one block for the given runtime and base path.
 async fn build_chain(runtime: &str, base_path: &Path) -> Result<(), String> {
 	let mut cmd = Command::new(cargo_bin("polkadot"))
+		.stdout(process::Stdio::piped())
+		.stderr(process::Stdio::piped())
 		.args(["--chain", &runtime, "--force-authoring", "--alice"])
 		.arg("-d")
 		.arg(base_path)
@@ -55,8 +62,10 @@ async fn build_chain(runtime: &str, base_path: &Path) -> Result<(), String> {
 		.spawn()
 		.unwrap();
 
+	let (ws_url, _) = common::find_ws_url_from_output(cmd.stderr.take().unwrap());
+
 	// Wait for the chain to produce one block.
-	let ok = common::wait_n_finalized_blocks(1, Duration::from_secs(60)).await;
+	let ok = common::wait_n_finalized_blocks(1, Duration::from_secs(60), &ws_url).await;
 	// Send SIGINT to node.
 	kill(Pid::from_raw(cmd.id().try_into().unwrap()), SIGINT).unwrap();
 	// Wait for the node to handle it and exit.
diff --git a/polkadot/tests/common.rs b/polkadot/tests/common.rs
index 7dd36f31d6..6c6450f6db 100644
--- a/polkadot/tests/common.rs
+++ b/polkadot/tests/common.rs
@@ -17,14 +17,13 @@
 use polkadot_core_primitives::Block;
 use remote_externalities::rpc_api::get_finalized_head;
 use std::{
+	io::{BufRead, BufReader, Read},
 	process::{Child, ExitStatus},
 	thread,
 	time::Duration,
 };
 use tokio::time::timeout;
 
-static LOCALHOST_WS: &str = "ws://127.0.0.1:9944/";
-
 /// Wait for the given `child` the given amount of `secs`.
 ///
 /// Returns the `Some(exit status)` or `None` if the process did not finish in the given time.
@@ -46,8 +45,9 @@ pub fn wait_for(child: &mut Child, secs: usize) -> Option<ExitStatus> {
 pub async fn wait_n_finalized_blocks(
 	n: usize,
 	timeout_duration: Duration,
+	url: &str,
 ) -> Result<(), tokio::time::error::Elapsed> {
-	timeout(timeout_duration, wait_n_finalized_blocks_from(n, LOCALHOST_WS)).await
+	timeout(timeout_duration, wait_n_finalized_blocks_from(n, url)).await
 }
 
 /// Wait for at least `n` blocks to be finalized from a specified node.
@@ -65,3 +65,32 @@ async fn wait_n_finalized_blocks_from(n: usize, url: &str) {
 		interval.tick().await;
 	}
 }
+
+/// Read the WS address from the output.
+///
+/// This is hack to get the actual binded sockaddr because
+/// polkadot assigns a random port if the specified port was already binded.
+///
+/// You must call `Command::new("cmd").stdout(process::Stdio::piped()).stderr(process::Stdio::piped())`
+/// for this to work.
+pub fn find_ws_url_from_output(read: impl Read + Send) -> (String, String) {
+	let mut data = String::new();
+
+	let ws_url = BufReader::new(read)
+		.lines()
+		.find_map(|line| {
+			let line = line.expect("failed to obtain next line from stdout for port discovery");
+
+			data.push_str(&line);
+
+			// does the line contain our port (we expect this specific output from substrate).
+			let sock_addr = match line.split_once("Running JSON-RPC WS server: addr=") {
+				None => return None,
+				Some((_, after)) => after.split_once(",").unwrap().0,
+			};
+
+			Some(format!("ws://{}", sock_addr))
+		})
+		.expect("We should get a WebSocket address");
+	(ws_url, data)
+}
diff --git a/polkadot/tests/purge_chain_works.rs b/polkadot/tests/purge_chain_works.rs
index 3e72a2e68e..c69d8cc4a8 100644
--- a/polkadot/tests/purge_chain_works.rs
+++ b/polkadot/tests/purge_chain_works.rs
@@ -15,7 +15,10 @@
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
 use assert_cmd::cargo::cargo_bin;
-use std::{process::Command, time::Duration};
+use std::{
+	process::{self, Command},
+	time::Duration,
+};
 use tempfile::tempdir;
 
 pub mod common;
@@ -31,6 +34,8 @@ async fn purge_chain_rocksdb_works() {
 	let tmpdir = tempdir().expect("could not create temp dir");
 
 	let mut cmd = Command::new(cargo_bin("polkadot"))
+		.stdout(process::Stdio::piped())
+		.stderr(process::Stdio::piped())
 		.args(&["--dev", "-d"])
 		.arg(tmpdir.path())
 		.arg("--port")
@@ -39,8 +44,12 @@ async fn purge_chain_rocksdb_works() {
 		.spawn()
 		.unwrap();
 
+	let (ws_url, _) = common::find_ws_url_from_output(cmd.stderr.take().unwrap());
+
 	// Let it produce 1 block.
-	common::wait_n_finalized_blocks(1, Duration::from_secs(60)).await.unwrap();
+	common::wait_n_finalized_blocks(1, Duration::from_secs(60), &ws_url)
+		.await
+		.unwrap();
 
 	// Send SIGINT to node.
 	kill(Pid::from_raw(cmd.id().try_into().unwrap()), SIGINT).unwrap();
@@ -75,6 +84,8 @@ async fn purge_chain_paritydb_works() {
 	let tmpdir = tempdir().expect("could not create temp dir");
 
 	let mut cmd = Command::new(cargo_bin("polkadot"))
+		.stdout(process::Stdio::piped())
+		.stderr(process::Stdio::piped())
 		.args(&["--dev", "-d"])
 		.arg(tmpdir.path())
 		.arg("--database")
@@ -83,8 +94,12 @@ async fn purge_chain_paritydb_works() {
 		.spawn()
 		.unwrap();
 
+	let (ws_url, _) = common::find_ws_url_from_output(cmd.stderr.take().unwrap());
+
 	// Let it produce 1 block.
-	common::wait_n_finalized_blocks(1, Duration::from_secs(60)).await.unwrap();
+	common::wait_n_finalized_blocks(1, Duration::from_secs(60), &ws_url)
+		.await
+		.unwrap();
 
 	// Send SIGINT to node.
 	kill(Pid::from_raw(cmd.id().try_into().unwrap()), SIGINT).unwrap();
diff --git a/polkadot/tests/running_the_node_and_interrupt.rs b/polkadot/tests/running_the_node_and_interrupt.rs
index f55e4e4c9e..895db534bc 100644
--- a/polkadot/tests/running_the_node_and_interrupt.rs
+++ b/polkadot/tests/running_the_node_and_interrupt.rs
@@ -15,7 +15,10 @@
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
 use assert_cmd::cargo::cargo_bin;
-use std::{process::Command, time::Duration};
+use std::{
+	process::{self, Command},
+	time::Duration,
+};
 use tempfile::tempdir;
 
 pub mod common;
@@ -35,21 +38,27 @@ async fn running_the_node_works_and_can_be_interrupted() {
 		let tmpdir = tempdir().expect("coult not create temp dir");
 
 		let mut cmd = Command::new(cargo_bin("polkadot"))
+			.stdout(process::Stdio::piped())
+			.stderr(process::Stdio::piped())
 			.args(&["--dev", "-d"])
 			.arg(tmpdir.path())
 			.arg("--no-hardware-benchmarks")
 			.spawn()
 			.unwrap();
 
+		let (ws_url, _) = common::find_ws_url_from_output(cmd.stderr.take().unwrap());
+
 		// Let it produce three blocks.
-		common::wait_n_finalized_blocks(3, Duration::from_secs(60)).await.unwrap();
+		common::wait_n_finalized_blocks(3, Duration::from_secs(60), &ws_url)
+			.await
+			.unwrap();
 
 		assert!(cmd.try_wait().unwrap().is_none(), "the process should still be running");
 		kill(Pid::from_raw(cmd.id().try_into().unwrap()), signal).unwrap();
 		assert_eq!(
 			common::wait_for(&mut cmd, 30).map(|x| x.success()),
 			Some(true),
-			"the pocess must exit gracefully after signal {}",
+			"the process must exit gracefully after signal {}",
 			signal,
 		);
 	}
diff --git a/polkadot/utils/staking-miner/Cargo.toml b/polkadot/utils/staking-miner/Cargo.toml
index 0a1ceaedc5..7548358100 100644
--- a/polkadot/utils/staking-miner/Cargo.toml
+++ b/polkadot/utils/staking-miner/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 clap = { version = "3.1", features = ["derive", "env"] }
 tracing-subscriber = { version = "0.3.10", features = ["env-filter"]   }
-jsonrpsee = { version = "0.10.1", features = ["ws-client", "macros"] }
+jsonrpsee = { version = "0.12.0", features = ["ws-client", "macros"] }
 log = "0.4.17"
 paste = "1.0.7"
 serde = "1.0.137"
diff --git a/polkadot/utils/staking-miner/src/monitor.rs b/polkadot/utils/staking-miner/src/monitor.rs
index ffe4e0daf4..59e9555af6 100644
--- a/polkadot/utils/staking-miner/src/monitor.rs
+++ b/polkadot/utils/staking-miner/src/monitor.rs
@@ -139,12 +139,6 @@ macro_rules! monitor_cmd_for { ($runtime:tt) => { paste::paste! {
 				maybe_rp = subscription.next() => {
 					match maybe_rp {
 						Some(Ok(r)) => r,
-						// Custom `jsonrpsee` message sent by the server if the subscription was closed on the server side.
-						Some(Err(RpcError::SubscriptionClosed(reason))) => {
-							log::warn!(target: LOG_TARGET, "subscription to `subscribeNewHeads/subscribeFinalizedHeads` terminated: {:?}. Retrying..", reason);
-							subscription = heads_subscription().await?;
-							continue;
-						}
 						Some(Err(e)) => {
 							log::error!(target: LOG_TARGET, "subscription failed to decode Header {:?}, this is bug please file an issue", e);
 							return Err(e.into());
@@ -312,15 +306,6 @@ macro_rules! monitor_cmd_for { ($runtime:tt) => { paste::paste! {
 			while let Some(rp) = tx_subscription.next().await {
 				let status_update = match rp {
 					Ok(r) => r,
-					// Custom `jsonrpsee` message sent by the server if the subscription was closed on the server side.
-					Err(RpcError::SubscriptionClosed(reason)) => {
-						log::warn!(
-							target: LOG_TARGET,
-							"tx subscription closed by the server: {:?}; skip block: {}",
-							reason, at.number
-						);
-						return;
-					},
 					Err(e) => {
 						log::error!(target: LOG_TARGET, "subscription failed to decode TransactionStatus {:?}, this is a bug please file an issue", e);
 						let _ = tx.send(e.into());
diff --git a/polkadot/utils/staking-miner/src/rpc.rs b/polkadot/utils/staking-miner/src/rpc.rs
index f92d9bb94c..a4a366dc2a 100644
--- a/polkadot/utils/staking-miner/src/rpc.rs
+++ b/polkadot/utils/staking-miner/src/rpc.rs
@@ -77,7 +77,7 @@ pub trait RpcApi {
 		unsubscribe = "author_unwatchExtrinsic",
 		item = TransactionStatus<Hash, Hash>
 	)]
-	fn watch_extrinsic(&self, bytes: &Bytes) -> RpcResult<()>;
+	fn watch_extrinsic(&self, bytes: &Bytes);
 
 	/// New head subscription.
 	#[subscription(
@@ -85,7 +85,7 @@ pub trait RpcApi {
 		unsubscribe = "chain_unsubscribeNewHeads",
 		item = Header
 	)]
-	fn subscribe_new_heads(&self) -> RpcResult<()>;
+	fn subscribe_new_heads(&self);
 
 	/// Finalized head subscription.
 	#[subscription(
@@ -93,7 +93,7 @@ pub trait RpcApi {
 		unsubscribe = "chain_unsubscribeFinalizedHeads",
 		item = Header
 	)]
-	fn subscribe_finalized_heads(&self) -> RpcResult<()>;
+	fn subscribe_finalized_heads(&self);
 }
 
 /// Wraps a shared web-socket JSON-RPC client that can be cloned.