diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index 60295adb04..1b9eb37331 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -1,7 +1,5 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
 [[package]]
 name = "Inflector"
 version = "0.11.4"
@@ -336,6 +334,19 @@ dependencies = [
  "pin-project-lite 0.2.4",
 ]
 
+[[package]]
+name = "asynchronous-codec"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0de5164e5edbf51c45fb8c2d9664ae1c095cce1b265ecf7569093c0d66ef690"
+dependencies = [
+ "bytes 1.0.1",
+ "futures-sink",
+ "futures-util",
+ "memchr",
+ "pin-project-lite 0.2.4",
+]
+
 [[package]]
 name = "atomic"
 version = "0.5.0"
@@ -1583,7 +1594,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1601,7 +1612,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1619,7 +1630,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "Inflector",
  "chrono",
@@ -1642,7 +1653,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1658,7 +1669,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1669,7 +1680,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -1695,7 +1706,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -1707,7 +1718,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1719,7 +1730,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1729,7 +1740,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1745,7 +1756,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1759,7 +1770,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2936,16 +2947,15 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
 [[package]]
 name = "libp2p"
-version = "0.34.0"
+version = "0.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5133112ce42be9482f6a87be92a605dd6bbc9e93c297aee77d172ff06908f3a"
+checksum = "adc225a49973cf9ab10d0cdd6a4b8f0cda299df9b760824bbb623f15f8f0c95a"
 dependencies = [
  "atomic",
  "bytes 1.0.1",
  "futures 0.3.12",
  "lazy_static",
  "libp2p-core",
- "libp2p-core-derive",
  "libp2p-deflate",
  "libp2p-dns",
  "libp2p-floodsub",
@@ -2960,6 +2970,7 @@ dependencies = [
  "libp2p-pnet",
  "libp2p-request-response",
  "libp2p-swarm",
+ "libp2p-swarm-derive",
  "libp2p-tcp",
  "libp2p-uds",
  "libp2p-wasm-ext",
@@ -2974,9 +2985,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core"
-version = "0.27.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad04d3cef6c1df366a6ab58c9cf8b06497699e335d83ac2174783946ff847d6"
+checksum = "8a2d56aadc2c2bf22cd7797f86e56a65b5b3994a0136b65be3106938acae7a26"
 dependencies = [
  "asn1_der",
  "bs58",
@@ -3001,26 +3012,16 @@ dependencies = [
  "sha2 0.9.2",
  "smallvec 1.6.1",
  "thiserror",
- "unsigned-varint 0.6.0",
+ "unsigned-varint 0.7.0",
  "void",
  "zeroize",
 ]
 
-[[package]]
-name = "libp2p-core-derive"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4bc40943156e42138d22ed3c57ff0e1a147237742715937622a99b10fbe0156"
-dependencies = [
- "quote",
- "syn",
-]
-
 [[package]]
 name = "libp2p-deflate"
-version = "0.27.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "935893c0e5b6ca6ef60d5225aab9182f97c8c5671df2fa9dee8f4ed72a90e6eb"
+checksum = "6d42eed63305f0420736fa487f9acef720c4528bd7852a6a760f5ccde4813345"
 dependencies = [
  "flate2",
  "futures 0.3.12",
@@ -3058,11 +3059,11 @@ dependencies = [
 
 [[package]]
 name = "libp2p-gossipsub"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12451ba9493e87c91baf2a6dffce9ddf1fbc807a0861532d7cf477954f8ebbee"
+checksum = "502dc5fcbfec4aa1c63ef3f7307ffe20e90c1a1387bf23ed0bec087f2dde58a1"
 dependencies = [
- "asynchronous-codec",
+ "asynchronous-codec 0.6.0",
  "base64 0.13.0",
  "byteorder",
  "bytes 1.0.1",
@@ -3078,7 +3079,7 @@ dependencies = [
  "regex",
  "sha2 0.9.2",
  "smallvec 1.6.1",
- "unsigned-varint 0.6.0",
+ "unsigned-varint 0.7.0",
  "wasm-timer",
 ]
 
@@ -3100,12 +3101,12 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.28.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456f5de8e283d7800ca848b9b9a4e2a578b790bd8ae582b885e831353cf0e5df"
+checksum = "cf3da6c9acbcc05f93235d201d7d45ef4e8b88a45d8836f98becd8b4d443f066"
 dependencies = [
  "arrayvec 0.5.2",
- "asynchronous-codec",
+ "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
  "either",
  "fnv",
@@ -3119,16 +3120,16 @@ dependencies = [
  "sha2 0.9.2",
  "smallvec 1.6.1",
  "uint",
- "unsigned-varint 0.6.0",
+ "unsigned-varint 0.7.0",
  "void",
  "wasm-timer",
 ]
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.28.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b974db63233fc0e199f4ede7794294aae285c96f4b6010f853eac4099ef08590"
+checksum = "0e9e6374814d1b118d97ccabdfc975c8910bd16dc38a8bc058eeb08bf2080fe1"
 dependencies = [
  "async-io",
  "data-encoding",
@@ -3147,11 +3148,11 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mplex"
-version = "0.27.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2705dc94b01ab9e3779b42a09bbf3712e637ed213e875c30face247291a85af0"
+checksum = "350ce8b3923594aedabd5d6e3f875d058435052a29c3f32df378bc70d10be464"
 dependencies = [
- "asynchronous-codec",
+ "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
  "futures 0.3.12",
  "libp2p-core",
@@ -3160,7 +3161,7 @@ dependencies = [
  "parking_lot 0.11.1",
  "rand 0.7.3",
  "smallvec 1.6.1",
- "unsigned-varint 0.6.0",
+ "unsigned-varint 0.7.0",
 ]
 
 [[package]]
@@ -3202,18 +3203,18 @@ dependencies = [
 
 [[package]]
 name = "libp2p-plaintext"
-version = "0.27.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48e8c1ec305c9949351925cdc7196b9570f4330477f5e47fbf5bb340b57e26ed"
+checksum = "9d58defcadb646ae4b033e130b48d87410bf76394dc3335496cae99dac803e61"
 dependencies = [
- "asynchronous-codec",
+ "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
  "futures 0.3.12",
  "libp2p-core",
  "log",
  "prost",
  "prost-build",
- "unsigned-varint 0.6.0",
+ "unsigned-varint 0.7.0",
  "void",
 ]
 
@@ -3233,9 +3234,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d37637a4b33b5390322ccc068a33897d0aa541daf4fec99f6a7efbf37295346e"
+checksum = "10e5552827c33d8326502682da73a0ba4bfa40c1b55b216af3c303f32169dd89"
 dependencies = [
  "async-trait",
  "bytes 1.0.1",
@@ -3247,7 +3248,7 @@ dependencies = [
  "minicbor",
  "rand 0.7.3",
  "smallvec 1.6.1",
- "unsigned-varint 0.6.0",
+ "unsigned-varint 0.7.0",
  "wasm-timer",
 ]
 
@@ -3268,10 +3269,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "libp2p-tcp"
-version = "0.27.0"
+name = "libp2p-swarm-derive"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dbd3d7076a478ac5a6aca55e74bdc250ac539b95de09b9d09915e0b8d01a6b2"
+checksum = "c564ebaa36a64839f51eaddb0243aaaa29ce64affb56129193cc3248b72af273"
+dependencies = [
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "libp2p-tcp"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88a5aef80e519a6cb8e2663605142f97baaaea1a252eecbf8756184765f7471b"
 dependencies = [
  "async-io",
  "futures 0.3.12",
@@ -3330,9 +3341,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.30.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490b8b27fc40fe35212df1b6a3d14bffaa4117cbff956fdc2892168a371102ad"
+checksum = "4819358c542a86ff95f6ae691efb4b94ddaf477079b01a686f5705b79bfc232a"
 dependencies = [
  "futures 0.3.12",
  "libp2p-core",
@@ -3994,7 +4005,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b"
 [[package]]
 name = "pallet-authority-discovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4010,7 +4021,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4025,7 +4036,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4049,7 +4060,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4063,7 +4074,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4078,7 +4089,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4094,7 +4105,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4109,7 +4120,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4124,7 +4135,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4145,7 +4156,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4161,7 +4172,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4180,7 +4191,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4197,7 +4208,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4211,7 +4222,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4227,7 +4238,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4241,7 +4252,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4256,7 +4267,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4277,7 +4288,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4293,7 +4304,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4306,7 +4317,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4321,7 +4332,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4336,7 +4347,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4356,7 +4367,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4372,7 +4383,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4386,7 +4397,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4408,7 +4419,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -4419,7 +4430,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4433,7 +4444,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4451,7 +4462,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4466,7 +4477,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4482,7 +4493,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4499,7 +4510,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -4510,7 +4521,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4526,7 +4537,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4542,7 +4553,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4572,9 +4583,9 @@ dependencies = [
 
 [[package]]
 name = "parity-multiaddr"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bfda2e46fc5e14122649e2645645a81ee5844e0fb2e727ef560cc71a8b2d801"
+checksum = "d2c6805f98667a3828afb2ec2c396a8d610497e8d546f5447188aae47c5a79ec"
 dependencies = [
  "arrayref",
  "bs58",
@@ -4584,7 +4595,7 @@ dependencies = [
  "percent-encoding 2.1.0",
  "serde",
  "static_assertions",
- "unsigned-varint 0.6.0",
+ "unsigned-varint 0.7.0",
  "url 2.2.0",
 ]
 
@@ -6912,7 +6923,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -6940,7 +6951,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -6963,7 +6974,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -6980,7 +6991,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7001,7 +7012,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -7012,7 +7023,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "chrono",
  "fdlimit",
@@ -7050,7 +7061,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "derive_more",
  "fnv",
@@ -7084,7 +7095,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -7114,7 +7125,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -7125,7 +7136,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "derive_more",
  "fork-tree",
@@ -7171,7 +7182,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7195,7 +7206,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -7208,7 +7219,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -7234,7 +7245,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "log",
  "sc-client-api",
@@ -7248,7 +7259,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "derive_more",
  "lazy_static",
@@ -7277,7 +7288,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
@@ -7293,7 +7304,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7308,7 +7319,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7326,7 +7337,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "derive_more",
  "dyn-clone",
@@ -7365,7 +7376,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7389,7 +7400,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-warp-sync"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7409,7 +7420,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.12",
@@ -7427,7 +7438,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7447,7 +7458,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -7466,11 +7477,11 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "async-std",
  "async-trait",
- "asynchronous-codec",
+ "asynchronous-codec 0.5.0",
  "bitflags",
  "bs58",
  "bytes 1.0.1",
@@ -7519,7 +7530,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -7535,7 +7546,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -7562,7 +7573,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "futures 0.3.12",
  "libp2p",
@@ -7575,7 +7586,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -7584,7 +7595,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "futures 0.3.12",
  "hash-db",
@@ -7618,7 +7629,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7642,7 +7653,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "futures 0.1.29",
  "jsonrpc-core",
@@ -7660,7 +7671,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "directories",
  "exit-future",
@@ -7723,7 +7734,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7738,7 +7749,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -7758,7 +7769,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "chrono",
  "futures 0.3.12",
@@ -7780,7 +7791,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -7808,7 +7819,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -7819,7 +7830,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7841,7 +7852,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "futures 0.3.12",
  "futures-diagnose",
@@ -8247,7 +8258,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "log",
  "sp-core",
@@ -8259,7 +8270,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -8275,7 +8286,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -8287,7 +8298,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8299,7 +8310,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -8312,7 +8323,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8324,7 +8335,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -8335,7 +8346,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8347,7 +8358,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "futures 0.3.12",
  "log",
@@ -8365,7 +8376,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "serde",
  "serde_json",
@@ -8374,7 +8385,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -8400,7 +8411,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -8420,7 +8431,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -8430,7 +8441,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -8442,7 +8453,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -8486,7 +8497,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -8495,7 +8506,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8505,7 +8516,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8516,7 +8527,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8533,7 +8544,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -8545,7 +8556,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "futures 0.3.12",
  "hash-db",
@@ -8569,7 +8580,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -8580,7 +8591,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8597,7 +8608,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8610,7 +8621,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -8621,7 +8632,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -8631,7 +8642,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "backtrace",
 ]
@@ -8639,7 +8650,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "serde",
  "sp-core",
@@ -8648,7 +8659,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -8669,7 +8680,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8686,7 +8697,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -8698,7 +8709,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "serde",
  "serde_json",
@@ -8707,7 +8718,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8720,7 +8731,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8730,7 +8741,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "hash-db",
  "log",
@@ -8752,12 +8763,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 
 [[package]]
 name = "sp-storage"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8770,7 +8781,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "log",
  "sp-core",
@@ -8783,7 +8794,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8797,7 +8808,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8810,7 +8821,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -8826,7 +8837,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -8840,7 +8851,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "futures 0.3.12",
  "futures-core",
@@ -8852,7 +8863,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8864,7 +8875,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8996,7 +9007,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -9023,7 +9034,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "platforms",
 ]
@@ -9031,7 +9042,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.12",
@@ -9054,7 +9065,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "async-std",
  "derive_more",
@@ -9068,7 +9079,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "futures 0.1.29",
  "futures 0.3.12",
@@ -9095,7 +9106,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "futures 0.3.12",
  "substrate-test-utils-derive",
@@ -9105,7 +9116,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3c1c49e8317abfedaede198ef4aed8173eb23ef0"
+source = "git+https://github.com/paritytech/substrate#59494855205374e8f27fb131425dfd78897a9298"
 dependencies = [
  "proc-macro-crate",
  "quote",
@@ -9885,7 +9896,19 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35581ff83d4101e58b582e607120c7f5ffb17e632a980b1f38334d76b36908b2"
 dependencies = [
- "asynchronous-codec",
+ "asynchronous-codec 0.5.0",
+ "bytes 1.0.1",
+ "futures-io",
+ "futures-util",
+]
+
+[[package]]
+name = "unsigned-varint"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f8d425fafb8cd76bc3f22aace4af471d3156301d7508f2107e98fbeae10bc7f"
+dependencies = [
+ "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
  "futures-io",
  "futures-util",
@@ -10590,9 +10613,9 @@ dependencies = [
 
 [[package]]
 name = "yamux"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aeb8c4043cac71c3c299dff107171c220d179492350ea198e109a414981b83c"
+checksum = "1cc7bd8c983209ed5d527f44b01c41b7dc146fd960c61cf9e1d25399841dc271"
 dependencies = [
  "futures 0.3.12",
  "log",
diff --git a/polkadot/node/core/approval-voting/src/criteria.rs b/polkadot/node/core/approval-voting/src/criteria.rs
index 706af13b27..62300e7620 100644
--- a/polkadot/node/core/approval-voting/src/criteria.rs
+++ b/polkadot/node/core/approval-voting/src/criteria.rs
@@ -248,15 +248,14 @@ pub(crate) fn compute_assignments(
 ) -> HashMap<CoreIndex, OurAssignment> {
 	let (index, assignments_key): (ValidatorIndex, AssignmentPair) = {
 		let key = config.assignment_keys.iter().enumerate()
-			.filter_map(|(i, p)| match keystore.key_pair(p) {
-				Ok(pair) => Some((i as ValidatorIndex, pair)),
-				Err(sc_keystore::Error::PairNotFound(_)) => None,
+			.find_map(|(i, p)| match keystore.key_pair(p) {
+				Ok(Some(pair)) => Some((i as ValidatorIndex, pair)),
+				Ok(None) => None,
 				Err(e) => {
 					tracing::warn!(target: LOG_TARGET, "Encountered keystore error: {:?}", e);
 					None
 				}
-			})
-			.next();
+			});
 
 		match key {
 			None => return Default::default(),
diff --git a/polkadot/node/core/approval-voting/src/lib.rs b/polkadot/node/core/approval-voting/src/lib.rs
index 6c1ac204c2..e85a679846 100644
--- a/polkadot/node/core/approval-voting/src/lib.rs
+++ b/polkadot/node/core/approval-voting/src/lib.rs
@@ -1384,7 +1384,7 @@ fn sign_approval(
 	candidate_hash: CandidateHash,
 	session_index: SessionIndex,
 ) -> Option<ValidatorSignature> {
-	let key = keystore.key_pair::<ValidatorPair>(public).ok()?;
+	let key = keystore.key_pair::<ValidatorPair>(public).ok().flatten()?;
 
 	let payload = approval_signing_payload(
 		ApprovalVote(candidate_hash),
diff --git a/polkadot/node/core/backing/src/lib.rs b/polkadot/node/core/backing/src/lib.rs
index 1ceff2d145..a5bc9fab29 100644
--- a/polkadot/node/core/backing/src/lib.rs
+++ b/polkadot/node/core/backing/src/lib.rs
@@ -891,7 +891,8 @@ impl CandidateBackingJob {
 			.as_ref()?
 			.sign(self.keystore.clone(), statement)
 			.await
-			.ok()?;
+			.ok()
+			.flatten()?;
 		self.metrics.on_statement_signed();
 		Some(signed)
 	}
@@ -1600,7 +1601,7 @@ mod tests {
 				&test_state.signing_context,
 				2,
 				&public2.into(),
-			).await.expect("should be signed");
+			).await.ok().flatten().expect("should be signed");
 
 			let signed_b = SignedFullStatement::sign(
 				&test_state.keystore,
@@ -1608,7 +1609,7 @@ mod tests {
 				&test_state.signing_context,
 				5,
 				&public1.into(),
-			).await.expect("should be signed");
+			).await.ok().flatten().expect("should be signed");
 
 			let statement = CandidateBackingMessage::Statement(test_state.relay_parent, signed_a.clone());
 
@@ -1742,7 +1743,7 @@ mod tests {
 				&test_state.signing_context,
 				2,
 				&public2.into(),
-			).await.expect("should be signed");
+			).await.ok().flatten().expect("should be signed");
 
 			let signed_b = SignedFullStatement::sign(
 				&test_state.keystore,
@@ -1750,7 +1751,7 @@ mod tests {
 				&test_state.signing_context,
 				5,
 				&public1.into(),
-			).await.expect("should be signed");
+			).await.ok().flatten().expect("should be signed");
 
 			let signed_c = SignedFullStatement::sign(
 				&test_state.keystore,
@@ -1758,7 +1759,7 @@ mod tests {
 				&test_state.signing_context,
 				3,
 				&public3.into(),
-			).await.expect("should be signed");
+			).await.ok().flatten().expect("should be signed");
 
 			let statement = CandidateBackingMessage::Statement(test_state.relay_parent, signed_a.clone());
 			virtual_overseer.send(FromOverseer::Communication{ msg: statement }).await;
@@ -1895,7 +1896,7 @@ mod tests {
 				&test_state.signing_context,
 				2,
 				&public2.into(),
-			).await.expect("should be signed");
+			).await.ok().flatten().expect("should be signed");
 
 			let signed_b = SignedFullStatement::sign(
 				&test_state.keystore,
@@ -1903,7 +1904,7 @@ mod tests {
 				&test_state.signing_context,
 				2,
 				&public2.into(),
-			).await.expect("should be signed");
+			).await.ok().flatten().expect("should be signed");
 
 			let signed_c = SignedFullStatement::sign(
 				&test_state.keystore,
@@ -1911,7 +1912,7 @@ mod tests {
 				&test_state.signing_context,
 				0,
 				&public0.into(),
-			).await.expect("should be signed");
+			).await.ok().flatten().expect("should be signed");
 
 			let statement = CandidateBackingMessage::Statement(test_state.relay_parent, signed_a.clone());
 
@@ -2224,7 +2225,7 @@ mod tests {
 				&test_state.signing_context,
 				2,
 				&validator2.into(),
-			).await.expect("should be signed");
+			).await.ok().flatten().expect("should be signed");
 
 			// Send in a `Statement` with a candidate.
 			let statement = CandidateBackingMessage::Statement(
@@ -2362,7 +2363,7 @@ mod tests {
 				&test_state.signing_context,
 				2,
 				&public2.into(),
-			).await.expect("should be signed");
+			).await.ok().flatten().expect("should be signed");
 
 			// Send in a `Statement` with a candidate.
 			let statement = CandidateBackingMessage::Statement(
@@ -2504,7 +2505,7 @@ mod tests {
 				&test_state.signing_context,
 				2,
 				&public2.into(),
-			).await.expect("should be signed");
+			).await.ok().flatten().expect("should be signed");
 
 			let statement = CandidateBackingMessage::Statement(
 				test_state.relay_parent,
diff --git a/polkadot/node/core/bitfield-signing/src/lib.rs b/polkadot/node/core/bitfield-signing/src/lib.rs
index f337db4091..bd01d66cb4 100644
--- a/polkadot/node/core/bitfield-signing/src/lib.rs
+++ b/polkadot/node/core/bitfield-signing/src/lib.rs
@@ -268,10 +268,20 @@ impl JobTrait for BitfieldSigningJob {
 			drop(span_availability);
 			let _span = span.child("signing");
 
-			let signed_bitfield = validator
-				.sign(keystore.clone(), bitfield)
+			let signed_bitfield = match validator.sign(keystore.clone(), bitfield)
 				.await
-				.map_err(|e| Error::Keystore(e))?;
+				.map_err(|e| Error::Keystore(e))?
+			{
+				Some(b) => b,
+				None => {
+					tracing::error!(
+						target: LOG_TARGET,
+						"Key was found at construction, but while signing it could not be found.",
+					);
+					return Ok(());
+				}
+			};
+
 			metrics.on_bitfield_signed();
 
 			drop(_span);
diff --git a/polkadot/node/core/provisioner/src/tests.rs b/polkadot/node/core/provisioner/src/tests.rs
index 40a1c51e1a..cc1ef3d46a 100644
--- a/polkadot/node/core/provisioner/src/tests.rs
+++ b/polkadot/node/core/provisioner/src/tests.rs
@@ -63,7 +63,7 @@ mod select_availability_bitfields {
 			&<SigningContext<Hash>>::default(),
 			validator_idx,
 			&public.into(),
-		).await.expect("Should be signed")
+		).await.ok().flatten().expect("Should be signed")
 	}
 
 	#[test]
diff --git a/polkadot/node/network/bitfield-distribution/src/lib.rs b/polkadot/node/network/bitfield-distribution/src/lib.rs
index ee36b68834..9978b720e8 100644
--- a/polkadot/node/network/bitfield-distribution/src/lib.rs
+++ b/polkadot/node/network/bitfield-distribution/src/lib.rs
@@ -884,7 +884,7 @@ mod test {
 			&signing_context,
 			0,
 			&malicious.into(),
-		)).expect("should be signed");
+		)).ok().flatten().expect("should be signed");
 
 		let msg = BitfieldGossipMessage {
 			relay_parent: hash_a.clone(),
@@ -949,7 +949,7 @@ mod test {
 			&signing_context,
 			42,
 			&validator,
-		)).expect("should be signed");
+		)).ok().flatten().expect("should be signed");
 
 		let msg = BitfieldGossipMessage {
 			relay_parent: hash_a.clone(),
@@ -1006,7 +1006,7 @@ mod test {
 			&signing_context,
 			0,
 			&validator,
-		)).expect("should be signed");
+		)).ok().flatten().expect("should be signed");
 
 		let msg = BitfieldGossipMessage {
 			relay_parent: hash_a.clone(),
@@ -1121,7 +1121,7 @@ mod test {
 			&signing_context,
 			0,
 			&validator,
-		)).expect("should be signed");
+		)).ok().flatten().expect("should be signed");
 
 		state.peer_views.insert(peer_b.clone(), view![hash]);
 		state.peer_views.insert(peer_a.clone(), view![hash]);
@@ -1217,7 +1217,7 @@ mod test {
 			&signing_context,
 			0,
 			&validator,
-		)).expect("should be signed");
+		)).ok().flatten().expect("should be signed");
 
 		let msg = BitfieldGossipMessage {
 			relay_parent: hash_a.clone(),
@@ -1376,7 +1376,7 @@ mod test {
 			&signing_context,
 			0,
 			&validator,
-		)).expect("should be signed");
+		)).ok().flatten().expect("should be signed");
 
 		state.peer_views.insert(peer_b.clone(), view![hash]);
 		state.peer_views.insert(peer_a.clone(), view![hash]);
diff --git a/polkadot/node/network/statement-distribution/src/lib.rs b/polkadot/node/network/statement-distribution/src/lib.rs
index ba22d3e172..a5a6c1247f 100644
--- a/polkadot/node/network/statement-distribution/src/lib.rs
+++ b/polkadot/node/network/statement-distribution/src/lib.rs
@@ -1135,7 +1135,7 @@ mod tests {
 			&signing_context,
 			0,
 			&alice_public.into(),
-		)).expect("should be signed");
+		)).ok().flatten().expect("should be signed");
 		let noted = head_data.note_statement(a_seconded_val_0.clone());
 
 		assert_matches!(noted, NotedStatement::Fresh(_));
@@ -1152,7 +1152,7 @@ mod tests {
 			&signing_context,
 			0,
 			&alice_public.into(),
-		)).expect("should be signed"));
+		)).ok().flatten().expect("should be signed"));
 
 		assert_matches!(noted, NotedStatement::Fresh(_));
 
