diff --git a/Cargo.lock b/Cargo.lock
index 20a38c2857..e15695252b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -442,9 +442,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
 name = "base64ct"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a42bc66d2304056cf5b732c24fe578d88871449c6d10aefff27f371e5f927e33"
+checksum = "71acf5509fc522cce1b100ac0121c635129bfd4d91cdf036bcc9b9935f97ccf5"
 
 [[package]]
 name = "beef"
@@ -458,7 +458,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "beefy-primitives",
  "fnv",
@@ -488,7 +488,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "beefy-gadget",
  "beefy-primitives",
@@ -511,12 +511,12 @@ dependencies = [
 [[package]]
 name = "beefy-merkle-tree"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 
 [[package]]
 name = "beefy-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -708,9 +708,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
 
 [[package]]
 name = "blocking"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046e47d4b2d391b1f6f8b407b1deb8dee56c1852ccd868becf2710f601b5f427"
+checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc"
 dependencies = [
  "async-channel",
  "async-task",
@@ -732,7 +732,7 @@ dependencies = [
 [[package]]
 name = "bp-header-chain"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "finality-grandpa",
  "frame-support",
@@ -748,7 +748,7 @@ dependencies = [
 [[package]]
 name = "bp-message-dispatch"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bp-runtime",
  "frame-support",
@@ -760,7 +760,7 @@ dependencies = [
 [[package]]
 name = "bp-messages"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bitvec",
  "bp-runtime",
@@ -776,7 +776,7 @@ dependencies = [
 [[package]]
 name = "bp-polkadot-core"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bp-messages",
  "bp-runtime",
@@ -794,7 +794,7 @@ dependencies = [
 [[package]]
 name = "bp-rococo"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bp-messages",
  "bp-polkadot-core",
@@ -811,7 +811,7 @@ dependencies = [
 [[package]]
 name = "bp-runtime"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "frame-support",
  "hash-db",
@@ -829,7 +829,7 @@ dependencies = [
 [[package]]
 name = "bp-test-utils"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bp-header-chain",
  "ed25519-dalek",
@@ -844,7 +844,7 @@ dependencies = [
 [[package]]
 name = "bp-wococo"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bp-messages",
  "bp-polkadot-core",
@@ -859,7 +859,7 @@ dependencies = [
 [[package]]
 name = "bridge-runtime-common"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bp-message-dispatch",
  "bp-messages",
@@ -1016,7 +1016,7 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-core-primitives",
  "polkadot-parachain",
- "polkadot-runtime",
+ "polkadot-runtime-common",
  "scale-info",
  "serde",
  "smallvec",
@@ -2779,7 +2779,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2797,7 +2797,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2819,7 +2819,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "Inflector",
  "chrono",
@@ -2857,11 +2857,23 @@ dependencies = [
  "sp-trie",
 ]
 
+[[package]]
+name = "frame-election-provider-solution-type"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
+dependencies = [
+ "proc-macro-crate 1.1.3",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
+ "frame-election-provider-solution-type",
  "frame-support",
  "frame-system",
  "parity-scale-codec",
@@ -2875,7 +2887,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2903,7 +2915,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2932,7 +2944,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -2944,7 +2956,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 1.1.3",
@@ -2956,7 +2968,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2966,7 +2978,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-support",
  "log",
@@ -2983,7 +2995,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2998,7 +3010,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -3007,7 +3019,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-support",
  "sp-api",
@@ -4184,7 +4196,7 @@ dependencies = [
 [[package]]
 name = "kusama-runtime"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -4272,7 +4284,7 @@ dependencies = [
 [[package]]
 name = "kusama-runtime-constants"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -4343,9 +4355,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.119"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4"
+checksum = "ad5c14e80759d0939d013e6ca49930e59fc53dd8e5009132f76240c179380c09"
 
 [[package]]
 name = "libloading"
@@ -5136,7 +5148,7 @@ dependencies = [
 [[package]]
 name = "metered-channel"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "derive_more",
  "futures 0.3.21",
@@ -5193,14 +5205,15 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2"
+checksum = "7ba42135c6a5917b9db9cd7b293e5409e1c6b041e6f9825e92e55a894c63b6f8"
 dependencies = [
  "libc",
  "log",
  "miow 0.3.7",
  "ntapi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "winapi 0.3.9",
 ]
 
@@ -5597,7 +5610,7 @@ dependencies = [
 [[package]]
 name = "pallet-asset-tx-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5614,7 +5627,7 @@ dependencies = [
 [[package]]
 name = "pallet-assets"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5628,7 +5641,7 @@ dependencies = [
 [[package]]
 name = "pallet-aura"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5644,7 +5657,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5660,7 +5673,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5675,7 +5688,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5699,7 +5712,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5719,7 +5732,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5734,7 +5747,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "beefy-primitives",
  "frame-support",
@@ -5750,7 +5763,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "beefy-merkle-tree",
  "beefy-primitives",
@@ -5775,7 +5788,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5793,7 +5806,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-dispatch"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bp-message-dispatch",
  "bp-runtime",
@@ -5810,7 +5823,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-grandpa"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bp-header-chain",
  "bp-runtime",
@@ -5832,7 +5845,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-messages"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bitvec",
  "bp-message-dispatch",
@@ -5879,7 +5892,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5896,7 +5909,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "bitflags",
  "frame-benchmarking",
@@ -5923,7 +5936,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts-primitives"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "bitflags",
  "parity-scale-codec",
@@ -5938,7 +5951,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5948,7 +5961,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -5967,7 +5980,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "pallet-contracts-primitives",
  "parity-scale-codec",
@@ -5980,7 +5993,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5996,7 +6009,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6019,7 +6032,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6037,7 +6050,7 @@ dependencies = [
 [[package]]
 name = "pallet-gilt"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6052,7 +6065,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6075,7 +6088,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -6091,7 +6104,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6111,7 +6124,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6128,7 +6141,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6145,7 +6158,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "ckb-merkle-mountain-range",
  "frame-benchmarking",
@@ -6163,7 +6176,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6179,7 +6192,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -6196,7 +6209,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6211,7 +6224,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6225,7 +6238,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6242,7 +6255,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6265,7 +6278,7 @@ dependencies = [
 [[package]]
 name = "pallet-preimage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6281,7 +6294,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6296,7 +6309,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6310,7 +6323,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6324,7 +6337,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6340,7 +6353,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6361,7 +6374,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6377,7 +6390,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6391,7 +6404,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6414,7 +6427,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
@@ -6425,7 +6438,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -6434,7 +6447,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6463,7 +6476,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6481,7 +6494,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6500,7 +6513,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6517,7 +6530,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -6534,7 +6547,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -6545,7 +6558,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6562,7 +6575,7 @@ dependencies = [
 [[package]]
 name = "pallet-uniques"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6577,7 +6590,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6593,7 +6606,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6608,7 +6621,7 @@ dependencies = [
 [[package]]
 name = "pallet-xcm"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6626,7 +6639,7 @@ dependencies = [
 [[package]]
 name = "pallet-xcm-benchmarks"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6753,7 +6766,6 @@ dependencies = [
  "parachain-info",
  "parity-scale-codec",
  "polkadot-parachain",
- "polkadot-runtime",
  "polkadot-runtime-common",
  "scale-info",
  "serde",
@@ -6823,9 +6835,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "3.0.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a7f3fcf5e45fc28b84dcdab6b983e77f197ec01f325a33f404ba6855afd1070"
+checksum = "8483b84fb12de1dc23bf95d26030d16cea56391d136db0db37f749508104e3e6"
 dependencies = [
  "arrayvec 0.7.2",
  "bitvec",
@@ -6837,9 +6849,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "3.0.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6e626dc84025ff56bf1476ed0e30d10c84d7f89a475ef46ebabee1095a8fba"
+checksum = "7259388ceb4c23bc09caef272c9e7a732b3b8f9fbd0b41f0009a91d6548cc1d9"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
@@ -7188,7 +7200,7 @@ dependencies = [
 [[package]]
 name = "polkadot-approval-distribution"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "futures 0.3.21",
  "polkadot-node-network-protocol",
@@ -7202,7 +7214,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "futures 0.3.21",
  "polkadot-node-network-protocol",
@@ -7215,7 +7227,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-distribution"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "derive_more",
  "fatality",
@@ -7238,7 +7250,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-recovery"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "fatality",
  "futures 0.3.21",
@@ -7259,7 +7271,7 @@ dependencies = [
 [[package]]
 name = "polkadot-cli"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "clap 3.1.6",
  "frame-benchmarking-cli",
@@ -7282,7 +7294,7 @@ dependencies = [
 [[package]]
 name = "polkadot-client"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "beefy-primitives",
  "frame-benchmarking",
@@ -7388,7 +7400,7 @@ dependencies = [
 [[package]]
 name = "polkadot-collator-protocol"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "always-assert",
  "fatality",
@@ -7409,7 +7421,7 @@ dependencies = [
 [[package]]
 name = "polkadot-core-primitives"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
@@ -7422,7 +7434,7 @@ dependencies = [
 [[package]]
 name = "polkadot-dispute-distribution"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "derive_more",
  "fatality",
@@ -7445,7 +7457,7 @@ dependencies = [
 [[package]]
 name = "polkadot-erasure-coding"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-primitives",
@@ -7459,7 +7471,7 @@ dependencies = [
 [[package]]
 name = "polkadot-gossip-support"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -7479,7 +7491,7 @@ dependencies = [
 [[package]]
 name = "polkadot-network-bridge"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -7498,7 +7510,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-collation-generation"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "futures 0.3.21",
  "parity-scale-codec",
@@ -7516,7 +7528,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-approval-voting"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bitvec",
  "derive_more",
@@ -7544,7 +7556,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-av-store"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bitvec",
  "futures 0.3.21",
@@ -7564,7 +7576,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-backing"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bitvec",
  "futures 0.3.21",
@@ -7582,7 +7594,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "futures 0.3.21",
  "polkadot-node-subsystem",
@@ -7597,7 +7609,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-candidate-validation"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -7615,7 +7627,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-chain-api"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "futures 0.3.21",
  "polkadot-node-subsystem",
@@ -7630,7 +7642,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-chain-selection"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -7647,7 +7659,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-dispute-coordinator"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "fatality",
  "futures 0.3.21",
@@ -7666,7 +7678,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-parachains-inherent"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -7683,7 +7695,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-provisioner"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bitvec",
  "futures 0.3.21",
@@ -7700,7 +7712,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-pvf"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "always-assert",
  "assert_matches",
@@ -7730,7 +7742,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-pvf-checker"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "futures 0.3.21",
  "polkadot-node-primitives",
@@ -7746,7 +7758,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-runtime-api"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "futures 0.3.21",
  "memory-lru",
@@ -7764,7 +7776,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-jaeger"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "async-std",
  "lazy_static",
@@ -7782,7 +7794,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-metrics"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bs58",
  "futures 0.3.21",
@@ -7801,7 +7813,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-network-protocol"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "async-trait",
  "fatality",
@@ -7819,7 +7831,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-primitives"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bounded-vec",
  "futures 0.3.21",
@@ -7841,7 +7853,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-node-subsystem-types",
@@ -7851,7 +7863,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-test-helpers"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -7869,7 +7881,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-types"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "derive_more",
  "futures 0.3.21",
@@ -7888,7 +7900,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-util"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7921,7 +7933,7 @@ dependencies = [
 [[package]]
 name = "polkadot-overseer"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -7942,7 +7954,7 @@ dependencies = [
 [[package]]
 name = "polkadot-overseer-gen"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -7959,7 +7971,7 @@ dependencies = [
 [[package]]
 name = "polkadot-overseer-gen-proc-macro"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "expander 0.0.6",
  "proc-macro-crate 1.1.3",
@@ -7971,7 +7983,7 @@ dependencies = [
 [[package]]
 name = "polkadot-parachain"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "derive_more",
  "frame-support",
@@ -7988,7 +8000,7 @@ dependencies = [
 [[package]]
 name = "polkadot-performance-test"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "env_logger",
  "kusama-runtime",
@@ -8003,7 +8015,7 @@ dependencies = [
 [[package]]
 name = "polkadot-primitives"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bitvec",
  "frame-system",
@@ -8033,7 +8045,7 @@ dependencies = [
 [[package]]
 name = "polkadot-rpc"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "beefy-gadget",
  "beefy-gadget-rpc",
@@ -8064,7 +8076,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -8148,7 +8160,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-common"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -8195,7 +8207,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-constants"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -8207,7 +8219,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-metrics"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bs58",
  "parity-scale-codec",
@@ -8219,7 +8231,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-parachains"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "bitflags",
  "bitvec",
@@ -8261,7 +8273,7 @@ dependencies = [
 [[package]]
 name = "polkadot-service"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "async-trait",
  "beefy-gadget",
@@ -8362,7 +8374,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-distribution"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "arrayvec 0.5.2",
  "fatality",
@@ -8383,7 +8395,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-table"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -8393,7 +8405,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-client"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-subsystem",
@@ -8418,7 +8430,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-runtime"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -8480,7 +8492,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-service"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "frame-benchmarking",
  "frame-system",
@@ -9023,7 +9035,7 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "env_logger",
  "jsonrpsee 0.8.0",
@@ -9140,7 +9152,7 @@ dependencies = [
 [[package]]
 name = "rococo-runtime"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "beefy-primitives",
  "bp-messages",
@@ -9215,7 +9227,7 @@ dependencies = [
 [[package]]
 name = "rococo-runtime-constants"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -9404,7 +9416,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "log",
  "sp-core",
@@ -9415,7 +9427,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -9442,7 +9454,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -9465,7 +9477,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -9481,7 +9493,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "impl-trait-for-tuples",
  "memmap2 0.5.3",
@@ -9498,7 +9510,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
@@ -9509,7 +9521,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "chrono",
  "clap 3.1.6",
@@ -9547,7 +9559,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "fnv",
  "futures 0.3.21",
@@ -9575,7 +9587,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -9600,7 +9612,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -9624,7 +9636,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -9653,7 +9665,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -9696,7 +9708,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "futures 0.3.21",
  "jsonrpc-core",
@@ -9720,7 +9732,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -9733,7 +9745,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -9758,7 +9770,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "sc-client-api",
  "sp-authorship",
@@ -9769,7 +9781,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "lazy_static",
  "lru 0.6.6",
@@ -9796,7 +9808,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -9813,7 +9825,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9829,7 +9841,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -9847,7 +9859,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "ahash",
  "async-trait",
@@ -9887,7 +9899,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "finality-grandpa",
  "futures 0.3.21",
@@ -9911,7 +9923,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "ansi_term",
  "futures 0.3.21",
@@ -9928,7 +9940,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "async-trait",
  "hex",
@@ -9943,7 +9955,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "async-trait",
  "asynchronous-codec 0.5.0",
@@ -9992,7 +10004,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "ahash",
  "futures 0.3.21",
@@ -10009,7 +10021,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "bytes 1.1.0",
  "fnv",
@@ -10037,7 +10049,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "futures 0.3.21",
  "libp2p",
@@ -10050,7 +10062,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -10059,7 +10071,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "futures 0.3.21",
  "hash-db",
@@ -10090,7 +10102,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "futures 0.3.21",
  "jsonrpc-core",
@@ -10115,7 +10127,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "futures 0.3.21",
  "jsonrpc-core",
@@ -10132,7 +10144,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "async-trait",
  "directories",
@@ -10196,7 +10208,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -10210,7 +10222,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -10231,7 +10243,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "chrono",
  "futures 0.3.21",
@@ -10249,7 +10261,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "ansi_term",
  "atty",
@@ -10280,7 +10292,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
@@ -10291,7 +10303,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -10318,7 +10330,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "futures 0.3.21",
  "log",
@@ -10331,7 +10343,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -10804,7 +10816,7 @@ checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
 [[package]]
 name = "slot-range-helper"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "enumn",
  "parity-scale-codec",
@@ -10892,7 +10904,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "hash-db",
  "log",
@@ -10909,7 +10921,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "blake2 0.10.4",
  "proc-macro-crate 1.1.3",
@@ -10921,7 +10933,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10934,7 +10946,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -10949,7 +10961,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10962,7 +10974,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10974,7 +10986,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -10986,7 +10998,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "futures 0.3.21",
  "log",
@@ -11004,7 +11016,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -11023,7 +11035,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -11041,7 +11053,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "async-trait",
  "merlin",
@@ -11064,7 +11076,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11078,7 +11090,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -11090,7 +11102,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "base58",
  "bitflags",
@@ -11136,7 +11148,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "blake2 0.10.4",
  "byteorder",
@@ -11150,7 +11162,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -11161,7 +11173,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.0",
@@ -11170,7 +11182,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -11180,7 +11192,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -11191,7 +11203,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -11209,7 +11221,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -11223,7 +11235,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "futures 0.3.21",
  "hash-db",
@@ -11248,7 +11260,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -11259,7 +11271,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -11276,7 +11288,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "thiserror",
  "zstd",
@@ -11285,33 +11297,21 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-arithmetic",
  "sp-core",
- "sp-npos-elections-solution-type",
  "sp-runtime",
  "sp-std",
 ]
 
-[[package]]
-name = "sp-npos-elections-solution-type"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
-dependencies = [
- "proc-macro-crate 1.1.3",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -11321,7 +11321,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -11331,7 +11331,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -11341,7 +11341,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -11363,7 +11363,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -11380,7 +11380,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.1.3",
@@ -11392,7 +11392,7 @@ dependencies = [
 [[package]]
 name = "sp-sandbox"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -11406,7 +11406,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "serde",
  "serde_json",
@@ -11415,7 +11415,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11429,7 +11429,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11440,7 +11440,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "hash-db",
  "log",
@@ -11463,12 +11463,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 
 [[package]]
 name = "sp-storage"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -11481,7 +11481,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "log",
  "sp-core",
@@ -11494,7 +11494,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "async-trait",
  "futures-timer",
@@ -11510,7 +11510,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -11522,7 +11522,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -11531,7 +11531,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "async-trait",
  "log",
@@ -11547,7 +11547,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -11563,7 +11563,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -11580,7 +11580,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -11591,7 +11591,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "impl-trait-for-tuples",
  "log",
@@ -11682,7 +11682,7 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-core-primitives",
  "polkadot-parachain",
- "polkadot-runtime",
+ "polkadot-runtime-common",
  "scale-info",
  "serde",
  "smallvec",
@@ -11748,7 +11748,7 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-core-primitives",
  "polkadot-parachain",
- "polkadot-runtime",
+ "polkadot-runtime-common",
  "polkadot-runtime-constants",
  "scale-info",
  "serde",
@@ -11881,7 +11881,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "platforms",
 ]
@@ -11889,7 +11889,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.21",
@@ -11911,7 +11911,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "futures-util",
  "hyper",
@@ -11924,7 +11924,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -11950,7 +11950,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "futures 0.3.21",
  "substrate-test-utils-derive",
@@ -11960,7 +11960,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
@@ -11971,7 +11971,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "ansi_term",
  "build-helper",
@@ -11992,9 +11992,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.86"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
+checksum = "1e59d925cf59d8151f25a3bedf97c9c157597c9df7324d32d68991cc399ed08b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -12057,7 +12057,7 @@ checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b"
 [[package]]
 name = "test-runtime-constants"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -12207,7 +12207,7 @@ dependencies = [
  "bytes 1.1.0",
  "libc",
  "memchr",
- "mio 0.8.0",
+ "mio 0.8.1",
  "num_cpus",
  "once_cell",
  "parking_lot 0.12.0",
@@ -12453,7 +12453,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5cc2ef8e4c03b64691db367036fedd8f4d7f0326"
+source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7"
 dependencies = [
  "clap 3.1.6",
  "jsonrpsee 0.4.1",
@@ -12710,6 +12710,12 @@ version = "0.10.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.79"
@@ -13055,7 +13061,7 @@ dependencies = [
 [[package]]
 name = "westend-runtime"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -13141,7 +13147,7 @@ dependencies = [
 [[package]]
 name = "westend-runtime-constants"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -13193,7 +13199,7 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-core-primitives",
  "polkadot-parachain",
- "polkadot-runtime",
+ "polkadot-runtime-common",
  "scale-info",
  "serde",
  "smallvec",
@@ -13361,7 +13367,7 @@ dependencies = [
 [[package]]
 name = "xcm"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "derivative",
  "impl-trait-for-tuples",
@@ -13374,7 +13380,7 @@ dependencies = [
 [[package]]
 name = "xcm-builder"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -13394,7 +13400,7 @@ dependencies = [
 [[package]]
 name = "xcm-executor"
 version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -13412,7 +13418,7 @@ dependencies = [
 [[package]]
 name = "xcm-procedural"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#5c3067e9d58487e866fc8e4ad594fd22e9132c93"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b"
 dependencies = [
  "Inflector",
  "proc-macro2",
diff --git a/parachain-template/runtime/Cargo.toml b/parachain-template/runtime/Cargo.toml
index 610e5656bd..0f7d2947b5 100644
--- a/parachain-template/runtime/Cargo.toml
+++ b/parachain-template/runtime/Cargo.toml
@@ -57,7 +57,6 @@ sp-version = { git = "https://github.com/paritytech/substrate", default-features
 # Polkadot
 pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-polkadot-runtime = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
@@ -110,7 +109,6 @@ std = [
 	"pallet-xcm/std",
 	"parachain-info/std",
 	"polkadot-parachain/std",
-	"polkadot-runtime/std",
 	"polkadot-runtime-common/std",
 	"sp-api/std",
 	"sp-block-builder/std",
@@ -140,7 +138,6 @@ runtime-benchmarks = [
 	"pallet-template/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
-	"polkadot-runtime/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
diff --git a/parachain-template/runtime/src/lib.rs b/parachain-template/runtime/src/lib.rs
index fab19fe7bb..264cb4b62d 100644
--- a/parachain-template/runtime/src/lib.rs
+++ b/parachain-template/runtime/src/lib.rs
@@ -6,6 +6,7 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
+mod weights;
 pub mod xcm_config;
 
 use smallvec::smallvec;
@@ -27,9 +28,8 @@ use frame_support::{
 	construct_runtime, parameter_types,
 	traits::Everything,
 	weights::{
-		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, WEIGHT_PER_SECOND},
-		DispatchClass, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients,
-		WeightToFeePolynomial,
+		constants::WEIGHT_PER_SECOND, DispatchClass, Weight, WeightToFeeCoefficient,
+		WeightToFeeCoefficients, WeightToFeePolynomial,
 	},
 	PalletId,
 };
@@ -44,8 +44,10 @@ use xcm_config::{XcmConfig, XcmOriginToTransactDispatchOrigin};
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
 
-// Polkadot Imports
-use polkadot_runtime::{BlockHashCount, RocksDbWeight, SlowAdjustingFeeUpdate};
+// Polkadot imports
+use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
+
+use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
 
 // XCM Imports
 use xcm::latest::prelude::BodyId;
diff --git a/parachain-template/runtime/src/weights/block_weights.rs b/parachain-template/runtime/src/weights/block_weights.rs
new file mode 100644
index 0000000000..4db90f0c02
--- /dev/null
+++ b/parachain-template/runtime/src/weights/block_weights.rs
@@ -0,0 +1,46 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, Weight},
+	};
+
+	parameter_types! {
+		/// Importing a block with 0 Extrinsics.
+		pub const BlockExecutionWeight: Weight = 5_000_000 * constants::WEIGHT_PER_NANOS;
+	}
+
+	#[cfg(test)]
+	mod test_weights {
+		use frame_support::weights::constants;
+
+		/// Checks that the weight exists and is sane.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			let w = super::constants::BlockExecutionWeight::get();
+
+			// At least 100 µs.
+			assert!(w >= 100 * constants::WEIGHT_PER_MICROS, "Weight should be at least 100 µs.");
+			// At most 50 ms.
+			assert!(w <= 50 * constants::WEIGHT_PER_MILLIS, "Weight should be at most 50 ms.");
+		}
+	}
+}
diff --git a/parachain-template/runtime/src/weights/extrinsic_weights.rs b/parachain-template/runtime/src/weights/extrinsic_weights.rs
new file mode 100644
index 0000000000..158ba99c6a
--- /dev/null
+++ b/parachain-template/runtime/src/weights/extrinsic_weights.rs
@@ -0,0 +1,46 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, Weight},
+	};
+
+	parameter_types! {
+		/// Executing a NO-OP `System::remarks` Extrinsic.
+		pub const ExtrinsicBaseWeight: Weight = 125_000 * constants::WEIGHT_PER_NANOS;
+	}
+
+	#[cfg(test)]
+	mod test_weights {
+		use frame_support::weights::constants;
+
+		/// Checks that the weight exists and is sane.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			let w = super::constants::ExtrinsicBaseWeight::get();
+
+			// At least 10 µs.
+			assert!(w >= 10 * constants::WEIGHT_PER_MICROS, "Weight should be at least 10 µs.");
+			// At most 1 ms.
+			assert!(w <= constants::WEIGHT_PER_MILLIS, "Weight should be at most 1 ms.");
+		}
+	}
+}
diff --git a/parachain-template/runtime/src/weights/mod.rs b/parachain-template/runtime/src/weights/mod.rs
new file mode 100644
index 0000000000..ed0b4dbcd4
--- /dev/null
+++ b/parachain-template/runtime/src/weights/mod.rs
@@ -0,0 +1,28 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Expose the auto generated weight files.
+
+pub mod block_weights;
+pub mod extrinsic_weights;
+pub mod paritydb_weights;
+pub mod rocksdb_weights;
+
+pub use block_weights::constants::BlockExecutionWeight;
+pub use extrinsic_weights::constants::ExtrinsicBaseWeight;
+pub use paritydb_weights::constants::ParityDbWeight;
+pub use rocksdb_weights::constants::RocksDbWeight;
diff --git a/parachain-template/runtime/src/weights/paritydb_weights.rs b/parachain-template/runtime/src/weights/paritydb_weights.rs
new file mode 100644
index 0000000000..843823c1bf
--- /dev/null
+++ b/parachain-template/runtime/src/weights/paritydb_weights.rs
@@ -0,0 +1,63 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, RuntimeDbWeight},
+	};
+
+	parameter_types! {
+		/// `ParityDB` can be enabled with a feature flag, but is still experimental. These weights
+		/// are available for brave runtime engineers who may want to try this out as default.
+		pub const ParityDbWeight: RuntimeDbWeight = RuntimeDbWeight {
+			read: 8_000 * constants::WEIGHT_PER_NANOS,
+			write: 50_000 * constants::WEIGHT_PER_NANOS,
+		};
+	}
+
+	#[cfg(test)]
+	mod test_db_weights {
+		use super::constants::ParityDbWeight as W;
+		use frame_support::weights::constants;
+
+		/// Checks that all weights exist and have sane values.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			// At least 1 µs.
+			assert!(
+				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				"Read weight should be at least 1 µs."
+			);
+			assert!(
+				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				"Write weight should be at least 1 µs."
+			);
+			// At most 1 ms.
+			assert!(
+				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				"Read weight should be at most 1 ms."
+			);
+			assert!(
+				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				"Write weight should be at most 1 ms."
+			);
+		}
+	}
+}
diff --git a/parachain-template/runtime/src/weights/rocksdb_weights.rs b/parachain-template/runtime/src/weights/rocksdb_weights.rs
new file mode 100644
index 0000000000..05e06b0eab
--- /dev/null
+++ b/parachain-template/runtime/src/weights/rocksdb_weights.rs
@@ -0,0 +1,63 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, RuntimeDbWeight},
+	};
+
+	parameter_types! {
+		/// By default, Substrate uses `RocksDB`, so this will be the weight used throughout
+		/// the runtime.
+		pub const RocksDbWeight: RuntimeDbWeight = RuntimeDbWeight {
+			read: 25_000 * constants::WEIGHT_PER_NANOS,
+			write: 100_000 * constants::WEIGHT_PER_NANOS,
+		};
+	}
+
+	#[cfg(test)]
+	mod test_db_weights {
+		use super::constants::RocksDbWeight as W;
+		use frame_support::weights::constants;
+
+		/// Checks that all weights exist and have sane values.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			// At least 1 µs.
+			assert!(
+				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				"Read weight should be at least 1 µs."
+			);
+			assert!(
+				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				"Write weight should be at least 1 µs."
+			);
+			// At most 1 ms.
+			assert!(
+				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				"Read weight should be at most 1 ms."
+			);
+			assert!(
+				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				"Write weight should be at most 1 ms."
+			);
+		}
+	}
+}
diff --git a/polkadot-parachains/canvas-kusama/Cargo.toml b/polkadot-parachains/canvas-kusama/Cargo.toml
index da79b9cd61..7dee29a1ac 100644
--- a/polkadot-parachains/canvas-kusama/Cargo.toml
+++ b/polkadot-parachains/canvas-kusama/Cargo.toml
@@ -58,7 +58,7 @@ kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", def
 pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-polkadot-runtime = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
@@ -111,7 +111,7 @@ std = [
 	"parachains-common/std",
 	"polkadot-core-primitives/std",
 	"polkadot-parachain/std",
-	"polkadot-runtime/std",
+	"polkadot-runtime-common/std",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
@@ -156,7 +156,6 @@ runtime-benchmarks = [
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
-	"polkadot-runtime/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
diff --git a/polkadot-parachains/canvas-kusama/src/lib.rs b/polkadot-parachains/canvas-kusama/src/lib.rs
index 5aee5c1169..67b2933477 100644
--- a/polkadot-parachains/canvas-kusama/src/lib.rs
+++ b/polkadot-parachains/canvas-kusama/src/lib.rs
@@ -23,6 +23,7 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
 pub mod constants;
 mod contracts;
+mod weights;
 mod xcm_config;
 
 use sp_api::impl_runtime_apis;
@@ -43,10 +44,7 @@ use constants::{currency::*, fee::WeightToFee};
 use frame_support::{
 	construct_runtime, parameter_types,
 	traits::{ConstU128, ConstU16, ConstU32, ConstU64, ConstU8, Everything},
-	weights::{
-		constants::{BlockExecutionWeight, ExtrinsicBaseWeight},
-		DispatchClass,
-	},
+	weights::DispatchClass,
 	PalletId,
 };
 use frame_system::limits::{BlockLength, BlockWeights};
@@ -65,7 +63,9 @@ pub use sp_runtime::BuildStorage;
 use frame_support::weights::Weight;
 
 // Polkadot imports
-use polkadot_runtime::{BlockHashCount, RocksDbWeight, SlowAdjustingFeeUpdate};
+use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
+
+use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
 
 /// The address format for describing accounts.
 pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
diff --git a/polkadot-parachains/canvas-kusama/src/weights/block_weights.rs b/polkadot-parachains/canvas-kusama/src/weights/block_weights.rs
new file mode 100644
index 0000000000..4db90f0c02
--- /dev/null
+++ b/polkadot-parachains/canvas-kusama/src/weights/block_weights.rs
@@ -0,0 +1,46 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, Weight},
+	};
+
+	parameter_types! {
+		/// Importing a block with 0 Extrinsics.
+		pub const BlockExecutionWeight: Weight = 5_000_000 * constants::WEIGHT_PER_NANOS;
+	}
+
+	#[cfg(test)]
+	mod test_weights {
+		use frame_support::weights::constants;
+
+		/// Checks that the weight exists and is sane.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			let w = super::constants::BlockExecutionWeight::get();
+
+			// At least 100 µs.
+			assert!(w >= 100 * constants::WEIGHT_PER_MICROS, "Weight should be at least 100 µs.");
+			// At most 50 ms.
+			assert!(w <= 50 * constants::WEIGHT_PER_MILLIS, "Weight should be at most 50 ms.");
+		}
+	}
+}
diff --git a/polkadot-parachains/canvas-kusama/src/weights/extrinsic_weights.rs b/polkadot-parachains/canvas-kusama/src/weights/extrinsic_weights.rs
new file mode 100644
index 0000000000..158ba99c6a
--- /dev/null
+++ b/polkadot-parachains/canvas-kusama/src/weights/extrinsic_weights.rs
@@ -0,0 +1,46 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, Weight},
+	};
+
+	parameter_types! {
+		/// Executing a NO-OP `System::remarks` Extrinsic.
+		pub const ExtrinsicBaseWeight: Weight = 125_000 * constants::WEIGHT_PER_NANOS;
+	}
+
+	#[cfg(test)]
+	mod test_weights {
+		use frame_support::weights::constants;
+
+		/// Checks that the weight exists and is sane.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			let w = super::constants::ExtrinsicBaseWeight::get();
+
+			// At least 10 µs.
+			assert!(w >= 10 * constants::WEIGHT_PER_MICROS, "Weight should be at least 10 µs.");
+			// At most 1 ms.
+			assert!(w <= constants::WEIGHT_PER_MILLIS, "Weight should be at most 1 ms.");
+		}
+	}
+}
diff --git a/polkadot-parachains/canvas-kusama/src/weights/mod.rs b/polkadot-parachains/canvas-kusama/src/weights/mod.rs
new file mode 100644
index 0000000000..ed0b4dbcd4
--- /dev/null
+++ b/polkadot-parachains/canvas-kusama/src/weights/mod.rs
@@ -0,0 +1,28 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Expose the auto generated weight files.
+
+pub mod block_weights;
+pub mod extrinsic_weights;
+pub mod paritydb_weights;
+pub mod rocksdb_weights;
+
+pub use block_weights::constants::BlockExecutionWeight;
+pub use extrinsic_weights::constants::ExtrinsicBaseWeight;
+pub use paritydb_weights::constants::ParityDbWeight;
+pub use rocksdb_weights::constants::RocksDbWeight;
diff --git a/polkadot-parachains/canvas-kusama/src/weights/paritydb_weights.rs b/polkadot-parachains/canvas-kusama/src/weights/paritydb_weights.rs
new file mode 100644
index 0000000000..843823c1bf
--- /dev/null
+++ b/polkadot-parachains/canvas-kusama/src/weights/paritydb_weights.rs
@@ -0,0 +1,63 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, RuntimeDbWeight},
+	};
+
+	parameter_types! {
+		/// `ParityDB` can be enabled with a feature flag, but is still experimental. These weights
+		/// are available for brave runtime engineers who may want to try this out as default.
+		pub const ParityDbWeight: RuntimeDbWeight = RuntimeDbWeight {
+			read: 8_000 * constants::WEIGHT_PER_NANOS,
+			write: 50_000 * constants::WEIGHT_PER_NANOS,
+		};
+	}
+
+	#[cfg(test)]
+	mod test_db_weights {
+		use super::constants::ParityDbWeight as W;
+		use frame_support::weights::constants;
+
+		/// Checks that all weights exist and have sane values.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			// At least 1 µs.
+			assert!(
+				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				"Read weight should be at least 1 µs."
+			);
+			assert!(
+				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				"Write weight should be at least 1 µs."
+			);
+			// At most 1 ms.
+			assert!(
+				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				"Read weight should be at most 1 ms."
+			);
+			assert!(
+				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				"Write weight should be at most 1 ms."
+			);
+		}
+	}
+}
diff --git a/polkadot-parachains/canvas-kusama/src/weights/rocksdb_weights.rs b/polkadot-parachains/canvas-kusama/src/weights/rocksdb_weights.rs
new file mode 100644
index 0000000000..05e06b0eab
--- /dev/null
+++ b/polkadot-parachains/canvas-kusama/src/weights/rocksdb_weights.rs
@@ -0,0 +1,63 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, RuntimeDbWeight},
+	};
+
+	parameter_types! {
+		/// By default, Substrate uses `RocksDB`, so this will be the weight used throughout
+		/// the runtime.
+		pub const RocksDbWeight: RuntimeDbWeight = RuntimeDbWeight {
+			read: 25_000 * constants::WEIGHT_PER_NANOS,
+			write: 100_000 * constants::WEIGHT_PER_NANOS,
+		};
+	}
+
+	#[cfg(test)]
+	mod test_db_weights {
+		use super::constants::RocksDbWeight as W;
+		use frame_support::weights::constants;
+
+		/// Checks that all weights exist and have sane values.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			// At least 1 µs.
+			assert!(
+				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				"Read weight should be at least 1 µs."
+			);
+			assert!(
+				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				"Write weight should be at least 1 µs."
+			);
+			// At most 1 ms.
+			assert!(
+				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				"Read weight should be at most 1 ms."
+			);
+			assert!(
+				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				"Write weight should be at most 1 ms."
+			);
+		}
+	}
+}
diff --git a/polkadot-parachains/statemine/Cargo.toml b/polkadot-parachains/statemine/Cargo.toml
index fda5b6ff46..f7452a39f5 100644
--- a/polkadot-parachains/statemine/Cargo.toml
+++ b/polkadot-parachains/statemine/Cargo.toml
@@ -53,7 +53,7 @@ kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", def
 pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-polkadot-runtime = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
@@ -96,7 +96,6 @@ runtime-benchmarks = [
 	"pallet-uniques/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
-	"polkadot-runtime/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
@@ -134,7 +133,7 @@ std = [
 	"pallet-xcm/std",
 	"polkadot-core-primitives/std",
 	"polkadot-parachain/std",
-	"polkadot-runtime/std",
+	"polkadot-runtime-common/std",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
diff --git a/polkadot-parachains/statemine/src/lib.rs b/polkadot-parachains/statemine/src/lib.rs
index e0ac1d5182..e93e3a31a1 100644
--- a/polkadot-parachains/statemine/src/lib.rs
+++ b/polkadot-parachains/statemine/src/lib.rs
@@ -45,10 +45,7 @@ use constants::{currency::*, fee::WeightToFee};
 use frame_support::{
 	construct_runtime, parameter_types,
 	traits::{AsEnsureOriginWithArg, EnsureOneOf, InstanceFilter},
-	weights::{
-		constants::{BlockExecutionWeight, ExtrinsicBaseWeight},
-		DispatchClass, Weight,
-	},
+	weights::{DispatchClass, Weight},
 	PalletId, RuntimeDebug,
 };
 use frame_system::{
@@ -68,10 +65,12 @@ pub use sp_runtime::BuildStorage;
 
 // Polkadot imports
 use pallet_xcm::{EnsureXcm, IsMajorityOfBody};
-use polkadot_runtime::{BlockHashCount, RocksDbWeight, SlowAdjustingFeeUpdate};
+use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
 use xcm::latest::BodyId;
 use xcm_executor::XcmExecutor;
 
+use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
+
 impl_opaque_keys! {
 	pub struct SessionKeys {
 		pub aura: Aura,
diff --git a/polkadot-parachains/statemine/src/weights/block_weights.rs b/polkadot-parachains/statemine/src/weights/block_weights.rs
new file mode 100644
index 0000000000..4db90f0c02
--- /dev/null
+++ b/polkadot-parachains/statemine/src/weights/block_weights.rs
@@ -0,0 +1,46 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, Weight},
+	};
+
+	parameter_types! {
+		/// Importing a block with 0 Extrinsics.
+		pub const BlockExecutionWeight: Weight = 5_000_000 * constants::WEIGHT_PER_NANOS;
+	}
+
+	#[cfg(test)]
+	mod test_weights {
+		use frame_support::weights::constants;
+
+		/// Checks that the weight exists and is sane.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			let w = super::constants::BlockExecutionWeight::get();
+
+			// At least 100 µs.
+			assert!(w >= 100 * constants::WEIGHT_PER_MICROS, "Weight should be at least 100 µs.");
+			// At most 50 ms.
+			assert!(w <= 50 * constants::WEIGHT_PER_MILLIS, "Weight should be at most 50 ms.");
+		}
+	}
+}
diff --git a/polkadot-parachains/statemine/src/weights/extrinsic_weights.rs b/polkadot-parachains/statemine/src/weights/extrinsic_weights.rs
new file mode 100644
index 0000000000..158ba99c6a
--- /dev/null
+++ b/polkadot-parachains/statemine/src/weights/extrinsic_weights.rs
@@ -0,0 +1,46 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, Weight},
+	};
+
+	parameter_types! {
+		/// Executing a NO-OP `System::remarks` Extrinsic.
+		pub const ExtrinsicBaseWeight: Weight = 125_000 * constants::WEIGHT_PER_NANOS;
+	}
+
+	#[cfg(test)]
+	mod test_weights {
+		use frame_support::weights::constants;
+
+		/// Checks that the weight exists and is sane.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			let w = super::constants::ExtrinsicBaseWeight::get();
+
+			// At least 10 µs.
+			assert!(w >= 10 * constants::WEIGHT_PER_MICROS, "Weight should be at least 10 µs.");
+			// At most 1 ms.
+			assert!(w <= constants::WEIGHT_PER_MILLIS, "Weight should be at most 1 ms.");
+		}
+	}
+}
diff --git a/polkadot-parachains/statemine/src/weights/mod.rs b/polkadot-parachains/statemine/src/weights/mod.rs
index 847c230145..bfe3c7bba5 100644
--- a/polkadot-parachains/statemine/src/weights/mod.rs
+++ b/polkadot-parachains/statemine/src/weights/mod.rs
@@ -1,4 +1,6 @@
+pub mod block_weights;
 pub mod cumulus_pallet_xcmp_queue;
+pub mod extrinsic_weights;
 pub mod frame_system;
 pub mod pallet_assets;
 pub mod pallet_balances;
@@ -9,3 +11,10 @@ pub mod pallet_session;
 pub mod pallet_timestamp;
 pub mod pallet_uniques;
 pub mod pallet_utility;
+pub mod paritydb_weights;
+pub mod rocksdb_weights;
+
+pub use block_weights::constants::BlockExecutionWeight;
+pub use extrinsic_weights::constants::ExtrinsicBaseWeight;
+pub use paritydb_weights::constants::ParityDbWeight;
+pub use rocksdb_weights::constants::RocksDbWeight;
diff --git a/polkadot-parachains/statemine/src/weights/paritydb_weights.rs b/polkadot-parachains/statemine/src/weights/paritydb_weights.rs
new file mode 100644
index 0000000000..843823c1bf
--- /dev/null
+++ b/polkadot-parachains/statemine/src/weights/paritydb_weights.rs
@@ -0,0 +1,63 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, RuntimeDbWeight},
+	};
+
+	parameter_types! {
+		/// `ParityDB` can be enabled with a feature flag, but is still experimental. These weights
+		/// are available for brave runtime engineers who may want to try this out as default.
+		pub const ParityDbWeight: RuntimeDbWeight = RuntimeDbWeight {
+			read: 8_000 * constants::WEIGHT_PER_NANOS,
+			write: 50_000 * constants::WEIGHT_PER_NANOS,
+		};
+	}
+
+	#[cfg(test)]
+	mod test_db_weights {
+		use super::constants::ParityDbWeight as W;
+		use frame_support::weights::constants;
+
+		/// Checks that all weights exist and have sane values.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			// At least 1 µs.
+			assert!(
+				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				"Read weight should be at least 1 µs."
+			);
+			assert!(
+				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				"Write weight should be at least 1 µs."
+			);
+			// At most 1 ms.
+			assert!(
+				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				"Read weight should be at most 1 ms."
+			);
+			assert!(
+				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				"Write weight should be at most 1 ms."
+			);
+		}
+	}
+}
diff --git a/polkadot-parachains/statemine/src/weights/rocksdb_weights.rs b/polkadot-parachains/statemine/src/weights/rocksdb_weights.rs
new file mode 100644
index 0000000000..05e06b0eab
--- /dev/null
+++ b/polkadot-parachains/statemine/src/weights/rocksdb_weights.rs
@@ -0,0 +1,63 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, RuntimeDbWeight},
+	};
+
+	parameter_types! {
+		/// By default, Substrate uses `RocksDB`, so this will be the weight used throughout
+		/// the runtime.
+		pub const RocksDbWeight: RuntimeDbWeight = RuntimeDbWeight {
+			read: 25_000 * constants::WEIGHT_PER_NANOS,
+			write: 100_000 * constants::WEIGHT_PER_NANOS,
+		};
+	}
+
+	#[cfg(test)]
+	mod test_db_weights {
+		use super::constants::RocksDbWeight as W;
+		use frame_support::weights::constants;
+
+		/// Checks that all weights exist and have sane values.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			// At least 1 µs.
+			assert!(
+				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				"Read weight should be at least 1 µs."
+			);
+			assert!(
+				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				"Write weight should be at least 1 µs."
+			);
+			// At most 1 ms.
+			assert!(
+				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				"Read weight should be at most 1 ms."
+			);
+			assert!(
+				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				"Write weight should be at most 1 ms."
+			);
+		}
+	}
+}
diff --git a/polkadot-parachains/statemint/Cargo.toml b/polkadot-parachains/statemint/Cargo.toml
index 83f0b440d6..4fb5746f98 100644
--- a/polkadot-parachains/statemint/Cargo.toml
+++ b/polkadot-parachains/statemint/Cargo.toml
@@ -52,7 +52,7 @@ sp-version = { git = "https://github.com/paritytech/substrate", default-features
 pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-polkadot-runtime = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
@@ -95,7 +95,6 @@ runtime-benchmarks = [
 	"pallet-uniques/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
-	"polkadot-runtime/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
@@ -132,7 +131,7 @@ std = [
 	"pallet-xcm/std",
 	"polkadot-core-primitives/std",
 	"polkadot-parachain/std",
-	"polkadot-runtime/std",
+	"polkadot-runtime-common/std",
 	"polkadot-runtime-constants/std",
 	"sp-api/std",
 	"sp-block-builder/std",
diff --git a/polkadot-parachains/statemint/src/lib.rs b/polkadot-parachains/statemint/src/lib.rs
index ed7c455e74..81f072ad7e 100644
--- a/polkadot-parachains/statemint/src/lib.rs
+++ b/polkadot-parachains/statemint/src/lib.rs
@@ -45,10 +45,7 @@ use constants::{currency::*, fee::WeightToFee};
 use frame_support::{
 	construct_runtime, parameter_types,
 	traits::{AsEnsureOriginWithArg, Contains, EnsureOneOf, InstanceFilter},
-	weights::{
-		constants::{BlockExecutionWeight, ExtrinsicBaseWeight},
-		DispatchClass, Weight,
-	},
+	weights::{DispatchClass, Weight},
 	PalletId, RuntimeDebug,
 };
 use frame_system::{
@@ -69,10 +66,12 @@ pub use sp_runtime::BuildStorage;
 
 // Polkadot imports
 use pallet_xcm::{EnsureXcm, IsMajorityOfBody};
-use polkadot_runtime::{BlockHashCount, RocksDbWeight, SlowAdjustingFeeUpdate};
+use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
 use xcm::latest::BodyId;
 use xcm_executor::XcmExecutor;
 
+use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
+
 impl_opaque_keys! {
 	pub struct SessionKeys {
 		pub aura: Aura,
diff --git a/polkadot-parachains/statemint/src/weights/block_weights.rs b/polkadot-parachains/statemint/src/weights/block_weights.rs
new file mode 100644
index 0000000000..4db90f0c02
--- /dev/null
+++ b/polkadot-parachains/statemint/src/weights/block_weights.rs
@@ -0,0 +1,46 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, Weight},
+	};
+
+	parameter_types! {
+		/// Importing a block with 0 Extrinsics.
+		pub const BlockExecutionWeight: Weight = 5_000_000 * constants::WEIGHT_PER_NANOS;
+	}
+
+	#[cfg(test)]
+	mod test_weights {
+		use frame_support::weights::constants;
+
+		/// Checks that the weight exists and is sane.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			let w = super::constants::BlockExecutionWeight::get();
+
+			// At least 100 µs.
+			assert!(w >= 100 * constants::WEIGHT_PER_MICROS, "Weight should be at least 100 µs.");
+			// At most 50 ms.
+			assert!(w <= 50 * constants::WEIGHT_PER_MILLIS, "Weight should be at most 50 ms.");
+		}
+	}
+}
diff --git a/polkadot-parachains/statemint/src/weights/extrinsic_weights.rs b/polkadot-parachains/statemint/src/weights/extrinsic_weights.rs
new file mode 100644
index 0000000000..158ba99c6a
--- /dev/null
+++ b/polkadot-parachains/statemint/src/weights/extrinsic_weights.rs
@@ -0,0 +1,46 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, Weight},
+	};
+
+	parameter_types! {
+		/// Executing a NO-OP `System::remarks` Extrinsic.
+		pub const ExtrinsicBaseWeight: Weight = 125_000 * constants::WEIGHT_PER_NANOS;
+	}
+
+	#[cfg(test)]
+	mod test_weights {
+		use frame_support::weights::constants;
+
+		/// Checks that the weight exists and is sane.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			let w = super::constants::ExtrinsicBaseWeight::get();
+
+			// At least 10 µs.
+			assert!(w >= 10 * constants::WEIGHT_PER_MICROS, "Weight should be at least 10 µs.");
+			// At most 1 ms.
+			assert!(w <= constants::WEIGHT_PER_MILLIS, "Weight should be at most 1 ms.");
+		}
+	}
+}
diff --git a/polkadot-parachains/statemint/src/weights/mod.rs b/polkadot-parachains/statemint/src/weights/mod.rs
index 847c230145..bfe3c7bba5 100644
--- a/polkadot-parachains/statemint/src/weights/mod.rs
+++ b/polkadot-parachains/statemint/src/weights/mod.rs
@@ -1,4 +1,6 @@
+pub mod block_weights;
 pub mod cumulus_pallet_xcmp_queue;
+pub mod extrinsic_weights;
 pub mod frame_system;
 pub mod pallet_assets;
 pub mod pallet_balances;
@@ -9,3 +11,10 @@ pub mod pallet_session;
 pub mod pallet_timestamp;
 pub mod pallet_uniques;
 pub mod pallet_utility;
+pub mod paritydb_weights;
+pub mod rocksdb_weights;
+
+pub use block_weights::constants::BlockExecutionWeight;
+pub use extrinsic_weights::constants::ExtrinsicBaseWeight;
+pub use paritydb_weights::constants::ParityDbWeight;
+pub use rocksdb_weights::constants::RocksDbWeight;
diff --git a/polkadot-parachains/statemint/src/weights/paritydb_weights.rs b/polkadot-parachains/statemint/src/weights/paritydb_weights.rs
new file mode 100644
index 0000000000..843823c1bf
--- /dev/null
+++ b/polkadot-parachains/statemint/src/weights/paritydb_weights.rs
@@ -0,0 +1,63 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, RuntimeDbWeight},
+	};
+
+	parameter_types! {
+		/// `ParityDB` can be enabled with a feature flag, but is still experimental. These weights
+		/// are available for brave runtime engineers who may want to try this out as default.
+		pub const ParityDbWeight: RuntimeDbWeight = RuntimeDbWeight {
+			read: 8_000 * constants::WEIGHT_PER_NANOS,
+			write: 50_000 * constants::WEIGHT_PER_NANOS,
+		};
+	}
+
+	#[cfg(test)]
+	mod test_db_weights {
+		use super::constants::ParityDbWeight as W;
+		use frame_support::weights::constants;
+
+		/// Checks that all weights exist and have sane values.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			// At least 1 µs.
+			assert!(
+				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				"Read weight should be at least 1 µs."
+			);
+			assert!(
+				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				"Write weight should be at least 1 µs."
+			);
+			// At most 1 ms.
+			assert!(
+				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				"Read weight should be at most 1 ms."
+			);
+			assert!(
+				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				"Write weight should be at most 1 ms."
+			);
+		}
+	}
+}
diff --git a/polkadot-parachains/statemint/src/weights/rocksdb_weights.rs b/polkadot-parachains/statemint/src/weights/rocksdb_weights.rs
new file mode 100644
index 0000000000..05e06b0eab
--- /dev/null
+++ b/polkadot-parachains/statemint/src/weights/rocksdb_weights.rs
@@ -0,0 +1,63 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, RuntimeDbWeight},
+	};
+
+	parameter_types! {
+		/// By default, Substrate uses `RocksDB`, so this will be the weight used throughout
+		/// the runtime.
+		pub const RocksDbWeight: RuntimeDbWeight = RuntimeDbWeight {
+			read: 25_000 * constants::WEIGHT_PER_NANOS,
+			write: 100_000 * constants::WEIGHT_PER_NANOS,
+		};
+	}
+
+	#[cfg(test)]
+	mod test_db_weights {
+		use super::constants::RocksDbWeight as W;
+		use frame_support::weights::constants;
+
+		/// Checks that all weights exist and have sane values.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			// At least 1 µs.
+			assert!(
+				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				"Read weight should be at least 1 µs."
+			);
+			assert!(
+				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				"Write weight should be at least 1 µs."
+			);
+			// At most 1 ms.
+			assert!(
+				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				"Read weight should be at most 1 ms."
+			);
+			assert!(
+				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				"Write weight should be at most 1 ms."
+			);
+		}
+	}
+}
diff --git a/polkadot-parachains/westmint/Cargo.toml b/polkadot-parachains/westmint/Cargo.toml
index e138259f98..873725cf53 100644
--- a/polkadot-parachains/westmint/Cargo.toml
+++ b/polkadot-parachains/westmint/Cargo.toml
@@ -51,7 +51,7 @@ sp-version = { git = "https://github.com/paritytech/substrate", default-features
 pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-polkadot-runtime = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 westend-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
@@ -94,7 +94,6 @@ runtime-benchmarks = [
 	"pallet-uniques/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
-	"polkadot-runtime/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
@@ -130,7 +129,7 @@ std = [
 	"pallet-xcm/std",
 	"polkadot-core-primitives/std",
 	"polkadot-parachain/std",
-	"polkadot-runtime/std",
+	"polkadot-runtime-common/std",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
diff --git a/polkadot-parachains/westmint/src/lib.rs b/polkadot-parachains/westmint/src/lib.rs
index 93a5deb6ab..4a6aba4bfa 100644
--- a/polkadot-parachains/westmint/src/lib.rs
+++ b/polkadot-parachains/westmint/src/lib.rs
@@ -45,10 +45,7 @@ use constants::{currency::*, fee::WeightToFee};
 use frame_support::{
 	construct_runtime, parameter_types,
 	traits::{AsEnsureOriginWithArg, InstanceFilter},
-	weights::{
-		constants::{BlockExecutionWeight, ExtrinsicBaseWeight},
-		DispatchClass, Weight,
-	},
+	weights::{DispatchClass, Weight},
 	PalletId, RuntimeDebug,
 };
 use frame_system::{
@@ -67,9 +64,11 @@ use xcm_config::{XcmConfig, XcmOriginToTransactDispatchOrigin};
 pub use sp_runtime::BuildStorage;
 
 // Polkadot imports
-use polkadot_runtime::{BlockHashCount, RocksDbWeight, SlowAdjustingFeeUpdate};
+use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
 use xcm_executor::XcmExecutor;
 
+use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
+
 impl_opaque_keys! {
 	pub struct SessionKeys {
 		pub aura: Aura,
diff --git a/polkadot-parachains/westmint/src/weights/block_weights.rs b/polkadot-parachains/westmint/src/weights/block_weights.rs
new file mode 100644
index 0000000000..4db90f0c02
--- /dev/null
+++ b/polkadot-parachains/westmint/src/weights/block_weights.rs
@@ -0,0 +1,46 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, Weight},
+	};
+
+	parameter_types! {
+		/// Importing a block with 0 Extrinsics.
+		pub const BlockExecutionWeight: Weight = 5_000_000 * constants::WEIGHT_PER_NANOS;
+	}
+
+	#[cfg(test)]
+	mod test_weights {
+		use frame_support::weights::constants;
+
+		/// Checks that the weight exists and is sane.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			let w = super::constants::BlockExecutionWeight::get();
+
+			// At least 100 µs.
+			assert!(w >= 100 * constants::WEIGHT_PER_MICROS, "Weight should be at least 100 µs.");
+			// At most 50 ms.
+			assert!(w <= 50 * constants::WEIGHT_PER_MILLIS, "Weight should be at most 50 ms.");
+		}
+	}
+}
diff --git a/polkadot-parachains/westmint/src/weights/extrinsic_weights.rs b/polkadot-parachains/westmint/src/weights/extrinsic_weights.rs
new file mode 100644
index 0000000000..158ba99c6a
--- /dev/null
+++ b/polkadot-parachains/westmint/src/weights/extrinsic_weights.rs
@@ -0,0 +1,46 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, Weight},
+	};
+
+	parameter_types! {
+		/// Executing a NO-OP `System::remarks` Extrinsic.
+		pub const ExtrinsicBaseWeight: Weight = 125_000 * constants::WEIGHT_PER_NANOS;
+	}
+
+	#[cfg(test)]
+	mod test_weights {
+		use frame_support::weights::constants;
+
+		/// Checks that the weight exists and is sane.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			let w = super::constants::ExtrinsicBaseWeight::get();
+
+			// At least 10 µs.
+			assert!(w >= 10 * constants::WEIGHT_PER_MICROS, "Weight should be at least 10 µs.");
+			// At most 1 ms.
+			assert!(w <= constants::WEIGHT_PER_MILLIS, "Weight should be at most 1 ms.");
+		}
+	}
+}
diff --git a/polkadot-parachains/westmint/src/weights/mod.rs b/polkadot-parachains/westmint/src/weights/mod.rs
index 847c230145..bfe3c7bba5 100644
--- a/polkadot-parachains/westmint/src/weights/mod.rs
+++ b/polkadot-parachains/westmint/src/weights/mod.rs
@@ -1,4 +1,6 @@
+pub mod block_weights;
 pub mod cumulus_pallet_xcmp_queue;
