From ba1fa36411577081706e90437c9a5f5c48eb9ded Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <sergei@parity.io>
Date: Tue, 1 Dec 2020 19:21:40 +0100
Subject: [PATCH] Update polkadot to the latest master (#251)

* update cumulus to latest polkadot

* s/Trait/Config

To be more consistent with the new naming.

* Update Cargo.lock

* fix network tests
---
 Cargo.lock                                    | 529 +++++++++---------
 message-broker/src/lib.rs                     |  10 +-
 network/src/lib.rs                            |  42 +-
 network/src/tests.rs                          |  22 +-
 parachain-upgrade/src/lib.rs                  |  24 +-
 .../contracts-runtime/src/lib.rs              |  20 +-
 .../pallets/parachain-info/src/lib.rs         |   8 +-
 rococo-parachains/runtime/src/lib.rs          |  16 +-
 service/src/lib.rs                            |   2 +-
 test/runtime/src/lib.rs                       |  12 +-
 10 files changed, 359 insertions(+), 326 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b45e084f5b38..9f21ba27f26c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -303,7 +303,7 @@ dependencies = [
  "futures-io",
  "rustls",
  "webpki",
- "webpki-roots",
+ "webpki-roots 0.20.0",
 ]
 
 [[package]]
@@ -469,17 +469,6 @@ dependencies = [
  "constant_time_eq",
 ]
 
-[[package]]
-name = "blake2s_simd"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2"
-dependencies = [
- "arrayref",
- "arrayvec 0.5.2",
- "constant_time_eq",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.7.3"
@@ -1440,6 +1429,15 @@ dependencies = [
  "dirs-sys",
 ]
 
+[[package]]
+name = "directories"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f"
+dependencies = [
+ "dirs-sys",
+]
+
 [[package]]
 name = "dirs-sys"
 version = "0.3.5"
@@ -1755,7 +1753,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1763,7 +1761,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1781,7 +1779,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "chrono",
  "frame-benchmarking",
@@ -1803,7 +1801,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1819,7 +1817,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "12.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1830,7 +1828,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -1855,7 +1853,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support-procedural-tools",
  "proc-macro2 1.0.24",
@@ -1866,7 +1864,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1878,7 +1876,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
@@ -1888,7 +1886,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1904,7 +1902,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2852,7 +2850,7 @@ dependencies = [
 [[package]]
 name = "kusama-runtime"
 version = "0.8.26"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "bitvec",
  "frame-executive",
@@ -3004,9 +3002,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
 [[package]]
 name = "libp2p"
-version = "0.30.1"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c2b4c99f8798be90746fc226acf95d3e6cff0655883634cc30dab1f64f438b"
+checksum = "24966e73cc5624a6cf14b025365f67cb6da436b4d6337ed84d198063ba74451d"
 dependencies = [
  "atomic",
  "bytes 0.5.6",
@@ -3033,7 +3031,6 @@ dependencies = [
  "libp2p-wasm-ext",
  "libp2p-websocket",
  "libp2p-yamux",
- "multihash",
  "parity-multiaddr",
  "parking_lot 0.11.1",
  "pin-project 1.0.2",
@@ -3043,12 +3040,13 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core"
-version = "0.24.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8186060d6bd415e4e928e6cb44c4fe7e7a7dd53437bd936ce7e5f421e45a51"
+checksum = "28d92fab5df60c9705e05750d9ecee6a5af15aed1e3fa86e09fd3dd07ec5dc8e"
 dependencies = [
  "asn1_der",
  "bs58",
+ "bytes 0.5.6",
  "ed25519-dalek",
  "either",
  "fnv",
@@ -3077,9 +3075,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core-derive"
-version = "0.20.2"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f753d9324cd3ec14bf04b8a8cd0d269c87f294153d6bf2a84497a63a5ad22213"
+checksum = "f4bc40943156e42138d22ed3c57ff0e1a147237742715937622a99b10fbe0156"
 dependencies = [
  "quote 1.0.7",
  "syn 1.0.48",
@@ -3087,9 +3085,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-deflate"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34aea69349e70a58ef9ecd21ac12c5eaa36255ac6986828079d26393f9e618cb"
+checksum = "5a579d7dd506d0620ba88ccc1754436b7de35ed6c884234f9a226bbfce382640"
 dependencies = [
  "flate2",
  "futures 0.3.8",
@@ -3098,9 +3096,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-dns"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0baeff71fb5cb1fe1604f74a712a44b66a8c5900f4022411a1d550f09d6bb776"
+checksum = "15dea5933f570844d7b5222b12b58f7bd52e9ca38cd65a1bd4f35341f053f012"
 dependencies = [
  "futures 0.3.8",
  "libp2p-core",
@@ -3109,9 +3107,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-floodsub"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db0f925a45f310b678e70faf71a10023b829d02eb9cc2628a63de928936f3ade"
+checksum = "23070a0838bd9a8adb27e6eba477eeb650c498f9d139383dd0135d20a8170253"
 dependencies = [
  "cuckoofilter",
  "fnv",
@@ -3127,9 +3125,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-gossipsub"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efeb65567174974f551a91f9f5719445b6695cad56f6a7a47a27111f37efb6b8"
+checksum = "65e8f3aa0906fbad435dac23c177eef3cdfaaf62609791bd7f54f8553edcfdf9"
 dependencies = [
  "base64 0.13.0",
  "byteorder",
@@ -3153,9 +3151,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identify"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e074124669840484de564901d47f2d0892e73f6d8ee7c37e9c2644af1b217bf4"
+checksum = "802fb973a7e0dde3fb9a2113a62bad90338ebe01983b706e1d576d0c2af93cda"
 dependencies = [
  "futures 0.3.8",
  "libp2p-core",
@@ -3169,9 +3167,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78a2653b2e3254a3bbeb66bfc3f0dca7d6cba6aa2a96791db114003dec1b5394"
+checksum = "6506b7b7982f7626fc96a91bc61be4b1fe7ae9ac23824f0ecefcce21cb39238c"
 dependencies = [
  "arrayvec 0.5.2",
  "bytes 0.5.6",
@@ -3182,7 +3180,6 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "multihash",
  "prost",
  "prost-build",
  "rand 0.7.3",
@@ -3196,9 +3193,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "786b068098794322239f8f04df88a52daeb7863b2e77501c4d85d32e0a8f2d26"
+checksum = "4458ec36b5ab2662fb4d5c8bb9b6e1591da0ab6efe8881c7a7670ef033bc8937"
 dependencies = [
  "async-std",
  "data-encoding",
@@ -3218,9 +3215,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mplex"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed764eab613a8fb6b7dcf6c796f55a06fef2270e528329903e25cd3311b99663"
+checksum = "ae2132b14045009b0f8e577a06e1459592ef0a89dedc58f3d4baf4eac956837b"
 dependencies = [
  "bytes 0.5.6",
  "futures 0.3.8",
@@ -3236,9 +3233,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-noise"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb441fb015ec16690099c5d910fcba271d357763b3dcb784db7b27bbb0b68372"
+checksum = "b9610a524bef4db383cd96b4ec3ec4722eafa72c7242fa89990b74166760583d"
 dependencies = [
  "bytes 0.5.6",
  "curve25519-dalek 3.0.0",
@@ -3258,9 +3255,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e5c50936cfdbe96a514e8992f304fa44cd3a681b6f779505f1ae62b3474705"
+checksum = "659adf89356e04f65398bb74ee791b269e63da9e41b37f8dc19eaacd12487bfe"
 dependencies = [
  "futures 0.3.8",
  "libp2p-core",
@@ -3273,9 +3270,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-plaintext"
-version = "0.24.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21026557c335d3639591f247b19b7536195772034ec7e9c463137227f95eaaa1"
+checksum = "96dfe26270c91d4ff095030d1fcadd602f3fd84968ebd592829916d0715798a6"
 dependencies = [
  "bytes 0.5.6",
  "futures 0.3.8",
@@ -3304,9 +3301,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dd9a1e0e6563dec1c9e702f7e68bdaa43da62a84536aa06372d3fed3e25d4ca"
+checksum = "1e952dcc9d2d7e7e45ae8bfcff255723091bd43e3e9a7741a0af8a17fe55b3ed"
 dependencies = [
  "async-trait",
  "bytes 0.5.6",
@@ -3324,9 +3321,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.24.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "565f0e06674b4033c978471e4083d5aaa8e03cef0719a0ec0905aaeaad39a919"
+checksum = "a6ecee54e85513a7301eb4681b3a6aac5b6d11f60d43097cf7624fd4450d7dfe"
 dependencies = [
  "either",
  "futures 0.3.8",
@@ -3340,9 +3337,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.24.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33f3dce259c0d3127af5167f45c275b6c047320efdd0e40fde947482487af0a3"
+checksum = "bc28c9ad6dc43f4c3950411cf808639d90307a076330e7996e5e94e70279bde0"
 dependencies = [
  "async-std",
  "futures 0.3.8",
@@ -3356,9 +3353,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-uds"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e0aba04370a00d8d0236e350bc862926c1b42542a169aa6a481e660e5b990fe"
+checksum = "9d821208d4b9af4b293a56dde470edd9f9fac8bb94a51f4f5327cc29a471b3f3"
 dependencies = [
  "async-std",
  "futures 0.3.8",
@@ -3368,9 +3365,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-wasm-ext"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c703816f4170477a375b49c56d349e535ce68388f81ba1d9a3c8e2517effa82"
+checksum = "1e6ef400b231ba78e866b860445480ca21ee447e03034138c6d57cf2969d6bf4"
 dependencies = [
  "futures 0.3.8",
  "js-sys",
@@ -3382,9 +3379,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d5e7268a959748040a0cf7456ad655be55b87f0ceda03bdb5b53674726b28f7"
+checksum = "a5736e2fccdcea6e728bbaf903bddc113be223313ce2c756ad9fe43b5a2b0f06"
 dependencies = [
  "async-tls",
  "either",
@@ -3397,14 +3394,14 @@ dependencies = [
  "soketto",
  "url 2.1.1",
  "webpki",
- "webpki-roots",
+ "webpki-roots 0.21.0",
 ]
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a0798cbb58535162c40858493d09af06eac42a26e4966e58de0df701f559348"
+checksum = "3be7ac000fa3e42ac09a6e658e48de34ac8ef9fff64a4e6e6b08dcc8f4b0e5f6"
 dependencies = [
  "futures 0.3.8",
  "libp2p-core",
@@ -3764,19 +3761,31 @@ checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238"
 
 [[package]]
 name = "multihash"
-version = "0.11.4"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567122ab6492f49b59def14ecc36e13e64dca4188196dd0cd41f9f3f979f3df6"
+checksum = "fb63389ee5fcd4df3f8727600f4a0c3df53c541f0ed4e8b50a9ae51a80fc1efe"
 dependencies = [
- "blake2b_simd",
- "blake2s_simd",
  "digest 0.9.0",
- "sha-1 0.9.2",
+ "generic-array 0.14.4",
+ "multihash-derive",
  "sha2 0.9.2",
- "sha3",
  "unsigned-varint",
 ]
 
+[[package]]
+name = "multihash-derive"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f5653449cd45d502a53480ee08d7a599e8f4893d2bacb33c63d65bc20af6c1a"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro-error",
+ "proc-macro2 1.0.24",
+ "quote 1.0.7",
+ "syn 1.0.48",
+ "synstructure",
+]
+
 [[package]]
 name = "multimap"
 version = "0.8.2"
@@ -3785,9 +3794,9 @@ checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333"
 
 [[package]]
 name = "multistream-select"
-version = "0.8.5"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93faf2e41f9ee62fb01680ed48f3cc26652352327aa2e59869070358f6b7dd75"
+checksum = "46e19fd46149acdd3600780ebaa09f6ae4e7f2ddbafec64aab54cf75aafd1746"
 dependencies = [
  "bytes 0.5.6",
  "futures 0.3.8",
@@ -4028,7 +4037,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4044,7 +4053,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4059,7 +4068,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4084,7 +4093,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4098,7 +4107,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4113,7 +4122,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4128,7 +4137,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4142,7 +4151,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4163,7 +4172,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4179,7 +4188,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4198,7 +4207,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4214,7 +4223,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4228,7 +4237,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4243,7 +4252,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4257,7 +4266,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4272,7 +4281,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4287,7 +4296,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4300,7 +4309,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4315,7 +4324,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4330,7 +4339,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4350,7 +4359,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4364,7 +4373,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4384,7 +4393,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -4395,7 +4404,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4409,7 +4418,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4426,7 +4435,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4443,7 +4452,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4461,7 +4470,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -4474,7 +4483,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4488,7 +4497,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4503,7 +4512,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4541,9 +4550,9 @@ dependencies = [
 
 [[package]]
 name = "parity-multiaddr"
-version = "0.9.6"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43244a26dc1ddd3097216bb12eaa6cf8a07b060c72718d9ebd60fd297d6401df"
+checksum = "2f51a30667591b14f96068b2d12f1306d07a41ebd98239d194356d4d9707ac16"
 dependencies = [
  "arrayref",
  "bs58",
@@ -4960,7 +4969,7 @@ checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e"
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "futures 0.3.8",
  "parity-scale-codec",
@@ -4975,7 +4984,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-distribution"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "futures 0.3.8",
  "parity-scale-codec",
@@ -4994,7 +5003,7 @@ dependencies = [
 [[package]]
 name = "polkadot-cli"
 version = "0.8.26"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "frame-benchmarking-cli",
  "log",
@@ -5014,7 +5023,7 @@ dependencies = [
 [[package]]
 name = "polkadot-collator-protocol"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "futures 0.3.8",
  "polkadot-node-network-protocol",
@@ -5029,7 +5038,7 @@ dependencies = [
 [[package]]
 name = "polkadot-core-primitives"
 version = "0.7.30"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "parity-scale-codec",
  "sp-core",
@@ -5040,7 +5049,7 @@ dependencies = [
 [[package]]
 name = "polkadot-erasure-coding"
 version = "0.8.26"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -5053,7 +5062,7 @@ dependencies = [
 [[package]]
 name = "polkadot-network-bridge"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "async-trait",
  "futures 0.3.8",
@@ -5070,7 +5079,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-collation-generation"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "futures 0.3.8",
  "polkadot-erasure-coding",
@@ -5087,7 +5096,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-av-store"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "futures 0.3.8",
  "futures-timer 3.0.2",
@@ -5108,7 +5117,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-backing"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "bitvec",
  "futures 0.3.8",
@@ -5127,9 +5136,8 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
- "derive_more 0.99.11",
  "futures 0.3.8",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
@@ -5144,7 +5152,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-candidate-selection"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "futures 0.3.8",
  "polkadot-node-subsystem",
@@ -5158,7 +5166,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-candidate-validation"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "futures 0.3.8",
  "parity-scale-codec",
@@ -5175,7 +5183,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-chain-api"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "futures 0.3.8",
  "polkadot-node-subsystem",
@@ -5189,7 +5197,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-proposer"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "futures 0.3.8",
  "futures-timer 3.0.2",
@@ -5213,10 +5221,11 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-provisioner"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "bitvec",
  "futures 0.3.8",
+ "futures-timer 3.0.2",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
@@ -5228,13 +5237,14 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-runtime-api"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "futures 0.3.8",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "sp-api",
+ "sp-core",
  "tracing",
  "tracing-futures",
 ]
@@ -5242,7 +5252,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-network-protocol"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-primitives",
@@ -5253,7 +5263,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-primitives"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "futures 0.3.8",
  "parity-scale-codec",
@@ -5266,7 +5276,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "async-trait",
  "derive_more 0.99.11",
@@ -5290,7 +5300,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-test-helpers"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "async-trait",
  "futures 0.3.8",
@@ -5313,7 +5323,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-util"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "async-trait",
  "futures 0.3.8",
@@ -5337,7 +5347,7 @@ dependencies = [
 [[package]]
 name = "polkadot-overseer"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "async-trait",
  "futures 0.3.8",
@@ -5355,7 +5365,7 @@ dependencies = [
 [[package]]
 name = "polkadot-parachain"
 version = "0.8.26"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "derive_more 0.99.11",
  "futures 0.3.8",
@@ -5378,7 +5388,7 @@ dependencies = [
 [[package]]
 name = "polkadot-pov-distribution"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "futures 0.3.8",
  "polkadot-node-network-protocol",
@@ -5393,7 +5403,7 @@ dependencies = [
 [[package]]
 name = "polkadot-primitives"
 version = "0.8.26"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "bitvec",
  "frame-system",
@@ -5418,7 +5428,7 @@ dependencies = [
 [[package]]
 name = "polkadot-rpc"
 version = "0.8.26"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "jsonrpc-core",
  "pallet-transaction-payment-rpc",
@@ -5448,7 +5458,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime"
 version = "0.8.26"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "bitvec",
  "frame-executive",
@@ -5511,7 +5521,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-common"
 version = "0.8.26"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "bitvec",
  "frame-support",
@@ -5546,7 +5556,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-parachains"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "bitvec",
  "derive_more 0.99.11",
@@ -5582,19 +5592,17 @@ dependencies = [
 [[package]]
 name = "polkadot-service"
 version = "0.8.3"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "frame-benchmarking",
  "frame-system-rpc-runtime-api",
  "futures 0.3.8",
  "hex-literal 0.3.1",
  "kusama-runtime",
- "lazy_static",
  "pallet-babe",
  "pallet-im-online",
  "pallet-staking",
  "pallet-transaction-payment-rpc-runtime-api",
- "parking_lot 0.11.1",
  "polkadot-availability-bitfield-distribution",
  "polkadot-availability-distribution",
  "polkadot-collator-protocol",
@@ -5635,7 +5643,6 @@ dependencies = [
  "sc-telemetry",
  "sc-transaction-pool",
  "serde",
- "slog",
  "sp-api",
  "sp-authority-discovery",
  "sp-block-builder",
@@ -5662,7 +5669,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-distribution"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "arrayvec 0.5.2",
  "futures 0.3.8",
@@ -5680,7 +5687,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-table"
 version = "0.8.26"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -5690,7 +5697,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-client"
 version = "0.8.26"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-subsystem",
@@ -5714,7 +5721,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-runtime"
 version = "0.8.26"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "bitvec",
  "frame-executive",
@@ -5768,7 +5775,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-service"
 version = "0.8.26"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "frame-benchmarking",
  "frame-system",
@@ -5820,7 +5827,7 @@ dependencies = [
 [[package]]
 name = "polkadot-validation"
 version = "0.8.26"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "futures 0.3.8",
  "log",
@@ -6559,7 +6566,7 @@ dependencies = [
 [[package]]
 name = "rococo-runtime"
 version = "0.8.26"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "frame-executive",
  "frame-support",
@@ -6732,7 +6739,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "async-trait",
  "derive_more 0.99.11",
@@ -6760,7 +6767,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "futures 0.3.8",
  "futures-timer 3.0.2",
@@ -6783,7 +6790,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -6800,7 +6807,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -6821,7 +6828,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -6832,7 +6839,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -6877,7 +6884,7 @@ dependencies = [
 [[package]]
 name = "sc-cli-proc-macro"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -6888,7 +6895,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "derive_more 0.99.11",
  "fnv",
@@ -6922,7 +6929,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -6952,7 +6959,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -6963,7 +6970,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "derive_more 0.99.11",
  "fork-tree",
@@ -7008,7 +7015,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "derive_more 0.99.11",
  "futures 0.3.8",
@@ -7032,7 +7039,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -7045,7 +7052,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "futures 0.3.8",
  "futures-timer 3.0.2",
@@ -7065,12 +7072,13 @@ dependencies = [
  "sp-runtime",
  "sp-state-machine",
  "sp-trie",
+ "thiserror",
 ]
 
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "log",
  "sc-client-api",
@@ -7084,7 +7092,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "derive_more 0.99.11",
  "lazy_static",
@@ -7113,24 +7121,23 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "derive_more 0.99.11",
- "log",
  "parity-scale-codec",
  "parity-wasm 0.41.0",
  "sp-allocator",
  "sp-core",
- "sp-runtime-interface",
  "sp-serializer",
  "sp-wasm-interface",
+ "thiserror",
  "wasmi",
 ]
 
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7145,7 +7152,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7163,7 +7170,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "derive_more 0.99.11",
  "finality-grandpa",
@@ -7200,7 +7207,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "derive_more 0.99.11",
  "finality-grandpa",
@@ -7224,7 +7231,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.8",
@@ -7242,7 +7249,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "async-trait",
  "derive_more 0.99.11",
@@ -7262,7 +7269,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -7281,7 +7288,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "async-std",
  "async-trait",
@@ -7335,7 +7342,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "futures 0.3.8",
  "futures-timer 3.0.2",
@@ -7350,7 +7357,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -7377,7 +7384,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "futures 0.3.8",
  "libp2p",
@@ -7390,7 +7397,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -7399,7 +7406,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "futures 0.3.8",
  "hash-db",
@@ -7432,7 +7439,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "derive_more 0.99.11",
  "futures 0.3.8",
@@ -7456,7 +7463,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "futures 0.1.30",
  "jsonrpc-core",
@@ -7474,10 +7481,9 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
- "derive_more 0.99.11",
- "directories",
+ "directories 3.0.1",
  "exit-future 0.2.0",
  "futures 0.1.30",
  "futures 0.3.8",
@@ -7530,6 +7536,7 @@ dependencies = [
  "sp-version",
  "substrate-prometheus-endpoint",
  "tempfile",
+ "thiserror",
  "tracing",
  "tracing-futures",
  "wasm-timer",
@@ -7538,7 +7545,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7547,12 +7554,13 @@ dependencies = [
  "parking_lot 0.10.2",
  "sc-client-api",
  "sp-core",
+ "thiserror",
 ]
 
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -7566,12 +7574,13 @@ dependencies = [
  "serde_json",
  "sp-blockchain",
  "sp-runtime",
+ "thiserror",
 ]
 
 [[package]]
 name = "sc-telemetry"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "futures 0.3.8",
  "futures-timer 3.0.2",
@@ -7592,7 +7601,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "erased-serde",
  "log",
@@ -7611,7 +7620,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "derive_more 0.99.11",
  "futures 0.3.8",
@@ -7626,15 +7635,15 @@ dependencies = [
  "sp-runtime",
  "sp-transaction-pool",
  "sp-utils",
+ "thiserror",
  "wasm-timer",
 ]
 
 [[package]]
 name = "sc-transaction-pool"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
- "derive_more 0.99.11",
  "futures 0.3.8",
  "futures-diagnose",
  "intervalier",
@@ -7652,6 +7661,7 @@ dependencies = [
  "sp-transaction-pool",
  "sp-utils",
  "substrate-prometheus-endpoint",
+ "thiserror",
  "wasm-timer",
 ]
 
@@ -8087,19 +8097,19 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
- "derive_more 0.99.11",
  "log",
  "sp-core",
  "sp-std",
  "sp-wasm-interface",
+ "thiserror",
 ]
 
 [[package]]
 name = "sp-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -8109,12 +8119,13 @@ dependencies = [
  "sp-state-machine",
  "sp-std",
  "sp-version",
+ "thiserror",
 ]
 
 [[package]]
 name = "sp-api-proc-macro"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -8126,7 +8137,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8138,7 +8149,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.14",
@@ -8151,7 +8162,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8163,7 +8174,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -8174,7 +8185,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8186,12 +8197,14 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
+ "futures 0.3.8",
  "log",
  "lru",
  "parity-scale-codec",
  "parking_lot 0.10.2",
+ "sp-api",
  "sp-consensus",
  "sp-database",
  "sp-runtime",
@@ -8202,7 +8215,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "serde",
  "serde_json",
@@ -8211,7 +8224,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "futures 0.3.8",
  "futures-timer 3.0.2",
@@ -8251,7 +8264,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -8271,7 +8284,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8280,7 +8293,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -8292,7 +8305,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -8336,7 +8349,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "kvdb",
  "parking_lot 0.10.2",
@@ -8345,7 +8358,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
@@ -8355,7 +8368,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8366,7 +8379,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8383,7 +8396,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.10.2",
@@ -8395,7 +8408,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "futures 0.3.8",
  "hash-db",
@@ -8419,7 +8432,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -8430,7 +8443,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "async-trait",
  "derive_more 0.99.11",
@@ -8446,7 +8459,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8458,7 +8471,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -8469,7 +8482,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -8479,7 +8492,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "backtrace",
 ]
@@ -8487,7 +8500,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "serde",
  "sp-core",
@@ -8496,7 +8509,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -8517,7 +8530,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -8533,7 +8546,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -8545,7 +8558,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "serde",
  "serde_json",
@@ -8554,7 +8567,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8567,7 +8580,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8577,7 +8590,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "hash-db",
  "log",
@@ -8599,12 +8612,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 
 [[package]]
 name = "sp-storage"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8617,7 +8630,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "log",
  "sp-core",
@@ -8643,7 +8656,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8657,7 +8670,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8670,7 +8683,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "derive_more 0.99.11",
  "futures 0.3.8",
@@ -8680,12 +8693,13 @@ dependencies = [
  "sp-api",
  "sp-blockchain",
  "sp-runtime",
+ "thiserror",
 ]
 
 [[package]]
 name = "sp-trie"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -8699,7 +8713,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "futures 0.3.8",
  "futures-core",
@@ -8711,7 +8725,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8723,7 +8737,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8797,9 +8811,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "structopt"
-version = "0.3.20"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "126d630294ec449fae0b16f964e35bf3c74f940da9dca17ee9b905f7b3112eb8"
+checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c"
 dependencies = [
  "clap",
  "lazy_static",
@@ -8808,9 +8822,9 @@ dependencies = [
 
 [[package]]
 name = "structopt-derive"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e51c492f9e23a220534971ff5afc14037289de430e3c83f9daf6a1b6ae91e8"
+checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -8856,7 +8870,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "platforms",
 ]
@@ -8864,7 +8878,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.8",
@@ -8887,7 +8901,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "async-std",
  "derive_more 0.99.11",
@@ -8901,7 +8915,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#ac4366bcf9b6f6063d0edfdb6ac0625093142238"
+source = "git+https://github.com/paritytech/substrate?branch=master#b63b8643e00214f1cbe28b6ca4e804af656c9038"
 dependencies = [
  "futures 0.1.30",
  "futures 0.3.8",
@@ -10048,7 +10062,7 @@ dependencies = [
  "cranelift-entity",
  "cranelift-frontend",
  "cranelift-wasm",
- "directories",
+ "directories 2.0.2",
  "errno",
  "file-per-thread-logger",
  "indexmap",
@@ -10195,6 +10209,15 @@ dependencies = [
  "webpki",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82015b7e0b8bad8185994674a13a93306bea76cf5a16c5a181382fd3a5ec2376"
+dependencies = [
+ "webpki",
+]
+
 [[package]]
 name = "wepoll-sys"
 version = "3.0.1"
@@ -10207,7 +10230,7 @@ dependencies = [
 [[package]]
 name = "westend-runtime"
 version = "0.8.26"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "bitvec",
  "frame-executive",
@@ -10347,7 +10370,7 @@ dependencies = [
 [[package]]
 name = "xcm"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=master#0d3218665039dc0a5935964299cd4333026423d5"
+source = "git+https://github.com/paritytech/polkadot?branch=master#54d4cbaf719db2a4faecaaebecd2110829f63e8c"
 dependencies = [
  "parity-scale-codec",
 ]
diff --git a/message-broker/src/lib.rs b/message-broker/src/lib.rs
index db8e82ecdc85..976f114f34a7 100644
--- a/message-broker/src/lib.rs
+++ b/message-broker/src/lib.rs
@@ -37,19 +37,19 @@ use cumulus_primitives::{
 };
 
 /// Configuration trait of the message broker pallet.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The downward message handlers that will be informed when a message is received.
 	type DownwardMessageHandlers: DownwardMessageHandler;
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as MessageBroker {
+	trait Store for Module<T: Config> as MessageBroker {
 		PendingUpwardMessages: Vec<UpwardMessage>;
 	}
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// An entrypoint for an inherent to deposit downward messages into the runtime. It accepts
 		/// and processes the list of downward messages.
 		#[weight = (10, DispatchClass::Mandatory)]
@@ -96,7 +96,7 @@ pub enum SendUpErr {
 	TooBig,
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	pub fn send_upward_message(message: UpwardMessage) -> Result<(), SendUpErr> {
 		// TODO: check the message against the limit. The limit should be sourced from the
 		// relay-chain configuration.
@@ -105,7 +105,7 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> ProvideInherent for Module<T> {
+impl<T: Config> ProvideInherent for Module<T> {
 	type Call = Call<T>;
 	type Error = MakeFatalError<()>;
 	const INHERENT_IDENTIFIER: InherentIdentifier = DOWNWARD_MESSAGES_IDENTIFIER;
diff --git a/network/src/lib.rs b/network/src/lib.rs
index 7c5becb694b0..40fe2ae1f8d8 100644
--- a/network/src/lib.rs
+++ b/network/src/lib.rs
@@ -26,7 +26,7 @@ mod wait_on_relay_chain_block;
 
 use sc_client_api::{Backend, BlockchainEvents};
 use sp_api::ProvideRuntimeApi;
-use sp_blockchain::{Error as ClientError, HeaderBackend};
+use sp_blockchain::HeaderBackend;
 use sp_consensus::{
 	block_validation::{BlockAnnounceValidator as BlockAnnounceValidatorT, Validation},
 	SyncOracle,
@@ -54,11 +54,21 @@ use futures::{
 };
 use log::trace;
 
-use std::{marker::PhantomData, pin::Pin, sync::Arc};
+use std::{marker::PhantomData, pin::Pin, sync::Arc, fmt};
 
 use wait_on_relay_chain_block::WaitOnRelayChainBlock;
 
-type BlockAnnounceError = Box<dyn std::error::Error + Send>;
+type BoxedError = Box<dyn std::error::Error + Send>;
+
+#[derive(Debug)]
+struct BlockAnnounceError(String);
+impl std::error::Error for BlockAnnounceError { }
+
+impl fmt::Display for BlockAnnounceError {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		self.0.fmt(f)
+	}
+}
 
 /// Parachain specific block announce validator.
 ///
@@ -131,7 +141,7 @@ where
 	fn handle_empty_block_announce_data(
 		&self,
 		header: Block::Header,
-	) -> impl Future<Output = Result<Validation, BlockAnnounceError>> {
+	) -> impl Future<Output = Result<Validation, BoxedError>> {
 		let relay_chain_client = self.relay_chain_client.clone();
 		let relay_chain_backend = self.relay_chain_backend.clone();
 		let para_id = self.para_id;
@@ -149,15 +159,15 @@ where
 					para_id,
 					OccupiedCoreAssumption::TimedOut,
 				)
-				.map_err(|e| Box::new(ClientError::Msg(format!("{:?}", e))) as Box<_>)?
+				.map_err(|e| Box::new(BlockAnnounceError(format!("{:?}", e))) as Box<_>)?
 				.ok_or_else(|| {
-					Box::new(ClientError::Msg(
+					Box::new(BlockAnnounceError(
 						"Could not find parachain head in relay chain".into(),
 					)) as Box<_>
 				})?;
 			let parent_head = Block::Header::decode(&mut &local_validation_data.parent_head.0[..])
 				.map_err(|e| {
-					Box::new(ClientError::Msg(format!(
+					Box::new(BlockAnnounceError(format!(
 						"Failed to decode parachain head: {:?}",
 						e
 					))) as Box<_>
@@ -192,7 +202,7 @@ where
 		&mut self,
 		header: &Block::Header,
 		mut data: &[u8],
-	) -> Pin<Box<dyn Future<Output = Result<Validation, BlockAnnounceError>> + Send>> {
+	) -> Pin<Box<dyn Future<Output = Result<Validation, BoxedError>> + Send>> {
 		if self.relay_chain_sync_oracle.is_major_syncing() {
 			return ready(Ok(Validation::Success { is_new_best: false })).boxed();
 		}
@@ -205,7 +215,7 @@ where
 
 		let signed_stmt = match SignedFullStatement::decode(&mut data) {
 			Ok(r) => r,
-			Err(_) => return ready(Err(Box::new(ClientError::Msg(
+			Err(_) => return ready(Err(Box::new(BlockAnnounceError(
 				"cannot decode block announcement justification, must be a `SignedFullStatement`"
 					.into(),
 			)) as Box<_>))
@@ -221,7 +231,7 @@ where
 			let candidate_receipt = match signed_stmt.payload() {
 				Statement::Seconded(ref candidate_receipt) => candidate_receipt,
 				_ => {
-					return Err(Box::new(ClientError::Msg(
+					return Err(Box::new(BlockAnnounceError(
 						"block announcement justification must be a `Statement::Seconded`".into(),
 					)) as Box<_>)
 				}
@@ -229,7 +239,7 @@ where
 
 			// Check the header in the candidate_receipt match header given header.
 			if header_encoded != candidate_receipt.commitments.head_data.0 {
-				return Err(Box::new(ClientError::Msg(
+				return Err(Box::new(BlockAnnounceError(
 					"block announcement header does not match the one justified".into(),
 				)) as Box<_>);
 			}
@@ -239,7 +249,7 @@ where
 			wait_on_relay_chain_block
 				.wait_on_relay_chain_block(*relay_parent)
 				.await
-				.map_err(|e| Box::new(ClientError::Msg(e.to_string())) as Box<_>)?;
+				.map_err(|e| Box::new(BlockAnnounceError(e.to_string())) as Box<_>)?;
 
 			let runtime_api = relay_chain_client.runtime_api();
 			let validator_index = signed_stmt.validator_index();
@@ -248,7 +258,7 @@ where
 			let session_index = match runtime_api.session_index_for_child(&runtime_api_block_id) {
 				Ok(r) => r,
 				Err(e) => {
-					return Err(Box::new(ClientError::Msg(format!("{:?}", e))) as Box<_>);
+					return Err(Box::new(BlockAnnounceError(format!("{:?}", e))) as Box<_>);
 				}
 			};
 
@@ -261,13 +271,13 @@ where
 			let authorities = match runtime_api.validators(&runtime_api_block_id) {
 				Ok(r) => r,
 				Err(e) => {
-					return Err(Box::new(ClientError::Msg(format!("{:?}", e))) as Box<_>);
+					return Err(Box::new(BlockAnnounceError(format!("{:?}", e))) as Box<_>);
 				}
 			};
 			let signer = match authorities.get(validator_index as usize) {
 				Some(r) => r,
 				None => {
-					return Err(Box::new(ClientError::Msg(
+					return Err(Box::new(BlockAnnounceError(
 						"block accouncement justification signer is a validator index out of bound"
 							.to_string(),
 					)) as Box<_>);
@@ -279,7 +289,7 @@ where
 				.check_signature(&signing_context, &signer)
 				.is_err()
 			{
-				return Err(Box::new(ClientError::Msg(
+				return Err(Box::new(BlockAnnounceError(
 					"block announcement justification signature is invalid".to_string(),
 				)) as Box<_>);
 			}
diff --git a/network/src/tests.rs b/network/src/tests.rs
index 1e76c3b48d95..17b62de2a103 100644
--- a/network/src/tests.rs
+++ b/network/src/tests.rs
@@ -23,14 +23,14 @@ use polkadot_primitives::v1::{
 	CandidateEvent, CommittedCandidateReceipt, CoreState, GroupRotationInfo, Hash as PHash,
 	HeadData, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage, OccupiedCoreAssumption,
 	ParachainHost, PersistedValidationData, SessionIndex, SigningContext, ValidationCode,
-	ValidationData, ValidationOutputs, ValidatorId, ValidatorIndex, SessionInfo,
+	ValidationData, ValidatorId, ValidatorIndex, SessionInfo,
 };
 use polkadot_test_client::{
 	Client as PClient, ClientBlockImportExt, DefaultTestClientBuilderExt, FullBackend as PBackend,
 	InitPolkadotBlockBuilder, TestClientBuilder, TestClientBuilderExt,
 };
 use sp_api::{ApiRef, ProvideRuntimeApi};
-use sp_blockchain::{Error as ClientError, HeaderBackend};
+use sp_blockchain::HeaderBackend;
 use sp_consensus::{block_validation::BlockAnnounceValidator as _, BlockOrigin};
 use sp_core::H256;
 use sp_keyring::Sr25519Keyring;
@@ -38,9 +38,9 @@ use sp_keystore::{testing::KeyStore, SyncCryptoStore, SyncCryptoStorePtr};
 use sp_runtime::RuntimeAppPublic;
 use std::collections::BTreeMap;
 
-fn check_error(error: crate::BlockAnnounceError, check_error: impl Fn(&ClientError) -> bool) {
+fn check_error(error: crate::BoxedError, check_error: impl Fn(&BlockAnnounceError) -> bool) {
 	let error = *error
-		.downcast::<ClientError>()
+		.downcast::<BlockAnnounceError>()
 		.expect("Downcasts error to `ClientError`");
 	if !check_error(&error) {
 		panic!("Invalid error: {:?}", error);
@@ -192,7 +192,7 @@ fn check_statement_is_encoded_correctly() {
 	check_error(res, |error| {
 		matches!(
 			error,
-			ClientError::Msg(x) if x.contains("must be a `SignedFullStatement`")
+			BlockAnnounceError(x) if x.contains("must be a `SignedFullStatement`")
 		)
 	});
 }
@@ -209,8 +209,8 @@ fn check_signer_is_legit_validator() {
 		.expect("Should fail on invalid validator");
 
 	assert!(matches!(
-		*res.downcast::<ClientError>().unwrap(),
-		ClientError::Msg(x) if x.contains("signer is a validator")
+		*res.downcast::<BlockAnnounceError>().unwrap(),
+		BlockAnnounceError(x) if x.contains("signer is a validator")
 	));
 }
 
@@ -233,7 +233,7 @@ fn check_statement_is_correctly_signed() {
 	check_error(res, |error| {
 		matches!(
 			error,
-			ClientError::Msg(x) if x.contains("signature is invalid")
+			BlockAnnounceError(x) if x.contains("signature is invalid")
 		)
 	});
 }
@@ -279,7 +279,7 @@ fn check_statement_seconded() {
 	check_error(res, |error| {
 		matches!(
 			error,
-			ClientError::Msg(x) if x.contains("must be a `Statement::Seconded`")
+			BlockAnnounceError(x) if x.contains("must be a `Statement::Seconded`")
 		)
 	});
 }
@@ -300,7 +300,7 @@ fn check_header_match_candidate_receipt_header() {
 	check_error(res, |error| {
 		matches!(
 			error,
-			ClientError::Msg(x) if x.contains("header does not match")
+			BlockAnnounceError(x) if x.contains("header does not match")
 		)
 	});
 }
@@ -431,7 +431,7 @@ sp_api::mock_impl_runtime_apis! {
 			None
 		}
 
-		fn check_validation_outputs(_: ParaId, _: ValidationOutputs) -> bool {
+		fn check_validation_outputs(_: ParaId, _: CandidateCommitments) -> bool {
 			false
 		}
 
diff --git a/parachain-upgrade/src/lib.rs b/parachain-upgrade/src/lib.rs
index e494f1beb2c4..a798a1eff4e1 100644
--- a/parachain-upgrade/src/lib.rs
+++ b/parachain-upgrade/src/lib.rs
@@ -47,9 +47,9 @@ use sp_std::vec::Vec;
 type System<T> = frame_system::Module<T>;
 
 /// The pallet's configuration trait.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Something which can be notified when the validation data is set.
 	type OnValidationData: OnValidationData;
@@ -57,7 +57,7 @@ pub trait Trait: frame_system::Trait {
 
 // This pallet's storage items.
 decl_storage! {
-	trait Store for Module<T: Trait> as ParachainUpgrade {
+	trait Store for Module<T: Config> as ParachainUpgrade {
 		// we need to store the new validation function for the span between
 		// setting it and applying it.
 		PendingValidationFunction get(fn new_validation_function):
@@ -73,7 +73,7 @@ decl_storage! {
 
 // The pallet's dispatchable functions.
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		// Initializing events
 		// this is needed only if you are using events in your pallet
 		fn deposit_event() = default;
@@ -146,7 +146,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Get validation data.
 	///
 	/// Returns `Some(_)` after the inherent set the data for the current block.
@@ -213,7 +213,7 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> ProvideInherent for Module<T> {
+impl<T: Config> ProvideInherent for Module<T> {
 	type Call = Call<T>;
 	type Error = sp_inherents::MakeFatalError<()>;
 	const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
@@ -239,7 +239,7 @@ decl_event! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Attempt to upgrade validation function while existing upgrade pending
 		OverlappingUpgrades,
 		/// Polkadot currently prohibits this parachain from upgrading its validation function
@@ -309,7 +309,7 @@ mod tests {
 			transaction_version: 1,
 		};
 	}
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type Origin = Origin;
 		type Call = ();
 		type Index = u64;
@@ -336,7 +336,7 @@ mod tests {
 		type BaseCallFilter = ();
 		type SystemWeightInfo = ();
 	}
-	impl Trait for Test {
+	impl Config for Test {
 		type Event = TestEvent;
 		type OnValidationData = ();
 	}
@@ -383,7 +383,7 @@ mod tests {
 	}
 
 	struct BlockTest {
-		n: <Test as frame_system::Trait>::BlockNumber,
+		n: <Test as frame_system::Config>::BlockNumber,
 		within_block: Box<dyn Fn()>,
 		after_block: Option<Box<dyn Fn()>>,
 	}
@@ -410,7 +410,7 @@ mod tests {
 			self
 		}
 
-		fn add<F>(self, n: <Test as frame_system::Trait>::BlockNumber, within_block: F) -> Self
+		fn add<F>(self, n: <Test as frame_system::Config>::BlockNumber, within_block: F) -> Self
 		where
 			F: 'static + Fn(),
 		{
@@ -423,7 +423,7 @@ mod tests {
 
 		fn add_with_post_test<F1, F2>(
 			self,
-			n: <Test as frame_system::Trait>::BlockNumber,
+			n: <Test as frame_system::Config>::BlockNumber,
 			within_block: F1,
 			after_block: F2,
 		) -> Self
diff --git a/rococo-parachains/contracts-runtime/src/lib.rs b/rococo-parachains/contracts-runtime/src/lib.rs
index 5f88eb3bb9eb..b60a2e658ef2 100644
--- a/rococo-parachains/contracts-runtime/src/lib.rs
+++ b/rococo-parachains/contracts-runtime/src/lib.rs
@@ -108,7 +108,7 @@ parameter_types! {
 	pub const ExtrinsicBaseWeight: Weight = 10_000_000;
 }
 
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	/// The identifier used to distinguish between accounts.
 	type AccountId = AccountId;
 	/// The aggregated dispatch type that is available for extrinsics.
@@ -155,7 +155,7 @@ parameter_types! {
 	pub const MinimumPeriod: u64 = SLOT_DURATION / 2;
 }
 
-impl pallet_timestamp::Trait for Runtime {
+impl pallet_timestamp::Config for Runtime {
 	/// A timestamp: milliseconds since the unix epoch.
 	type Moment = u64;
 	type OnTimestampSet = ();
@@ -170,7 +170,7 @@ parameter_types! {
 	pub const TransactionByteFee: u128 = 1;
 }
 
-impl pallet_balances::Trait for Runtime {
+impl pallet_balances::Config for Runtime {
 	/// The type for recording an account's balance.
 	type Balance = Balance;
 	/// The ubiquitous event type.
@@ -181,7 +181,7 @@ impl pallet_balances::Trait for Runtime {
 	type WeightInfo = ();
 }
 
-impl pallet_transaction_payment::Trait for Runtime {
+impl pallet_transaction_payment::Config for Runtime {
 	type Currency = Balances;
 	type OnTransactionPayment = ();
 	type TransactionByteFee = TransactionByteFee;
@@ -189,17 +189,17 @@ impl pallet_transaction_payment::Trait for Runtime {
 	type FeeMultiplierUpdate = ();
 }
 
-impl pallet_sudo::Trait for Runtime {
+impl pallet_sudo::Config for Runtime {
 	type Call = Call;
 	type Event = Event;
 }
 
-impl cumulus_parachain_upgrade::Trait for Runtime {
+impl cumulus_parachain_upgrade::Config for Runtime {
 	type Event = Event;
 	type OnValidationFunctionParams = ();
 }
 
-impl cumulus_message_broker::Trait for Runtime {
+impl cumulus_message_broker::Config for Runtime {
 	type Event = Event;
 	type DownwardMessageHandlers = TokenDealer;
 	type UpwardMessage = cumulus_upward_message::RococoUpwardMessage;
@@ -208,7 +208,7 @@ impl cumulus_message_broker::Trait for Runtime {
 	type XCMPMessageHandlers = TokenDealer;
 }
 
-impl cumulus_token_dealer::Trait for Runtime {
+impl cumulus_token_dealer::Config for Runtime {
 	type Event = Event;
 	type UpwardMessageSender = MessageBroker;
 	type UpwardMessage = cumulus_upward_message::RococoUpwardMessage;
@@ -216,7 +216,7 @@ impl cumulus_token_dealer::Trait for Runtime {
 	type XCMPMessageSender = MessageBroker;
 }
 
-impl parachain_info::Trait for Runtime {}
+impl parachain_info::Config for Runtime {}
 
 // We disable the rent system for easier testing.
 parameter_types! {
@@ -226,7 +226,7 @@ parameter_types! {
 	pub const SurchargeReward: Balance = 0;
 }
 
-impl cumulus_pallet_contracts::Trait for Runtime {
+impl cumulus_pallet_contracts::Config for Runtime {
 	type Time = Timestamp;
 	type Randomness = RandomnessCollectiveFlip;
 	type Currency = Balances;
diff --git a/rococo-parachains/pallets/parachain-info/src/lib.rs b/rococo-parachains/pallets/parachain-info/src/lib.rs
index 472f5b2d0398..d5ed49e44a23 100644
--- a/rococo-parachains/pallets/parachain-info/src/lib.rs
+++ b/rococo-parachains/pallets/parachain-info/src/lib.rs
@@ -23,20 +23,20 @@ use frame_support::{decl_module, decl_storage, traits::Get};
 use cumulus_primitives::ParaId;
 
 /// Configuration trait of this pallet.
-pub trait Trait: frame_system::Trait {}
+pub trait Config: frame_system::Config {}
 
-impl<T: Trait> Get<ParaId> for Module<T> {
+impl<T: Config> Get<ParaId> for Module<T> {
 	fn get() -> ParaId {
 		Self::parachain_id()
 	}
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as ParachainUpgrade {
+	trait Store for Module<T: Config> as ParachainUpgrade {
 		ParachainId get(fn parachain_id) config(): ParaId = 100.into();
 	}
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {}
 }
diff --git a/rococo-parachains/runtime/src/lib.rs b/rococo-parachains/runtime/src/lib.rs
index 1d72f04890ed..1664c850a193 100644
--- a/rococo-parachains/runtime/src/lib.rs
+++ b/rococo-parachains/runtime/src/lib.rs
@@ -107,7 +107,7 @@ parameter_types! {
 	pub const ExtrinsicBaseWeight: Weight = 10_000_000;
 }
 
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	/// The identifier used to distinguish between accounts.
 	type AccountId = AccountId;
 	/// The aggregated dispatch type that is available for extrinsics.
@@ -155,7 +155,7 @@ parameter_types! {
 	pub const MinimumPeriod: u64 = SLOT_DURATION / 2;
 }
 
-impl pallet_timestamp::Trait for Runtime {
+impl pallet_timestamp::Config for Runtime {
 	/// A timestamp: milliseconds since the unix epoch.
 	type Moment = u64;
 	type OnTimestampSet = ();
@@ -171,7 +171,7 @@ parameter_types! {
 	pub const MaxLocks: u32 = 50;
 }
 
-impl pallet_balances::Trait for Runtime {
+impl pallet_balances::Config for Runtime {
 	/// The type for recording an account's balance.
 	type Balance = Balance;
 	/// The ubiquitous event type.
@@ -183,28 +183,28 @@ impl pallet_balances::Trait for Runtime {
 	type MaxLocks = MaxLocks;
 }
 
-impl pallet_transaction_payment::Trait for Runtime {
+impl pallet_transaction_payment::Config for Runtime {
 	type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, ()>;
 	type TransactionByteFee = TransactionByteFee;
 	type WeightToFee = IdentityFee<Balance>;
 	type FeeMultiplierUpdate = ();
 }
 
-impl pallet_sudo::Trait for Runtime {
+impl pallet_sudo::Config for Runtime {
 	type Call = Call;
 	type Event = Event;
 }
 
-impl cumulus_parachain_upgrade::Trait for Runtime {
+impl cumulus_parachain_upgrade::Config for Runtime {
 	type Event = Event;
 	type OnValidationData = ();
 }
 
-impl cumulus_message_broker::Trait for Runtime {
+impl cumulus_message_broker::Config for Runtime {
 	type DownwardMessageHandlers = ();
 }
 
-impl parachain_info::Trait for Runtime {}
+impl parachain_info::Config for Runtime {}
 
 construct_runtime! {
 	pub enum Runtime where
diff --git a/service/src/lib.rs b/service/src/lib.rs
index fa6f0ef4e0de..39086e426258 100644
--- a/service/src/lib.rs
+++ b/service/src/lib.rs
@@ -162,7 +162,7 @@ where
 	fn execute_with_client<PClient, Api, PBackend>(self, client: Arc<PClient>) -> Self::Output
 	where
 		<Api as sp_api::ApiExt<PBlock>>::StateBackend: sp_api::StateBackend<BlakeTwo256>,
-		PBackend: sc_client_api::Backend<PBlock>,
+		PBackend: sc_client_api::Backend<PBlock> + 'static,
 		PBackend::State: sp_api::StateBackend<BlakeTwo256>,
 		Api: RuntimeApiCollection<StateBackend = PBackend::State>,
 		PClient: AbstractClient<PBlock, PBackend, Api = Api> + 'static,
diff --git a/test/runtime/src/lib.rs b/test/runtime/src/lib.rs
index bbbdead39ef8..0e7bb52667e9 100644
--- a/test/runtime/src/lib.rs
+++ b/test/runtime/src/lib.rs
@@ -100,7 +100,7 @@ parameter_types! {
 	pub const ExtrinsicBaseWeight: Weight = 10_000_000;
 }
 
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	/// The identifier used to distinguish between accounts.
 	type AccountId = AccountId;
 	/// The aggregated dispatch type that is available for extrinsics.
@@ -147,7 +147,7 @@ parameter_types! {
 	pub const MinimumPeriod: u64 = SLOT_DURATION / 2;
 }
 
-impl pallet_timestamp::Trait for Runtime {
+impl pallet_timestamp::Config for Runtime {
 	/// A timestamp: milliseconds since the unix epoch.
 	type Moment = u64;
 	type OnTimestampSet = ();
@@ -162,7 +162,7 @@ parameter_types! {
 	pub const TransactionByteFee: u128 = 1;
 }
 
-impl pallet_balances::Trait for Runtime {
+impl pallet_balances::Config for Runtime {
 	/// The type for recording an account's balance.
 	type Balance = Balance;
 	/// The ubiquitous event type.
@@ -174,19 +174,19 @@ impl pallet_balances::Trait for Runtime {
 	type MaxLocks = ();
 }
 
-impl pallet_transaction_payment::Trait for Runtime {
+impl pallet_transaction_payment::Config for Runtime {
 	type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, ()>;
 	type TransactionByteFee = TransactionByteFee;
 	type WeightToFee = IdentityFee<Balance>;
 	type FeeMultiplierUpdate = ();
 }
 
-impl pallet_sudo::Trait for Runtime {
+impl pallet_sudo::Config for Runtime {
 	type Call = Call;
 	type Event = Event;
 }
 
-impl cumulus_parachain_upgrade::Trait for Runtime {
+impl cumulus_parachain_upgrade::Config for Runtime {
 	type Event = Event;
 	type OnValidationData = ();
 }