@@ -1163,7 +1163,7 @@ mod tests {
 			&signing_context,
 			0,
 			&alice_public.into(),
-		)).expect("should be signed"));
+		)).ok().flatten().expect("should be signed"));
 
 		assert_matches!(noted, NotedStatement::NotUseful);
 
@@ -1174,7 +1174,7 @@ mod tests {
 			&signing_context,
 			1,
 			&bob_public.into(),
-		)).expect("should be signed"));
+		)).ok().flatten().expect("should be signed"));
 
 		assert_matches!(noted, NotedStatement::Fresh(_));
 
@@ -1185,7 +1185,7 @@ mod tests {
 			&signing_context,
 			1,
 			&bob_public.into(),
-		)).expect("should be signed"));
+		)).ok().flatten().expect("should be signed"));
 
 		assert_matches!(noted, NotedStatement::Fresh(_));
 	}
@@ -1388,7 +1388,7 @@ mod tests {
 				&signing_context,
 				0,
 				&alice_public.into(),
-			)).expect("should be signed"));
+			)).ok().flatten().expect("should be signed"));
 
 			assert_matches!(noted, NotedStatement::Fresh(_));
 
@@ -1398,7 +1398,7 @@ mod tests {
 				&signing_context,
 				1,
 				&bob_public.into(),
-			)).expect("should be signed"));
+			)).ok().flatten().expect("should be signed"));
 
 			assert_matches!(noted, NotedStatement::Fresh(_));
 