+pub mod extrinsic_weights;
 pub mod frame_system;
 pub mod pallet_assets;
 pub mod pallet_balances;
@@ -9,3 +11,10 @@ pub mod pallet_session;
 pub mod pallet_timestamp;
 pub mod pallet_uniques;
 pub mod pallet_utility;
+pub mod paritydb_weights;
+pub mod rocksdb_weights;
+
+pub use block_weights::constants::BlockExecutionWeight;
+pub use extrinsic_weights::constants::ExtrinsicBaseWeight;
+pub use paritydb_weights::constants::ParityDbWeight;
+pub use rocksdb_weights::constants::RocksDbWeight;
diff --git a/polkadot-parachains/westmint/src/weights/paritydb_weights.rs b/polkadot-parachains/westmint/src/weights/paritydb_weights.rs
new file mode 100644
index 0000000000..843823c1bf
--- /dev/null
+++ b/polkadot-parachains/westmint/src/weights/paritydb_weights.rs
@@ -0,0 +1,63 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, RuntimeDbWeight},
+	};
+
+	parameter_types! {
+		/// `ParityDB` can be enabled with a feature flag, but is still experimental. These weights
+		/// are available for brave runtime engineers who may want to try this out as default.
+		pub const ParityDbWeight: RuntimeDbWeight = RuntimeDbWeight {
+			read: 8_000 * constants::WEIGHT_PER_NANOS,
+			write: 50_000 * constants::WEIGHT_PER_NANOS,
+		};
+	}
+
+	#[cfg(test)]
+	mod test_db_weights {
+		use super::constants::ParityDbWeight as W;
+		use frame_support::weights::constants;
+
+		/// Checks that all weights exist and have sane values.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			// At least 1 µs.
+			assert!(
+				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				"Read weight should be at least 1 µs."
+			);
+			assert!(
+				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				"Write weight should be at least 1 µs."
+			);
+			// At most 1 ms.
+			assert!(
+				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				"Read weight should be at most 1 ms."
+			);
+			assert!(
+				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				"Write weight should be at most 1 ms."
+			);
+		}
+	}
+}
diff --git a/polkadot-parachains/westmint/src/weights/rocksdb_weights.rs b/polkadot-parachains/westmint/src/weights/rocksdb_weights.rs
new file mode 100644
index 0000000000..05e06b0eab
--- /dev/null
+++ b/polkadot-parachains/westmint/src/weights/rocksdb_weights.rs
@@ -0,0 +1,63 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod constants {
+	use frame_support::{
+		parameter_types,
+		weights::{constants, RuntimeDbWeight},
+	};
+
+	parameter_types! {
+		/// By default, Substrate uses `RocksDB`, so this will be the weight used throughout
+		/// the runtime.
+		pub const RocksDbWeight: RuntimeDbWeight = RuntimeDbWeight {
+			read: 25_000 * constants::WEIGHT_PER_NANOS,
+			write: 100_000 * constants::WEIGHT_PER_NANOS,
+		};
+	}
+
+	#[cfg(test)]
+	mod test_db_weights {
+		use super::constants::RocksDbWeight as W;
+		use frame_support::weights::constants;
+
+		/// Checks that all weights exist and have sane values.
+		// NOTE: If this test fails but you are sure that the generated values are fine,
+		// you can delete it.
+		#[test]
+		fn sane() {
+			// At least 1 µs.
+			assert!(
+				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				"Read weight should be at least 1 µs."
+			);
+			assert!(
+				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				"Write weight should be at least 1 µs."
+			);
+			// At most 1 ms.
+			assert!(
+				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				"Read weight should be at most 1 ms."
+			);
+			assert!(
+				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				"Write weight should be at most 1 ms."
+			);
+		}
+	}
+}