diff --git a/Cargo.lock b/Cargo.lock
index 7e6f6123422e..0c5afe871760 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -312,9 +312,9 @@ dependencies = [
 
 [[package]]
 name = "async-std-resolver"
-version = "0.21.2"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f2f8a4a203be3325981310ab243a28e6e4ea55b6519bffce05d41ab60e09ad8"
+checksum = "6ba50e24d9ee0a8950d3d03fc6d0dd10aa14b5de3b101949b4e160f7fee7c723"
 dependencies = [
  "async-std",
  "async-trait",
@@ -435,7 +435,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -472,7 +472,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "beefy-gadget",
  "beefy-primitives",
@@ -492,7 +492,7 @@ dependencies = [
 [[package]]
 name = "beefy-merkle-tree"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "beefy-primitives",
  "sp-api",
@@ -502,7 +502,7 @@ dependencies = [
 [[package]]
 name = "beefy-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -515,12 +515,6 @@ dependencies = [
  "sp-std",
 ]
 
-[[package]]
-name = "bimap"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50ae17cabbc8a38a1e3e4c1a6a664e9a09672dc14d0896fa8d865d3a5a446b07"
-
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -628,7 +622,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
 dependencies = [
- "block-padding 0.1.5",
+ "block-padding",
  "byte-tools",
  "byteorder",
  "generic-array 0.12.4",
@@ -640,7 +634,6 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "block-padding 0.2.1",
  "generic-array 0.14.4",
 ]
 
@@ -662,12 +655,6 @@ dependencies = [
  "byte-tools",
 ]
 
-[[package]]
-name = "block-padding"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
-
 [[package]]
 name = "blocking"
 version = "1.1.0"
@@ -922,26 +909,24 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.2.22"
+version = "4.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750"
+checksum = "6bf8832993da70a4c6d13c581f4463c2bdda27b9bf1c5498dc4365543abe6d6f"
 dependencies = [
  "atty",
  "bitflags",
  "clap_derive",
  "clap_lex",
- "indexmap",
  "once_cell",
  "strsim",
  "termcolor",
- "textwrap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.2.18"
+version = "4.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
+checksum = "c42f169caba89a7d512b5418b09864543eeb4d497416c917d7137863bd2076ad"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -952,22 +937,13 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.2.4"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
 dependencies = [
  "os_str_bytes",
 ]
 
-[[package]]
-name = "cmake"
-version = "0.1.48"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "coarsetime"
 version = "0.1.22"
@@ -1302,17 +1278,6 @@ dependencies = [
  "cipher",
 ]
 
-[[package]]
-name = "cuckoofilter"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b810a8449931679f64cd7eef1bbd0fa315801b6d5d9cdc1ace2804d6529eee18"
-dependencies = [
- "byteorder",
- "fnv",
- "rand 0.7.3",
-]
-
 [[package]]
 name = "curve25519-dalek"
 version = "2.1.3"
@@ -1662,9 +1627,9 @@ dependencies = [
 
 [[package]]
 name = "enum-as-inner"
-version = "0.4.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
+checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -2016,7 +1981,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2040,7 +2005,7 @@ checksum = "85dcb89d2b10c5f6133de2efd8c11959ce9dbb46a2f7a4cab208c4eeda6ce1ab"
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2063,7 +2028,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "Inflector",
  "array-bytes",
@@ -2114,7 +2079,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -2125,7 +2090,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -2141,7 +2106,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2170,7 +2135,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2202,7 +2167,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "Inflector",
  "cfg-expr",
@@ -2216,7 +2181,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -2228,7 +2193,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2238,7 +2203,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-support",
  "frame-support-test-pallet",
@@ -2261,7 +2226,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test-pallet"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2272,7 +2237,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-support",
  "log",
@@ -2290,7 +2255,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2305,7 +2270,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2314,7 +2279,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -2485,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "generate-bags"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "chrono",
  "frame-election-provider-support",
@@ -2711,12 +2676,6 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
 
-[[package]]
-name = "hex_fmt"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f"
-
 [[package]]
 name = "hmac"
 version = "0.8.1"
@@ -2895,9 +2854,9 @@ dependencies = [
 
 [[package]]
 name = "if-watch"
-version = "1.0.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8f4a3c3d4c89351ca83e120c1c00b27df945d38e05695668c9d4b4f7bc52f3"
+checksum = "065c008e570a43c00de6aed9714035e5ea6a498c255323db9091722af6ee67dd"
 dependencies = [
  "async-io",
  "core-foundation",
@@ -3431,9 +3390,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
 [[package]]
 name = "libp2p"
-version = "0.46.1"
+version = "0.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81327106887e42d004fbdab1fef93675be2e2e07c1b95fce45e2cc813485611d"
+checksum = "ec878fda12ebec479186b3914ebc48ff180fa4c51847e11a1a68bf65249e02c1"
 dependencies = [
  "bytes",
  "futures",
@@ -3441,12 +3400,8 @@ dependencies = [
  "getrandom 0.2.3",
  "instant",
  "lazy_static",
- "libp2p-autonat",
  "libp2p-core",
- "libp2p-deflate",
  "libp2p-dns",
- "libp2p-floodsub",
- "libp2p-gossipsub",
  "libp2p-identify",
  "libp2p-kad",
  "libp2p-mdns",
@@ -3454,49 +3409,24 @@ dependencies = [
  "libp2p-mplex",
  "libp2p-noise",
  "libp2p-ping",
- "libp2p-plaintext",
- "libp2p-pnet",
- "libp2p-relay",
- "libp2p-rendezvous",
  "libp2p-request-response",
  "libp2p-swarm",
  "libp2p-swarm-derive",
  "libp2p-tcp",
- "libp2p-uds",
  "libp2p-wasm-ext",
  "libp2p-websocket",
  "libp2p-yamux",
  "multiaddr",
  "parking_lot 0.12.1",
  "pin-project",
- "rand 0.7.3",
  "smallvec",
 ]
 
-[[package]]
-name = "libp2p-autonat"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4decc51f3573653a9f4ecacb31b1b922dd20c25a6322bb15318ec04287ec46f9"
-dependencies = [
- "async-trait",
- "futures",
- "futures-timer",
- "instant",
- "libp2p-core",
- "libp2p-request-response",
- "libp2p-swarm",
- "log",
- "prost 0.10.3",
- "prost-build 0.10.4",
- "rand 0.8.5",
-]
-
 [[package]]
 name = "libp2p-core"
-version = "0.34.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf9b94cefab7599b2d3dff2f93bee218c6621d68590b23ede4485813cbcece6"
+checksum = "799676bb0807c788065e57551c6527d461ad572162b0519d1958946ff9e0539d"
 dependencies = [
  "asn1_der",
  "bs58",
@@ -3507,17 +3437,15 @@ dependencies = [
  "futures-timer",
  "instant",
  "lazy_static",
- "libsecp256k1",
  "log",
  "multiaddr",
  "multihash",
  "multistream-select",
  "parking_lot 0.12.1",
  "pin-project",
- "prost 0.10.3",
- "prost-build 0.10.4",
+ "prost",
+ "prost-build",
  "rand 0.8.5",
- "ring",
  "rw-stream-sink",
  "sha2 0.10.2",
  "smallvec",
@@ -3527,22 +3455,11 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "libp2p-deflate"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0183dc2a3da1fbbf85e5b6cf51217f55b14f5daea0c455a9536eef646bfec71"
-dependencies = [
- "flate2",
- "futures",
- "libp2p-core",
-]
-
 [[package]]
 name = "libp2p-dns"
-version = "0.34.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cbf54723250fa5d521383be789bf60efdabe6bacfb443f87da261019a49b4b5"
+checksum = "2322c9fb40d99101def6a01612ee30500c89abbbecb6297b3cd252903a4c1720"
 dependencies = [
  "async-std-resolver",
  "futures",
@@ -3553,57 +3470,11 @@ dependencies = [
  "trust-dns-resolver",
 ]
 
-[[package]]
-name = "libp2p-floodsub"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98a4b6ffd53e355775d24b76f583fdda54b3284806f678499b57913adb94f231"
-dependencies = [
- "cuckoofilter",
- "fnv",
- "futures",
- "libp2p-core",
- "libp2p-swarm",
- "log",
- "prost 0.10.3",
- "prost-build 0.10.4",
- "rand 0.7.3",
- "smallvec",
-]
-
-[[package]]
-name = "libp2p-gossipsub"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74b4b888cfbeb1f5551acd3aa1366e01bf88ede26cc3c4645d0d2d004d5ca7b0"
-dependencies = [
- "asynchronous-codec",
- "base64",
- "byteorder",
- "bytes",
- "fnv",
- "futures",
- "hex_fmt",
- "instant",
- "libp2p-core",
- "libp2p-swarm",
- "log",
- "prometheus-client",
- "prost 0.10.3",
- "prost-build 0.10.4",
- "rand 0.7.3",
- "regex",
- "sha2 0.10.2",
- "smallvec",
- "unsigned-varint",
- "wasm-timer",
-]
-
 [[package]]
 name = "libp2p-identify"
-version = "0.37.0"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c50b585518f8efd06f93ac2f976bd672e17cdac794644b3117edd078e96bda06"
+checksum = "dcf9a121f699e8719bda2e6e9e9b6ddafc6cff4602471d6481c1067930ccb29b"
 dependencies = [
  "asynchronous-codec",
  "futures",
@@ -3611,9 +3482,9 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "lru 0.7.8",
- "prost 0.10.3",
- "prost-build 0.10.4",
+ "lru 0.8.0",
+ "prost",
+ "prost-build",
  "prost-codec",
  "smallvec",
  "thiserror",
@@ -3622,9 +3493,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.38.0"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "740862893bb5f06ac24acc9d49bdeadc3a5e52e51818a30a25c1f3519da2c851"
+checksum = "6721c200e2021f6c3fab8b6cf0272ead8912d871610ee194ebd628cecf428f22"
 dependencies = [
  "arrayvec 0.7.2",
  "asynchronous-codec",
@@ -3637,9 +3508,9 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "prost 0.10.3",
- "prost-build 0.10.4",
- "rand 0.7.3",
+ "prost",
+ "prost-build",
+ "rand 0.8.5",
  "sha2 0.10.2",
  "smallvec",
  "thiserror",
@@ -3650,16 +3521,15 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.38.0"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66e5e5919509603281033fd16306c61df7a4428ce274b67af5e14b07de5cdcb2"
+checksum = "761704e727f7d68d58d7bc2231eafae5fc1b9814de24290f126df09d4bd37a15"
 dependencies = [
  "async-io",
  "data-encoding",
  "dns-parser",
  "futures",
  "if-watch",
- "lazy_static",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3671,25 +3541,23 @@ dependencies = [
 
 [[package]]
 name = "libp2p-metrics"
-version = "0.7.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef8aff4a1abef42328fbb30b17c853fff9be986dc39af17ee39f9c5f755c5e0c"
+checksum = "9ee31b08e78b7b8bfd1c4204a9dd8a87b4fcdf6dafc57eb51701c1c264a81cb9"
 dependencies = [
  "libp2p-core",
- "libp2p-gossipsub",
  "libp2p-identify",
  "libp2p-kad",
  "libp2p-ping",
- "libp2p-relay",
  "libp2p-swarm",
  "prometheus-client",
 ]
 
 [[package]]
 name = "libp2p-mplex"
-version = "0.34.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61fd1b20638ec209c5075dfb2e8ce6a7ea4ec3cd3ad7b77f7a477c06d53322e2"
+checksum = "692664acfd98652de739a8acbb0a0d670f1d67190a49be6b4395e22c37337d89"
 dependencies = [
  "asynchronous-codec",
  "bytes",
@@ -3698,16 +3566,16 @@ dependencies = [
  "log",
  "nohash-hasher",
  "parking_lot 0.12.1",
- "rand 0.7.3",
+ "rand 0.8.5",
  "smallvec",
  "unsigned-varint",
 ]
 
 [[package]]
 name = "libp2p-noise"
-version = "0.37.0"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "762408cb5d84b49a600422d7f9a42c18012d8da6ebcd570f9a4a4290ba41fb6f"
+checksum = "048155686bd81fe6cb5efdef0c6290f25ad32a0a42e8f4f72625cf6a505a206f"
 dependencies = [
  "bytes",
  "curve25519-dalek 3.2.0",
@@ -3715,8 +3583,8 @@ dependencies = [
  "lazy_static",
  "libp2p-core",
  "log",
- "prost 0.10.3",
- "prost-build 0.10.4",
+ "prost",
+ "prost-build",
  "rand 0.8.5",
  "sha2 0.10.2",
  "snow",
@@ -3727,105 +3595,25 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "100a6934ae1dbf8a693a4e7dd1d730fd60b774dafc45688ed63b554497c6c925"
-dependencies = [
- "futures",
- "futures-timer",
- "instant",
- "libp2p-core",
- "libp2p-swarm",
- "log",
- "rand 0.7.3",
- "void",
-]
-
-[[package]]
-name = "libp2p-plaintext"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be27bf0820a6238a4e06365b096d428271cce85a129cf16f2fe9eb1610c4df86"
-dependencies = [
- "asynchronous-codec",
- "bytes",
- "futures",
- "libp2p-core",
- "log",
- "prost 0.10.3",
- "prost-build 0.10.4",
- "unsigned-varint",
- "void",
-]
-
-[[package]]
-name = "libp2p-pnet"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f1a458bbda880107b5b36fcb9b5a1ef0c329685da0e203ed692a8ebe64cc92c"
-dependencies = [
- "futures",
- "log",
- "pin-project",
- "rand 0.7.3",
- "salsa20",
- "sha3 0.9.1",
-]
-
-[[package]]
-name = "libp2p-relay"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4931547ee0cce03971ccc1733ff05bb0c4349fd89120a39e9861e2bbe18843c3"
-dependencies = [
- "asynchronous-codec",
- "bytes",
- "either",
- "futures",
- "futures-timer",
- "instant",
- "libp2p-core",
- "libp2p-swarm",
- "log",
- "pin-project",
- "prost 0.10.3",
- "prost-build 0.10.4",
- "prost-codec",
- "rand 0.8.5",
- "smallvec",
- "static_assertions",
- "thiserror",
- "void",
-]
-
-[[package]]
-name = "libp2p-rendezvous"
-version = "0.7.0"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9511c9672ba33284838e349623319c8cad2d18cfad243ae46c6b7e8a2982ea4e"
+checksum = "7228b9318d34689521349a86eb39a3c3a802c9efc99a0568062ffb80913e3f91"
 dependencies = [
- "asynchronous-codec",
- "bimap",
  "futures",
  "futures-timer",
  "instant",
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "prost 0.10.3",
- "prost-build 0.10.4",
  "rand 0.8.5",
- "sha2 0.10.2",
- "thiserror",
- "unsigned-varint",
  "void",
 ]
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.19.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "508a189e2795d892c8f5c1fa1e9e0b1845d32d7b0b249dbf7b05b18811361843"
+checksum = "8827af16a017b65311a410bb626205a9ad92ec0473967618425039fa5231adc1"
 dependencies = [
  "async-trait",
  "bytes",
@@ -3834,16 +3622,16 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "rand 0.7.3",
+ "rand 0.8.5",
  "smallvec",
  "unsigned-varint",
 ]
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.37.0"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ac5be6c2de2d1ff3f7693fda6faf8a827b1f3e808202277783fea9f527d114"
+checksum = "46d13df7c37807965d82930c0e4b04a659efcb6cca237373b206043db5398ecf"
 dependencies = [
  "either",
  "fnv",
@@ -3853,7 +3641,7 @@ dependencies = [
  "libp2p-core",
  "log",
  "pin-project",
- "rand 0.7.3",
+ "rand 0.8.5",
  "smallvec",
  "thiserror",
  "void",
@@ -3861,48 +3649,36 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm-derive"
-version = "0.28.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f54a64b6957249e0ce782f8abf41d97f69330d02bf229f0672d864f0650cc76"
+checksum = "a0eddc4497a8b5a506013c40e8189864f9c3a00db2b25671f428ae9007f3ba32"
 dependencies = [
+ "heck",
  "quote",
  "syn",
 ]
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.34.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a6771dc19aa3c65d6af9a8c65222bfc8fcd446630ddca487acd161fa6096f3b"
+checksum = "9839d96761491c6d3e238e70554b856956fca0ab60feb9de2cd08eed4473fa92"
 dependencies = [
  "async-io",
  "futures",
  "futures-timer",
  "if-watch",
- "ipnet",
  "libc",
  "libp2p-core",
  "log",
  "socket2",
 ]
 
-[[package]]
-name = "libp2p-uds"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d125e3e5f0d58f3c6ac21815b20cf4b6a88b8db9dc26368ea821838f4161fd4d"
-dependencies = [
- "async-std",
- "futures",
- "libp2p-core",
- "log",
-]
-
 [[package]]
 name = "libp2p-wasm-ext"
-version = "0.34.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec894790eec3c1608f8d1a8a0bdf0dbeb79ed4de2dce964222011c2896dfa05a"
+checksum = "a17b5b8e7a73e379e47b1b77f8a82c4721e97eca01abcd18e9cd91a23ca6ce97"
 dependencies = [
  "futures",
  "js-sys",
@@ -3914,9 +3690,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.36.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9808e57e81be76ff841c106b4c5974fb4d41a233a7bdd2afbf1687ac6def3818"
+checksum = "3758ae6f89b2531a24b6d9f5776bda6a626b60a57600d7185d43dfa75ca5ecc4"
 dependencies = [
  "either",
  "futures",
@@ -3933,12 +3709,13 @@ dependencies = [
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.38.0"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6dea686217a06072033dc025631932810e2f6ad784e4fafa42e27d311c7a81c"
+checksum = "30f079097a21ad017fc8139460630286f02488c8c13b26affb46623aa20d8845"
 dependencies = [
  "futures",
  "libp2p-core",
+ "log",
  "parking_lot 0.12.1",
  "thiserror",
  "yamux",
@@ -4376,7 +4153,7 @@ dependencies = [
  "digest 0.10.3",
  "multihash-derive",
  "sha2 0.10.2",
- "sha3 0.10.0",
+ "sha3",
  "unsigned-varint",
 ]
 
@@ -4402,9 +4179,9 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
 [[package]]
 name = "multistream-select"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "363a84be6453a70e63513660f4894ef815daf88e3356bffcda9ca27d810ce83b"
+checksum = "9bc41247ec209813e2fd414d6e16b9d94297dacf3cd613fa6ef09cd4d9755c10"
 dependencies = [
  "bytes",
  "futures",
@@ -4490,9 +4267,9 @@ dependencies = [
 
 [[package]]
 name = "netlink-packet-route"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733ea73609acfd7fa7ddadfb7bf709b0471668c456ad9513685af543a06342b2"
+checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab"
 dependencies = [
  "anyhow",
  "bitflags",
@@ -4516,23 +4293,24 @@ dependencies = [
 
 [[package]]
 name = "netlink-proto"
-version = "0.9.2"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef8785b8141e8432aa45fceb922a7e876d7da3fad37fa7e7ec702ace3aa0826b"
+checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6"
 dependencies = [
  "bytes",
  "futures",
  "log",
  "netlink-packet-core",
  "netlink-sys",
+ "thiserror",
  "tokio",
 ]
 
 [[package]]
 name = "netlink-sys"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e4c9f9547a08241bee7b6558b9b98e1f290d187de8b7cfca2bbb4937bcaa8f8"
+checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027"
 dependencies = [
  "async-io",
  "bytes",
@@ -4541,19 +4319,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "nix"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "memoffset",
-]
-
 [[package]]
 name = "nix"
 version = "0.23.1"
@@ -4840,15 +4605,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "owning_ref"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce"
-dependencies = [
- "stable_deref_trait",
-]
-
 [[package]]
 name = "owo-colors"
 version = "3.2.0"
@@ -4858,7 +4614,7 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4"
 [[package]]
 name = "pallet-assets"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4872,7 +4628,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4888,7 +4644,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4903,7 +4659,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4927,7 +4683,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4947,7 +4703,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list-remote-tests"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-election-provider-support",
  "frame-support",
@@ -4966,7 +4722,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4981,7 +4737,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "beefy-primitives",
  "frame-support",
@@ -4997,7 +4753,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "array-bytes",
  "beefy-merkle-tree",
@@ -5020,7 +4776,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5038,7 +4794,7 @@ dependencies = [
 [[package]]
 name = "pallet-child-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5057,7 +4813,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5074,7 +4830,7 @@ dependencies = [
 [[package]]
 name = "pallet-conviction-voting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -5091,7 +4847,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5109,7 +4865,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5133,7 +4889,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5146,7 +4902,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5164,7 +4920,7 @@ dependencies = [
 [[package]]
 name = "pallet-fast-unstake"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5185,7 +4941,7 @@ dependencies = [
 [[package]]
 name = "pallet-gilt"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5200,7 +4956,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5223,7 +4979,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5239,7 +4995,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5259,7 +5015,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5276,7 +5032,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5293,7 +5049,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "ckb-merkle-mountain-range",
  "frame-benchmarking",
@@ -5311,7 +5067,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -5326,7 +5082,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5342,7 +5098,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5359,7 +5115,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-benchmarking"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5379,7 +5135,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-runtime-api"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -5389,7 +5145,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5406,7 +5162,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5429,7 +5185,7 @@ dependencies = [
 [[package]]
 name = "pallet-preimage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5446,7 +5202,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5461,7 +5217,7 @@ dependencies = [
 [[package]]
 name = "pallet-ranked-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5479,7 +5235,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5494,7 +5250,7 @@ dependencies = [
 [[package]]
 name = "pallet-referenda"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -5512,7 +5268,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5528,7 +5284,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5549,7 +5305,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5565,7 +5321,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5579,7 +5335,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5602,7 +5358,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -5613,7 +5369,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -5622,7 +5378,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5636,7 +5392,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5654,7 +5410,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5673,7 +5429,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5689,7 +5445,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -5704,7 +5460,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5715,7 +5471,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5732,7 +5488,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5748,7 +5504,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5763,7 +5519,7 @@ dependencies = [
 [[package]]
 name = "pallet-whitelist"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7845,21 +7601,21 @@ dependencies = [
 
 [[package]]
 name = "prometheus-client"
-version = "0.16.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1abe0255c04d15f571427a2d1e00099016506cf3297b53853acd2b7eb87825"
+checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c"
 dependencies = [
  "dtoa",
  "itoa 1.0.1",
- "owning_ref",
+ "parking_lot 0.12.1",
  "prometheus-client-derive-text-encode",
 ]
 
 [[package]]
 name = "prometheus-client-derive-text-encode"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8e12d01b9d66ad9eb4529c57666b6263fc1993cb30261d83ead658fdd932652"
+checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7877,16 +7633,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "prost"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc03e116981ff7d8da8e5c220e374587b98d294af7ba7dd7fda761158f00086f"
-dependencies = [
- "bytes",
- "prost-derive 0.10.1",
-]
-
 [[package]]
 name = "prost"
 version = "0.11.0"
@@ -7894,29 +7640,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7"
 dependencies = [
  "bytes",
- "prost-derive 0.11.0",
-]
-
-[[package]]
-name = "prost-build"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab"
-dependencies = [
- "bytes",
- "cfg-if 1.0.0",
- "cmake",
- "heck",
- "itertools",
- "lazy_static",
- "log",
- "multimap",
- "petgraph",
- "prost 0.10.3",
- "prost-types 0.10.1",
- "regex",
- "tempfile",
- "which",
+ "prost-derive",
 ]
 
 [[package]]
@@ -7932,8 +7656,8 @@ dependencies = [
  "log",
  "multimap",
  "petgraph",
- "prost 0.11.0",
- "prost-types 0.11.1",
+ "prost",
+ "prost-types",
  "regex",
  "tempfile",
  "which",
@@ -7941,30 +7665,17 @@ dependencies = [
 
 [[package]]
 name = "prost-codec"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00af1e92c33b4813cc79fda3f2dbf56af5169709be0202df730e9ebc3e4cd007"
+checksum = "011ae9ff8359df7915f97302d591cdd9e0e27fbd5a4ddc5bd13b71079bb20987"
 dependencies = [
  "asynchronous-codec",
  "bytes",
- "prost 0.10.3",
+ "prost",
  "thiserror",
  "unsigned-varint",
 ]
 
-[[package]]
-name = "prost-derive"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc"
-dependencies = [
- "anyhow",
- "itertools",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "prost-derive"
 version = "0.11.0"
@@ -7978,16 +7689,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "prost-types"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68"
-dependencies = [
- "bytes",
- "prost 0.10.3",
-]
-
 [[package]]
 name = "prost-types"
 version = "0.11.1"
@@ -7995,7 +7696,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e"
 dependencies = [
  "bytes",
- "prost 0.11.0",
+ "prost",
 ]
 
 [[package]]
@@ -8301,7 +8002,7 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "env_logger 0.9.0",
  "jsonrpsee",
@@ -8518,16 +8219,16 @@ dependencies = [
 
 [[package]]
 name = "rtnetlink"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f54290e54521dac3de4149d83ddf9f62a359b3cc93bcb494a794a41e6f4744b"
+checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0"
 dependencies = [
  "async-global-executor",
  "futures",
  "log",
  "netlink-packet-route",
  "netlink-proto",
- "nix 0.22.3",
+ "nix 0.24.1",
  "thiserror",
 ]
 
@@ -8628,15 +8329,6 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568"
 
-[[package]]
-name = "salsa20"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0fbb5f676da676c260ba276a8f43a8dc67cf02d1438423aeb1c677a7212686"
-dependencies = [
- "cipher",
-]
-
 [[package]]
 name = "same-file"
 version = "1.0.6"
@@ -8649,7 +8341,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "log",
  "sp-core",
@@ -8660,7 +8352,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "async-trait",
  "futures",
@@ -8669,8 +8361,8 @@ dependencies = [
  "libp2p",
  "log",
  "parity-scale-codec",
- "prost 0.11.0",
- "prost-build 0.11.1",
+ "prost",
+ "prost-build",
  "rand 0.7.3",
  "sc-client-api",
  "sc-network-common",
@@ -8687,7 +8379,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "futures",
  "futures-timer",
@@ -8710,7 +8402,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -8726,7 +8418,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "impl-trait-for-tuples",
  "memmap2 0.5.0",
@@ -8743,7 +8435,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -8754,7 +8446,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "array-bytes",
  "chrono",
@@ -8794,7 +8486,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "fnv",
  "futures",
@@ -8822,7 +8514,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -8847,7 +8539,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "async-trait",
  "futures",
@@ -8871,7 +8563,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -8913,7 +8605,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -8935,7 +8627,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -8948,7 +8640,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "async-trait",
  "futures",
@@ -8972,7 +8664,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "lazy_static",
  "lru 0.7.8",
@@ -8999,7 +8691,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -9015,7 +8707,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9030,7 +8722,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -9050,7 +8742,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "ahash",
  "array-bytes",
@@ -9091,7 +8783,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "finality-grandpa",
  "futures",
@@ -9112,7 +8804,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "ansi_term",
  "futures",
@@ -9129,7 +8821,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -9144,7 +8836,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -9166,7 +8858,7 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "pin-project",
- "prost 0.11.0",
+ "prost",
  "rand 0.7.3",
  "sc-block-builder",
  "sc-client-api",
@@ -9191,14 +8883,14 @@ dependencies = [
 [[package]]
 name = "sc-network-bitswap"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "cid",
  "futures",
  "libp2p",
  "log",
- "prost 0.11.0",
- "prost-build 0.11.1",
+ "prost",
+ "prost-build",
  "sc-client-api",
  "sc-network-common",
  "sp-blockchain",
@@ -9211,7 +8903,7 @@ dependencies = [
 [[package]]
 name = "sc-network-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "async-trait",
  "bitflags",
@@ -9221,7 +8913,7 @@ dependencies = [
  "libp2p",
  "linked_hash_set",
  "parity-scale-codec",
- "prost-build 0.11.1",
+ "prost-build",
  "sc-consensus",
  "sc-peerset",
  "serde",
@@ -9237,7 +8929,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "ahash",
  "futures",
@@ -9255,15 +8947,15 @@ dependencies = [
 [[package]]
 name = "sc-network-light"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "array-bytes",
  "futures",
  "libp2p",
  "log",
  "parity-scale-codec",
- "prost 0.11.0",
- "prost-build 0.11.1",
+ "prost",
+ "prost-build",
  "sc-client-api",
  "sc-network-common",
  "sc-peerset",
@@ -9276,7 +8968,7 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "array-bytes",
  "fork-tree",
@@ -9286,12 +8978,13 @@ dependencies = [
  "lru 0.7.8",
  "mockall",
  "parity-scale-codec",
- "prost 0.11.0",
- "prost-build 0.11.1",
+ "prost",
+ "prost-build",
  "sc-client-api",
  "sc-consensus",
  "sc-network-common",
  "sc-peerset",
+ "sc-utils",
  "smallvec",
  "sp-arithmetic",
  "sp-blockchain",
@@ -9305,7 +8998,7 @@ dependencies = [
 [[package]]
 name = "sc-network-transactions"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "array-bytes",
  "futures",
@@ -9324,7 +9017,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "array-bytes",
  "bytes",
@@ -9354,7 +9047,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "futures",
  "libp2p",
@@ -9367,7 +9060,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -9376,7 +9069,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "futures",
  "hash-db",
@@ -9406,7 +9099,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -9429,7 +9122,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -9442,7 +9135,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-spec-v2"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "futures",
  "hex",
@@ -9461,7 +9154,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "async-trait",
  "directories",
@@ -9532,7 +9225,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9546,7 +9239,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -9565,7 +9258,7 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "futures",
  "libc",
@@ -9584,7 +9277,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "chrono",
  "futures",
@@ -9602,7 +9295,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "ansi_term",
  "atty",
@@ -9633,7 +9326,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -9644,7 +9337,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "async-trait",
  "futures",
@@ -9671,7 +9364,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "async-trait",
  "futures",
@@ -9685,7 +9378,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "futures",
  "futures-timer",
@@ -9991,18 +9684,6 @@ dependencies = [
  "digest 0.10.3",
 ]
 
-[[package]]
-name = "sha3"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
-dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "keccak",
- "opaque-debug 0.3.0",
-]
-
 [[package]]
 name = "sha3"
 version = "0.10.0"
@@ -10171,7 +9852,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "hash-db",
  "log",
@@ -10189,7 +9870,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "blake2",
  "proc-macro-crate",
@@ -10201,7 +9882,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10214,7 +9895,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -10229,7 +9910,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10242,7 +9923,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10254,7 +9935,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -10266,7 +9947,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "futures",
  "log",
@@ -10284,7 +9965,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "async-trait",
  "futures",
@@ -10303,7 +9984,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "async-trait",
  "merlin",
@@ -10326,7 +10007,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10340,7 +10021,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10353,7 +10034,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "array-bytes",
  "base58",
@@ -10399,13 +10080,13 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "blake2",
  "byteorder",
  "digest 0.10.3",
  "sha2 0.10.2",
- "sha3 0.10.0",
+ "sha3",
  "sp-std",
  "twox-hash",
 ]
@@ -10413,7 +10094,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10424,7 +10105,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.1",
@@ -10433,7 +10114,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10443,7 +10124,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -10454,7 +10135,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -10472,7 +10153,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -10486,7 +10167,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "bytes",
  "futures",
@@ -10512,7 +10193,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -10523,7 +10204,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "async-trait",
  "futures",
@@ -10540,7 +10221,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "thiserror",
  "zstd",
@@ -10549,7 +10230,7 @@ dependencies = [
 [[package]]
 name = "sp-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -10565,7 +10246,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10579,7 +10260,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -10589,7 +10270,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -10599,7 +10280,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -10609,7 +10290,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -10632,7 +10313,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -10650,7 +10331,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -10662,7 +10343,7 @@ dependencies = [
 [[package]]
 name = "sp-sandbox"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -10676,7 +10357,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10690,7 +10371,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10701,7 +10382,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "hash-db",
  "log",
@@ -10723,12 +10404,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 
 [[package]]
 name = "sp-storage"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -10741,7 +10422,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "log",
  "sp-core",
@@ -10754,7 +10435,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "async-trait",
  "futures-timer",
@@ -10770,7 +10451,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -10782,7 +10463,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -10791,7 +10472,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "async-trait",
  "log",
@@ -10807,7 +10488,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "ahash",
  "hash-db",
@@ -10830,7 +10511,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -10847,7 +10528,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -10858,7 +10539,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "impl-trait-for-tuples",
  "log",
@@ -10871,7 +10552,7 @@ dependencies = [
 [[package]]
 name = "sp-weights"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -11086,7 +10767,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "platforms",
 ]
@@ -11094,7 +10775,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures",
@@ -11115,7 +10796,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "futures-util",
  "hyper",
@@ -11128,7 +10809,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-trie-migration-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "jsonrpsee",
  "log",
@@ -11149,7 +10830,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -11175,7 +10856,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "futures",
  "substrate-test-utils-derive",
@@ -11185,7 +10866,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -11196,7 +10877,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "ansi_term",
  "build-helper",
@@ -11441,12 +11122,6 @@ dependencies = [
  "sp-runtime",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
-
 [[package]]
 name = "thiserror"
 version = "1.0.31"
@@ -11859,9 +11534,9 @@ dependencies = [
 
 [[package]]
 name = "trust-dns-proto"
-version = "0.21.2"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d"
+checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26"
 dependencies = [
  "async-trait",
  "cfg-if 1.0.0",
@@ -11873,30 +11548,30 @@ dependencies = [
  "idna",
  "ipnet",
  "lazy_static",
- "log",
  "rand 0.8.5",
  "smallvec",
  "thiserror",
  "tinyvec",
+ "tracing",
  "url",
 ]
 
 [[package]]
 name = "trust-dns-resolver"
-version = "0.21.2"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558"
+checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe"
 dependencies = [
  "cfg-if 1.0.0",
  "futures-util",
  "ipconfig",
  "lazy_static",
- "log",
  "lru-cache",
  "parking_lot 0.12.1",
  "resolv-conf",
  "smallvec",
  "thiserror",
+ "tracing",
  "trust-dns-proto",
 ]
 
@@ -11909,7 +11584,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5"
+source = "git+https://github.com/paritytech/substrate?branch=master#e8a4408c53ae2a1a0ef6cb2f7b603887a231c16f"
 dependencies = [
  "clap",
  "frame-try-runtime",
@@ -11929,6 +11604,7 @@ dependencies = [
  "sp-runtime",
  "sp-state-machine",
  "sp-version",
+ "sp-weights",
  "zstd",
 ]
 
@@ -12705,15 +12381,15 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows"
-version = "0.29.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac7fef12f4b59cd0a29339406cc9203ab44e440ddff6b3f5a41455349fa9cf3"
+checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f"
 dependencies = [
- "windows_aarch64_msvc 0.29.0",
- "windows_i686_gnu 0.29.0",
- "windows_i686_msvc 0.29.0",
- "windows_x86_64_gnu 0.29.0",
- "windows_x86_64_msvc 0.29.0",
+ "windows_aarch64_msvc 0.34.0",
+ "windows_i686_gnu 0.34.0",
+ "windows_i686_msvc 0.34.0",
+ "windows_x86_64_gnu 0.34.0",
+ "windows_x86_64_msvc 0.34.0",
 ]
 
 [[package]]
@@ -12744,15 +12420,15 @@ dependencies = [
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.29.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d027175d00b01e0cbeb97d6ab6ebe03b12330a35786cbaca5252b1c4bf5d9b"
+checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.32.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5"
+checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -12762,15 +12438,15 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.29.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8793f59f7b8e8b01eda1a652b2697d87b93097198ae85f823b969ca5b89bba58"
+checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.32.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615"
+checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -12780,15 +12456,15 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.29.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8602f6c418b67024be2996c512f5f995de3ba417f4c75af68401ab8756796ae4"
+checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.32.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172"
+checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -12798,15 +12474,15 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.29.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d615f419543e0bd7d2b3323af0d86ff19cbc4f816e6453f36a2c2ce889c354"
+checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.32.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc"
+checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -12816,15 +12492,15 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.29.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d95421d9ed3672c280884da53201a5c46b7b2765ca6faf34b0d71cf34a3561"
+checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.32.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316"
+checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"
 
 [[package]]
 name = "windows_x86_64_msvc"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 1be1b63c0cfb..726fecda1513 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -14,7 +14,7 @@ wasm-opt = false
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-clap = { version = "3.1", features = ["derive"], optional = true }
+clap = { version = "4.0.9", features = ["derive"], optional = true }
 log = "0.4.17"
 thiserror = "1.0.31"
 futures = "0.3.21"
diff --git a/cli/src/cli.rs b/cli/src/cli.rs
index 43e49019c019..a6b7f4a3d5c9 100644
--- a/cli/src/cli.rs
+++ b/cli/src/cli.rs
@@ -43,16 +43,16 @@ pub enum Subcommand {
 	Revert(sc_cli::RevertCmd),
 
 	#[allow(missing_docs)]
-	#[clap(name = "prepare-worker", hide = true)]
+	#[command(name = "prepare-worker", hide = true)]
 	PvfPrepareWorker(ValidationWorkerCommand),
 
 	#[allow(missing_docs)]
-	#[clap(name = "execute-worker", hide = true)]
+	#[command(name = "execute-worker", hide = true)]
 	PvfExecuteWorker(ValidationWorkerCommand),
 
 	/// Sub-commands concerned with benchmarking.
 	/// The pallet benchmarking moved to the `pallet` sub-command.
-	#[clap(subcommand)]
+	#[command(subcommand)]
 	Benchmark(frame_benchmarking_cli::BenchmarkCmd),
 
 	/// Runs performance checks such as PVF compilation in order to measure machine
@@ -68,7 +68,7 @@ pub enum Subcommand {
 	TryRuntime,
 
 	/// Key management CLI utilities
-	#[clap(subcommand)]
+	#[command(subcommand)]
 	Key(sc_cli::KeySubcommand),
 
 	/// Db meta columns information.
@@ -84,21 +84,22 @@ pub struct ValidationWorkerCommand {
 
 #[allow(missing_docs)]
 #[derive(Debug, Parser)]
+#[group(skip)]
 pub struct RunCmd {
 	#[allow(missing_docs)]
 	#[clap(flatten)]
 	pub base: sc_cli::RunCmd,
 
 	/// Force using Kusama native runtime.
-	#[clap(long = "force-kusama")]
+	#[arg(long = "force-kusama")]
 	pub force_kusama: bool,
 
 	/// Force using Westend native runtime.
-	#[clap(long = "force-westend")]
+	#[arg(long = "force-westend")]
 	pub force_westend: bool,
 
 	/// Force using Rococo native runtime.
-	#[clap(long = "force-rococo")]
+	#[arg(long = "force-rococo")]
 	pub force_rococo: bool,
 
 	/// Setup a GRANDPA scheduled voting pause.
@@ -107,25 +108,25 @@ pub struct RunCmd {
 	/// blocks). After the given block number is finalized the GRANDPA voter
 	/// will temporarily stop voting for new blocks until the given delay has
 	/// elapsed (i.e. until a block at height `pause_block + delay` is imported).
-	#[clap(long = "grandpa-pause", number_of_values(2))]
+	#[arg(long = "grandpa-pause", num_args = 2)]
 	pub grandpa_pause: Vec<u32>,
 
 	/// Enable the BEEFY gadget (only on Rococo or Wococo for now).
-	#[clap(long)]
+	#[arg(long)]
 	pub beefy: bool,
 
 	/// Add the destination address to the jaeger agent.
 	///
 	/// Must be valid socket address, of format `IP:Port`
 	/// commonly `127.0.0.1:6831`.
-	#[clap(long)]
+	#[arg(long)]
 	pub jaeger_agent: Option<String>,
 
 	/// Add the destination address to the `pyroscope` agent.
 	///
 	/// Must be valid socket address, of format `IP:Port`
 	/// commonly `127.0.0.1:4040`.
-	#[clap(long)]
+	#[arg(long)]
 	pub pyroscope_server: Option<String>,
 
 	/// Disable automatic hardware benchmarks.
@@ -135,20 +136,20 @@ pub struct RunCmd {
 	///
 	/// The results are then printed out in the logs, and also sent as part of
 	/// telemetry, if telemetry is enabled.
-	#[clap(long)]
+	#[arg(long)]
 	pub no_hardware_benchmarks: bool,
 
 	/// Overseer message capacity override.
 	///
 	/// **Dangerous!** Do not touch unless explicitly adviced to.
-	#[clap(long)]
+	#[arg(long)]
 	pub overseer_channel_capacity_override: Option<usize>,
 }
 
 #[allow(missing_docs)]
 #[derive(Debug, Parser)]
 pub struct Cli {
-	#[clap(subcommand)]
+	#[command(subcommand)]
 	pub subcommand: Option<Subcommand>,
 	#[clap(flatten)]
 	pub run: RunCmd,
diff --git a/node/malus/Cargo.toml b/node/malus/Cargo.toml
index 9548857a03ed..e7fe9ebc8aa6 100644
--- a/node/malus/Cargo.toml
+++ b/node/malus/Cargo.toml
@@ -29,7 +29,7 @@ assert_matches = "1.5"
 async-trait = "0.1.57"
 sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-clap = { version = "3.2.21", features = ["derive"] }
+clap = { version = "4.0.9", features = ["derive"] }
 futures = "0.3.21"
 futures-timer = "3.0.2"
 gum = { package = "tracing-gum", path = "../gum/" }
diff --git a/node/malus/src/malus.rs b/node/malus/src/malus.rs
index 13e232198ea6..bb466d4ba4de 100644
--- a/node/malus/src/malus.rs
+++ b/node/malus/src/malus.rs
@@ -28,8 +28,7 @@ use variants::*;
 
 /// Define the different variants of behavior.
 #[derive(Debug, Parser)]
-#[clap(about = "Malus - the nemesis of polkadot.", version)]
-#[clap(rename_all = "kebab-case")]
+#[command(about = "Malus - the nemesis of polkadot.", version, rename_all = "kebab-case")]
 enum NemesisVariant {
 	/// Suggest a candidate with an invalid proof of validity.
 	SuggestGarbageCandidate(SuggestGarbageCandidateOptions),
@@ -39,18 +38,18 @@ enum NemesisVariant {
 	DisputeAncestor(DisputeAncestorOptions),
 
 	#[allow(missing_docs)]
-	#[clap(name = "prepare-worker", hide = true)]
+	#[command(name = "prepare-worker", hide = true)]
 	PvfPrepareWorker(polkadot_cli::ValidationWorkerCommand),
 
 	#[allow(missing_docs)]
-	#[clap(name = "execute-worker", hide = true)]
+	#[command(name = "execute-worker", hide = true)]
 	PvfExecuteWorker(polkadot_cli::ValidationWorkerCommand),
 }
 
 #[derive(Debug, Parser)]
 #[allow(missing_docs)]
 struct MalusCli {
-	#[clap(subcommand)]
+	#[command(subcommand)]
 	pub variant: NemesisVariant,
 	/// Sets the minimum delay between the best and finalized block.
 	pub finality_delay: Option<u32>,
diff --git a/node/malus/src/variants/common.rs b/node/malus/src/variants/common.rs
index 845dac0b6fea..610b43bc33a4 100644
--- a/node/malus/src/variants/common.rs
+++ b/node/malus/src/variants/common.rs
@@ -33,11 +33,10 @@ use polkadot_primitives::v2::{
 };
 
 use futures::channel::oneshot;
-
 use rand::distributions::{Bernoulli, Distribution};
 
-#[derive(clap::ArgEnum, Clone, Copy, Debug, PartialEq)]
-#[clap(rename_all = "kebab-case")]
+#[derive(clap::ValueEnum, Clone, Copy, Debug, PartialEq)]
+#[value(rename_all = "kebab-case")]
 #[non_exhaustive]
 pub enum FakeCandidateValidation {
 	Disabled,
@@ -50,8 +49,8 @@ pub enum FakeCandidateValidation {
 }
 
 /// Candidate invalidity details
-#[derive(clap::ArgEnum, Clone, Copy, Debug, PartialEq)]
-#[clap(rename_all = "kebab-case")]
+#[derive(clap::ValueEnum, Clone, Copy, Debug, PartialEq)]
+#[value(rename_all = "kebab-case")]
 pub enum FakeCandidateValidationError {
 	/// Validation outputs check doesn't pass.
 	InvalidOutputs,
diff --git a/node/malus/src/variants/dispute_valid_candidates.rs b/node/malus/src/variants/dispute_valid_candidates.rs
index c8e6afe643c5..cea058023d6f 100644
--- a/node/malus/src/variants/dispute_valid_candidates.rs
+++ b/node/malus/src/variants/dispute_valid_candidates.rs
@@ -41,18 +41,18 @@ use crate::{interceptor::*, variants::ReplaceValidationResult};
 use std::sync::Arc;
 
 #[derive(Debug, clap::Parser)]
-#[clap(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
 #[allow(missing_docs)]
 pub struct DisputeAncestorOptions {
 	/// Malicious candidate validation subsystem configuration. When enabled, node PVF execution is skipped
 	/// during backing and/or approval and it's result can by specified by this option and `--fake-validation-error`
 	/// for invalid candidate outcomes.
-	#[clap(long, arg_enum, ignore_case = true, default_value_t = FakeCandidateValidation::BackingAndApprovalInvalid)]
+	#[arg(long, value_enum, ignore_case = true, default_value_t = FakeCandidateValidation::BackingAndApprovalInvalid)]
 	pub fake_validation: FakeCandidateValidation,
 
 	/// Applies only when `--fake-validation` is configured to reject candidates as invalid. It allows
 	/// to specify the exact error to return from the malicious candidate validation subsystem.
-	#[clap(long, arg_enum, ignore_case = true, default_value_t = FakeCandidateValidationError::InvalidOutputs)]
+	#[arg(long, value_enum, ignore_case = true, default_value_t = FakeCandidateValidationError::InvalidOutputs)]
 	pub fake_validation_error: FakeCandidateValidationError,
 
 	/// Determines the percentage of candidates that should be disputed. Allows for fine-tuning
diff --git a/parachain/test-parachains/adder/collator/Cargo.toml b/parachain/test-parachains/adder/collator/Cargo.toml
index 0463711130d2..6b41824b2e76 100644
--- a/parachain/test-parachains/adder/collator/Cargo.toml
+++ b/parachain/test-parachains/adder/collator/Cargo.toml
@@ -15,7 +15,7 @@ path = "bin/puppet_worker.rs"
 
 [dependencies]
 parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive"] }
-clap = { version = "3.1", features = ["derive"] }
+clap = { version = "4.0.9", features = ["derive"] }
 futures = "0.3.21"
 futures-timer = "3.0.2"
 log = "0.4.17"
diff --git a/parachain/test-parachains/adder/collator/src/cli.rs b/parachain/test-parachains/adder/collator/src/cli.rs
index 8e55a7821f3d..a71837c4663a 100644
--- a/parachain/test-parachains/adder/collator/src/cli.rs
+++ b/parachain/test-parachains/adder/collator/src/cli.rs
@@ -23,11 +23,11 @@ use sc_cli::{RuntimeVersion, SubstrateCli};
 #[derive(Debug, Parser)]
 pub enum Subcommand {
 	/// Export the genesis state of the parachain.
-	#[clap(name = "export-genesis-state")]
+	#[command(name = "export-genesis-state")]
 	ExportGenesisState(ExportGenesisStateCommand),
 
 	/// Export the genesis wasm of the parachain.
-	#[clap(name = "export-genesis-wasm")]
+	#[command(name = "export-genesis-wasm")]
 	ExportGenesisWasm(ExportGenesisWasmCommand),
 }
 
@@ -41,20 +41,21 @@ pub struct ExportGenesisWasmCommand {}
 
 #[allow(missing_docs)]
 #[derive(Debug, Parser)]
+#[group(skip)]
 pub struct RunCmd {
 	#[allow(missing_docs)]
 	#[clap(flatten)]
 	pub base: sc_cli::RunCmd,
 
 	/// Id of the parachain this collator collates for.
-	#[clap(long)]
+	#[arg(long)]
 	pub parachain_id: Option<u32>,
 }
 
 #[allow(missing_docs)]
 #[derive(Debug, Parser)]
 pub struct Cli {
-	#[clap(subcommand)]
+	#[command(subcommand)]
 	pub subcommand: Option<Subcommand>,
 
 	#[clap(flatten)]
diff --git a/parachain/test-parachains/undying/collator/Cargo.toml b/parachain/test-parachains/undying/collator/Cargo.toml
index a9b5eed27e6d..d62a34700ebf 100644
--- a/parachain/test-parachains/undying/collator/Cargo.toml
+++ b/parachain/test-parachains/undying/collator/Cargo.toml
@@ -15,7 +15,7 @@ path = "bin/puppet_worker.rs"
 
 [dependencies]
 parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive"] }
-clap = { version = "3.1", features = ["derive"] }
+clap = { version = "4.0.9", features = ["derive"] }
 futures = "0.3.19"
 futures-timer = "3.0.2"
 log = "0.4.17"
diff --git a/parachain/test-parachains/undying/collator/src/cli.rs b/parachain/test-parachains/undying/collator/src/cli.rs
index 4f1ff06e7472..703a0bfd46f6 100644
--- a/parachain/test-parachains/undying/collator/src/cli.rs
+++ b/parachain/test-parachains/undying/collator/src/cli.rs
@@ -23,11 +23,11 @@ use sc_cli::{RuntimeVersion, SubstrateCli};
 #[derive(Debug, Parser)]
 pub enum Subcommand {
 	/// Export the genesis state of the parachain.
-	#[clap(name = "export-genesis-state")]
+	#[command(name = "export-genesis-state")]
 	ExportGenesisState(ExportGenesisStateCommand),
 
 	/// Export the genesis wasm of the parachain.
-	#[clap(name = "export-genesis-wasm")]
+	#[command(name = "export-genesis-wasm")]
 	ExportGenesisWasm(ExportGenesisWasmCommand),
 }
 
@@ -35,16 +35,16 @@ pub enum Subcommand {
 #[derive(Debug, Parser)]
 pub struct ExportGenesisStateCommand {
 	/// Id of the parachain this collator collates for.
-	#[clap(long, default_value = "100")]
+	#[arg(long, default_value_t = 100)]
 	pub parachain_id: u32,
 
 	/// The target raw PoV size in bytes. Minimum value is 64.
-	#[clap(long, default_value = "1024")]
+	#[arg(long, default_value_t = 1024)]
 	pub pov_size: usize,
 
 	/// The PVF execution complexity. Actually specifies how  many iterations/signatures
 	/// we compute per block.
-	#[clap(long, default_value = "1")]
+	#[arg(long, default_value_t = 1)]
 	pub pvf_complexity: u32,
 }
 
@@ -54,29 +54,30 @@ pub struct ExportGenesisWasmCommand {}
 
 #[allow(missing_docs)]
 #[derive(Debug, Parser)]
+#[group(skip)]
 pub struct RunCmd {
 	#[allow(missing_docs)]
 	#[clap(flatten)]
 	pub base: sc_cli::RunCmd,
 
 	/// Id of the parachain this collator collates for.
-	#[clap(long, default_value = "2000")]
+	#[arg(long, default_value_t = 2000)]
 	pub parachain_id: u32,
 
 	/// The target raw PoV size in bytes. Minimum value is 64.
-	#[clap(long, default_value = "1024")]
+	#[arg(long, default_value_t = 1024)]
 	pub pov_size: usize,
 
 	/// The PVF execution complexity. Actually specifies how many iterations/signatures
 	/// we compute per block.
-	#[clap(long, default_value = "1")]
+	#[arg(long, default_value_t = 1)]
 	pub pvf_complexity: u32,
 }
 
 #[allow(missing_docs)]
 #[derive(Debug, Parser)]
 pub struct Cli {
-	#[clap(subcommand)]
+	#[command(subcommand)]
 	pub subcommand: Option<Subcommand>,
 
 	#[clap(flatten)]
diff --git a/utils/generate-bags/Cargo.toml b/utils/generate-bags/Cargo.toml
index a8ffb6b1c9ee..5b455d83ef6e 100644
--- a/utils/generate-bags/Cargo.toml
+++ b/utils/generate-bags/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 
 [dependencies]
-clap = { version = "3.1", features = ["derive"] }
+clap = { version = "4.0.9", features = ["derive"] }
 
 generate-bags = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/utils/generate-bags/src/main.rs b/utils/generate-bags/src/main.rs
index 9f5dbada3e93..409b28b5b79d 100644
--- a/utils/generate-bags/src/main.rs
+++ b/utils/generate-bags/src/main.rs
@@ -20,15 +20,15 @@
 //! touched again. It can be reused to regenerate a wholly different
 //! quantity of bags, or if the existential deposit changes, etc.
 
-use clap::{ArgEnum, Parser};
+use clap::{Parser, ValueEnum};
 use generate_bags::generate_thresholds;
 use kusama_runtime::Runtime as KusamaRuntime;
 use polkadot_runtime::Runtime as PolkadotRuntime;
 use std::path::{Path, PathBuf};
 use westend_runtime::Runtime as WestendRuntime;
 
-#[derive(Clone, Debug, ArgEnum)]
-#[clap(rename_all = "PascalCase")]
+#[derive(Clone, Debug, ValueEnum)]
+#[value(rename_all = "PascalCase")]
 enum Runtime {
 	Westend,
 	Kusama,
@@ -50,22 +50,22 @@ impl Runtime {
 #[derive(Debug, Parser)]
 struct Opt {
 	/// How many bags to generate.
-	#[clap(long, default_value = "200")]
+	#[arg(long, default_value_t = 200)]
 	n_bags: usize,
 
 	/// Which runtime to generate.
-	#[clap(long, ignore_case = true, arg_enum, default_value = "Polkadot")]
+	#[arg(long, ignore_case = true, value_enum, default_value_t = Runtime::Polkadot)]
 	runtime: Runtime,
 
 	/// Where to write the output.
 	output: PathBuf,
 
 	/// The total issuance of the native currency.
-	#[clap(short, long)]
+	#[arg(short, long)]
 	total_issuance: u128,
 
 	/// The minimum account balance (i.e. existential deposit) for the native currency.
-	#[clap(short, long)]
+	#[arg(short, long)]
 	minimum_balance: u128,
 }
 
diff --git a/utils/remote-ext-tests/bags-list/Cargo.toml b/utils/remote-ext-tests/bags-list/Cargo.toml
index d3999c779ef1..a726e6353499 100644
--- a/utils/remote-ext-tests/bags-list/Cargo.toml
+++ b/utils/remote-ext-tests/bags-list/Cargo.toml
@@ -17,6 +17,6 @@ sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master
 frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
-clap = { version = "3.1", features = ["derive"] }
+clap = { version = "4.0.9", features = ["derive"] }
 log = "0.4.17"
 tokio = { version = "1.19.2", features = ["macros"] }
diff --git a/utils/remote-ext-tests/bags-list/src/main.rs b/utils/remote-ext-tests/bags-list/src/main.rs
index 0fafa5e96f7a..53d81c4b4e05 100644
--- a/utils/remote-ext-tests/bags-list/src/main.rs
+++ b/utils/remote-ext-tests/bags-list/src/main.rs
@@ -16,18 +16,18 @@
 
 //! Remote tests for bags-list pallet.
 
-use clap::{ArgEnum, Parser};
+use clap::{Parser, ValueEnum};
 
-#[derive(Clone, Debug, ArgEnum)]
-#[clap(rename_all = "PascalCase")]
+#[derive(Clone, Debug, ValueEnum)]
+#[value(rename_all = "PascalCase")]
 enum Command {
 	CheckMigration,
 	SanityCheck,
 	Snapshot,
 }
 
-#[derive(Clone, Debug, ArgEnum)]
-#[clap(rename_all = "PascalCase")]
+#[derive(Clone, Debug, ValueEnum)]
+#[value(rename_all = "PascalCase")]
 enum Runtime {
 	Polkadot,
 	Kusama,
@@ -36,13 +36,13 @@ enum Runtime {
 
 #[derive(Parser)]
 struct Cli {
-	#[clap(long, short, default_value = "wss://kusama-rpc.polkadot.io:443")]
+	#[arg(long, short, default_value = "wss://kusama-rpc.polkadot.io:443")]
 	uri: String,
-	#[clap(long, short, ignore_case = true, arg_enum, default_value = "kusama")]
+	#[arg(long, short, ignore_case = true, value_enum, default_value_t = Runtime::Kusama)]
 	runtime: Runtime,
-	#[clap(long, short, ignore_case = true, arg_enum, default_value = "SanityCheck")]
+	#[arg(long, short, ignore_case = true, value_enum, default_value_t = Command::SanityCheck)]
 	command: Command,
-	#[clap(long, short)]
+	#[arg(long, short)]
 	snapshot_limit: Option<usize>,
 }
 
diff --git a/utils/staking-miner/Cargo.toml b/utils/staking-miner/Cargo.toml
index 1d0e4f4f54a4..bd0171f12b70 100644
--- a/utils/staking-miner/Cargo.toml
+++ b/utils/staking-miner/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0" }
-clap = { version = "3.1", features = ["derive", "env"] }
+clap = { version = "4.0.9", features = ["derive", "env"] }
 tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
 jsonrpsee = { version = "0.15.1", features = ["ws-client", "macros"] }
 log = "0.4.17"
diff --git a/utils/staking-miner/src/opts.rs b/utils/staking-miner/src/opts.rs
index f43744ad45e8..0a6c50cda90a 100644
--- a/utils/staking-miner/src/opts.rs
+++ b/utils/staking-miner/src/opts.rs
@@ -21,21 +21,21 @@ use std::str::FromStr;
 
 #[derive(Debug, Clone, Parser)]
 #[cfg_attr(test, derive(PartialEq))]
-#[clap(author, version, about)]
+#[command(author, version, about)]
 pub(crate) struct Opt {
 	/// The `ws` node to connect to.
-	#[clap(long, short, default_value = DEFAULT_URI, env = "URI", global = true)]
+	#[arg(long, short, default_value = DEFAULT_URI, env = "URI", global = true)]
 	pub uri: String,
 
 	/// WS connection timeout in number of seconds.
-	#[clap(long, parse(try_from_str), default_value_t = 60)]
+	#[arg(long, default_value_t = 60)]
 	pub connection_timeout: usize,
 
 	/// WS request timeout in number of seconds.
-	#[clap(long, parse(try_from_str), default_value_t = 60 * 10)]
+	#[arg(long, default_value_t = 60 * 10)]
 	pub request_timeout: usize,
 
-	#[clap(subcommand)]
+	#[command(subcommand)]
 	pub command: Command,
 }
 
@@ -65,7 +65,7 @@ pub(crate) struct MonitorConfig {
 	///
 	/// WARNING: Don't use an account with a large stash for this. Based on how the bot is
 	/// configured, it might re-try and lose funds through transaction fees/deposits.
-	#[clap(long, short, env = "SEED")]
+	#[arg(long, short, env = "SEED")]
 	pub seed_or_path: String,
 
 	/// They type of event to listen to.
@@ -73,11 +73,11 @@ pub(crate) struct MonitorConfig {
 	/// Typically, finalized is safer and there is no chance of anything going wrong, but it can be
 	/// slower. It is recommended to use finalized, if the duration of the signed phase is longer
 	/// than the the finality delay.
-	#[clap(long, default_value = "head", possible_values = &["head", "finalized"])]
+	#[arg(long, default_value = "head", value_parser = ["head", "finalized"])]
 	pub listen: String,
 
 	/// The solver algorithm to use.
-	#[clap(subcommand)]
+	#[command(subcommand)]
 	pub solver: Solver,
 
 	/// Submission strategy to use.
@@ -89,7 +89,7 @@ pub(crate) struct MonitorConfig {
 	/// `--submission-strategy always`: always submit.
 	///
 	/// `--submission-strategy "percent-better <percent>"`: submit if the submission is `n` percent better.
-	#[clap(long, parse(try_from_str), default_value = "if-leading")]
+	#[arg(long, default_value = "if-leading")]
 	pub submission_strategy: SubmissionStrategy,
 
 	/// Delay in number seconds to wait until starting mining a solution.
@@ -100,7 +100,7 @@ pub(crate) struct MonitorConfig {
 	///
 	/// When this is enabled and there are competing solutions, your solution might not be submitted
 	/// if the scores are equal.
-	#[clap(long, parse(try_from_str), default_value_t = 0)]
+	#[arg(long, default_value_t = 0)]
 	pub delay: usize,
 }
 
@@ -114,19 +114,19 @@ pub(crate) struct DryRunConfig {
 	///
 	/// WARNING: Don't use an account with a large stash for this. Based on how the bot is
 	/// configured, it might re-try and lose funds through transaction fees/deposits.
-	#[clap(long, short, env = "SEED")]
+	#[arg(long, short, env = "SEED")]
 	pub seed_or_path: String,
 
 	/// The block hash at which scraping happens. If none is provided, the latest head is used.
-	#[clap(long)]
+	#[arg(long)]
 	pub at: Option<Hash>,
 
 	/// The solver algorithm to use.
-	#[clap(subcommand)]
+	#[command(subcommand)]
 	pub solver: Solver,
 
 	/// Force create a new snapshot, else expect one to exist onchain.
-	#[clap(long)]
+	#[arg(long)]
 	pub force_snapshot: bool,
 }
 
@@ -134,11 +134,11 @@ pub(crate) struct DryRunConfig {
 #[cfg_attr(test, derive(PartialEq))]
 pub(crate) struct EmergencySolutionConfig {
 	/// The block hash at which scraping happens. If none is provided, the latest head is used.
-	#[clap(long)]
+	#[arg(long)]
 	pub at: Option<Hash>,
 
 	/// The solver algorithm to use.
-	#[clap(subcommand)]
+	#[command(subcommand)]
 	pub solver: Solver,
 
 	/// The number of top backed winners to take. All are taken, if not provided.
@@ -149,7 +149,7 @@ pub(crate) struct EmergencySolutionConfig {
 #[cfg_attr(test, derive(PartialEq))]
 pub(crate) struct InfoOpts {
 	/// Serialize the output as json
-	#[clap(long, short)]
+	#[arg(long, short)]
 	pub json: bool,
 }
 
@@ -170,11 +170,11 @@ pub enum SubmissionStrategy {
 #[cfg_attr(test, derive(PartialEq))]
 pub(crate) enum Solver {
 	SeqPhragmen {
-		#[clap(long, default_value = "10")]
+		#[arg(long, default_value_t = 10)]
 		iterations: usize,
 	},
 	PhragMMS {
-		#[clap(long, default_value = "10")]
+		#[arg(long, default_value_t = 10)]
 		iterations: usize,
 	},
 }