@@ -1408,7 +1408,7 @@ mod tests {
 				&signing_context,
 				2,
 				&charlie_public.into(),
-			)).expect("should be signed"));
+			)).ok().flatten().expect("should be signed"));
 
 			assert_matches!(noted, NotedStatement::Fresh(_));
 
@@ -1540,7 +1540,7 @@ mod tests {
 					&signing_context,
 					0,
 					&alice_public.into(),
-				).await.expect("should be signed");
+				).await.ok().flatten().expect("should be signed");
 
 				StoredStatement {
 					comparator: StoredStatementComparator {
@@ -1708,7 +1708,7 @@ mod tests {
 					&signing_context,
 					0,
 					&alice_public.into(),
-				).await.expect("should be signed")
+				).await.ok().flatten().expect("should be signed")
 			};
 
 			handle.send(FromOverseer::Communication {
diff --git a/polkadot/node/subsystem-util/src/lib.rs b/polkadot/node/subsystem-util/src/lib.rs
index eb044a7711..ae9b89f891 100644
--- a/polkadot/node/subsystem-util/src/lib.rs
+++ b/polkadot/node/subsystem-util/src/lib.rs
@@ -351,7 +351,7 @@ impl Validator {
 		&self,
 		keystore: SyncCryptoStorePtr,
 		payload: Payload,
-	) -> Result<Signed<Payload, RealPayload>, KeystoreError> {
+	) -> Result<Option<Signed<Payload, RealPayload>>, KeystoreError> {
 		Signed::sign(&keystore, payload, &self.signing_context, self.index, &self.key).await
 	}
 
diff --git a/polkadot/primitives/src/v0.rs b/polkadot/primitives/src/v0.rs
index d806e4a93c..def72dac7b 100644
--- a/polkadot/primitives/src/v0.rs
+++ b/polkadot/primitives/src/v0.rs
@@ -915,20 +915,26 @@ impl<Payload: EncodeAs<RealPayload>, RealPayload: Encode> Signed<Payload, RealPa
 		context: &SigningContext<H>,
 		validator_index: ValidatorIndex,
 		key: &ValidatorId,
-	) -> Result<Self, KeystoreError> {
+	) -> Result<Option<Self>, KeystoreError> {
 		let data = Self::payload_data(&payload, context);
-		let signature: ValidatorSignature = CryptoStore::sign_with(
+		let signature = CryptoStore::sign_with(
 			&**keystore,
 			ValidatorId::ID,
 			&key.into(),
 			&data,
-		).await?.try_into().map_err(|_| KeystoreError::KeyNotSupported(ValidatorId::ID))?;
-		Ok(Self {
+		).await?;
+
+		let signature = match signature {
+			Some(sig) => sig.try_into().map_err(|_| KeystoreError::KeyNotSupported(ValidatorId::ID))?,
+			None => return Ok(None),
+		};
+
+		Ok(Some(Self {
 			payload,
 			validator_index,
 			signature,
 			real_payload: std::marker::PhantomData,
-		})
+		}))
 	}
 
 	/// Validate the payload given the context and public key.
diff --git a/polkadot/runtime/parachains/src/inclusion.rs b/polkadot/runtime/parachains/src/inclusion.rs
index 5692a95e77..267cf27219 100644
--- a/polkadot/runtime/parachains/src/inclusion.rs
+++ b/polkadot/runtime/parachains/src/inclusion.rs
@@ -1000,7 +1000,7 @@ mod tests {
 				signing_context,
 				*val_idx,
 				&key.public().into(),
-			).await.unwrap().signature().clone();
+			).await.unwrap().unwrap().signature().clone();
 
 			validity_votes.push(ValidityAttestation::Explicit(signature).into());
 		}
@@ -1101,7 +1101,7 @@ mod tests {
 			&signing_context,
 			validator_index,
 			&key.public().into(),
-		).await.unwrap()
+		).await.unwrap().unwrap()
 	}
 
 	#[derive(Default)]