diff --git a/.github/workflows/release-20_extrinsic-ordering-check-from-bin.yml b/.github/workflows/release-20_extrinsic-ordering-check-from-bin.yml
index 704cee5d70c..442f7793f4c 100644
--- a/.github/workflows/release-20_extrinsic-ordering-check-from-bin.yml
+++ b/.github/workflows/release-20_extrinsic-ordering-check-from-bin.yml
@@ -65,7 +65,7 @@ jobs:
           $CMD >> output.txt
           sed -z -i 's/\n\n/\n/g' output.txt
           cat output.txt | egrep -n -i ''
-          SUMMARY=$(./scripts/ci/extrinsic-ordering-filter.sh output.txt)
+          SUMMARY=$(./scripts/ci/github/extrinsic-ordering-filter.sh output.txt)
           echo -e $SUMMARY
           echo -e $SUMMARY >> output.txt
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ef5fb8df88..51bc617b0bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,23 +112,6 @@ variables:
   tags:
     - kubernetes-parity-build
 
-#### stage:                        .pre
-
-# checks code format and fails if formatting is required
-# the code will be formatted automatically and the pipeline will be restarted
-cargo-fmt:
-  stage:                           .pre
-  <<:                              *pr-refs
-  <<:                              *kubernetes-env
-  before_script:
-    - echo PROJECT_NAME=$CI_PROJECT_NAME > fmt.env
-    - echo PR_BRANCH_NAME=$(curl -s https://api.github.com/repos/paritytech/${CI_PROJECT_NAME}/pulls/${CI_COMMIT_REF_NAME} | jq -r ".head.ref") >> fmt.env
-  script:
-    - cargo +nightly fmt --check
-  artifacts:
-     reports:
-       dotenv: fmt.env
-
 #### stage:                        test
 
 test-linux-stable:
@@ -234,7 +217,7 @@ build-test-parachain:
   variables:
     # Enable debug assertions since we are running optimized builds for testing
     # but still want to have debug assertions.
-    RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
+    RUSTFLAGS:                     "-Cdebug-assertions=y -Dwarnings"
   # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
   needs:
     - job:                         check-rustdoc
@@ -248,9 +231,74 @@ build-test-parachain:
     - mkdir -p ./artifacts/zombienet
     - mv ./target/release/wbuild/cumulus-test-runtime/wasm_binary_spec_version_incremented.rs.compact.compressed.wasm ./artifacts/zombienet/.
 
+# build runtime only if files in $RUNTIME_PATH/$RUNTIME_NAME were changed
+.build-runtime-template:           &build-runtime-template
+  stage:                           build
+  <<:                              *docker-env
+  <<:                              *pr-refs
+  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
+  needs:
+    - job:                         check-rustdoc
+      artifacts:                   false
+  variables:
+    RUNTIME_PATH:                  "parachains/runtimes/assets"
+  script:
+    - cd ${RUNTIME_PATH}
+    - for directory in $(echo */); do
+        echo "_____Running cargo check for ${directory} ______";
+        cd ${directory};
+        pwd;
+        SKIP_WASM_BUILD=1 cargo check;
+        cd ..;
+      done
+
+# DAG: build-runtime-assets -> build-runtime-collectives -> build-runtime-contracts
+# DAG: build-runtime-assets ->build-runtime-starters -> build-runtime-testing
+build-runtime-assets:
+  <<: *build-runtime-template
+  variables:
+    RUNTIME_PATH:                  "parachains/runtimes/assets"
+
+build-runtime-collectives:
+  <<: *build-runtime-template
+  variables:
+    RUNTIME_PATH:                  "parachains/runtimes/collectives"
+  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
+  needs:
+    - job:                         build-runtime-assets
+      artifacts:                   false
+
+build-runtime-contracts:
+  <<: *build-runtime-template
+  variables:
+    RUNTIME_PATH:                  "parachains/runtimes/contracts"
+  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
+  needs:
+    - job:                         build-runtime-collectives
+      artifacts:                   false
+
+build-runtime-starters:
+  <<: *build-runtime-template
+  variables:
+    RUNTIME_PATH:                  "parachains/runtimes/starters"
+  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
+  needs:
+    - job:                         build-runtime-assets
+      artifacts:                   false
+
+build-runtime-testing:
+  <<: *build-runtime-template
+  variables:
+    RUNTIME_PATH:                  "parachains/runtimes/testing"
+  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
+  needs:
+    - job:                         build-runtime-starters
+      artifacts:                   false
+
+
 #### stage:                        publish
 
-.build-push-image:                  &build-push-image
+.build-push-image:                 &build-push-image
   image:                           quay.io/buildah/stable
   variables:
     DOCKERFILE:                    "" # docker/path-to.Dockerfile
@@ -363,22 +411,7 @@ benchmarks-assets:
     - *git-commit-push
     # create PR to release-parachains-v* branch
     - curl -u ${GITHUB_USER}:${GITHUB_TOKEN}
-      -d '{"title":"[benchmarks] Update weights for statemine/t","body":"This PR is generated automatically by CI.","head":"'${BRANCHNAME}'","base":"'${CI_COMMIT_BRANCH}'"}'
-      -X POST https://api.github.com/repos/paritytech/${CI_PROJECT_NAME}/pulls
-    # create PR to master
-    - curl -u ${GITHUB_USER}:${GITHUB_TOKEN}
-      -d '{"title":"[benchmarks] Update weights for statemine/t","body":"This PR is generated automatically by CI.","head":"'${BRANCHNAME}'","base":"master"}'
-      -X POST https://api.github.com/repos/paritytech/${CI_PROJECT_NAME}/pulls
-    # create PR to a branch with version number (e.g. v0.9.270) and release-v* (e.g. release-v0.9.270)
-    # transform release-parachains-v9270 to v0.9.270
-    - export BASEBRANCH=$(echo ${CI_COMMIT_BRANCH} | cut -d "-" -f 3 | sed -e "s/\(.\)\(.\)\(...\)/\10.\2.\3/")
-    # create PR to v* branch
-    - curl -u ${GITHUB_USER}:${GITHUB_TOKEN}
-      -d '{"title":"[benchmarks] Update weights for statemine/t","body":"This PR is generated automatically by CI.","head":"'${BRANCHNAME}'","base":"'${BASEBRANCH}'"}'
-      -X POST https://api.github.com/repos/paritytech/${CI_PROJECT_NAME}/pulls
-    # create PR to release-v* branch
-    - curl -u ${GITHUB_USER}:${GITHUB_TOKEN}
-      -d '{"title":"[benchmarks] Update weights for statemine/t","body":"This PR is generated automatically by CI.","head":"'${BRANCHNAME}'","base":"'release-${BASEBRANCH}'"}'
+      -d '{"title":"[benchmarks] Update weights for statemine/t","body":"This PR is generated automatically by CI. (Once merged please backport to master and node release branch.)","head":"'${BRANCHNAME}'","base":"'${CI_COMMIT_BRANCH}'"}'
       -X POST https://api.github.com/repos/paritytech/${CI_PROJECT_NAME}/pulls
   after_script:
     - rm -rf .git/config
@@ -621,19 +654,3 @@ cancel-pipeline:
     PR_NUM:                        "${PR_NUM}"
   trigger:
     project:                       "parity/infrastructure/ci_cd/pipeline-stopper"
-    # remove branch, when pipeline-stopper for substrate and polakdot is updated to the same branch
-    branch:                        "as-improve"
-
-# this job will automatically format code and rerun pipeline if cargo-fmt job fails
-auto-fmt:
-  stage:                           .post
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
-      when: on_failure
-  needs:
-    - job: cargo-fmt
-  variables:
-    PROJECT_NAME:                  "${CI_PROJECT_NAME}"
-    PR_BRANCH_NAME:                "${PR_BRANCH_NAME}"
-  trigger:
-    project:                       "parity/infrastructure/ci_cd/auto-fmt"
diff --git a/Cargo.lock b/Cargo.lock
index 7abe9f28c50..bcbd8a28233 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -88,6 +88,12 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbf688625d06217d5b1bb0ea9d9c44a1635fd0ee3534466388d18203174f4d11"
 
+[[package]]
+name = "anes"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+
 [[package]]
 name = "ansi_term"
 version = "0.12.1"
@@ -112,6 +118,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "array-bytes"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a913633b0c922e6b745072795f50d90ebea78ba31a57e2ac8c2fc7b50950949"
+
 [[package]]
 name = "arrayref"
 version = "0.3.6"
@@ -439,6 +451,12 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
+[[package]]
+name = "base64ct"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea2b2456fd614d856680dcd9fcc660a51a820fa09daef2e49772b56a193c8474"
+
 [[package]]
 name = "beef"
 version = "0.5.1"
@@ -451,14 +469,14 @@ dependencies = [
 [[package]]
 name = "beefy-gadget"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
+ "array-bytes",
  "async-trait",
  "beefy-primitives",
  "fnv",
  "futures",
  "futures-timer",
- "hex",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -487,7 +505,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "beefy-gadget",
  "beefy-primitives",
@@ -507,7 +525,7 @@ dependencies = [
 [[package]]
 name = "beefy-merkle-tree"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "beefy-primitives",
  "sp-api",
@@ -516,7 +534,7 @@ dependencies = [
 [[package]]
 name = "beefy-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -581,9 +599,9 @@ dependencies = [
 
 [[package]]
 name = "blake2"
-version = "0.10.2"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b94ba84325db59637ffc528bbe8c7f86c02c57cff5c0e2b9b00f9a851f42f309"
+checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388"
 dependencies = [
  "digest 0.10.3",
 ]
@@ -718,7 +736,6 @@ dependencies = [
  "lazy_static",
  "memchr",
  "regex-automata",
- "serde",
 ]
 
 [[package]]
@@ -738,9 +755,9 @@ checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"
 
 [[package]]
 name = "byte-slice-cast"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d30c751592b77c499e7bce34d99d67c2c11bdc0574e9a488ddade14150a4698"
+checksum = "87c5fdd0166095e1d463fc6cc01aa8ce547ad77a4e84d42eb6762b084e28067e"
 
 [[package]]
 name = "byte-tools"
@@ -808,15 +825,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "cast"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a"
-dependencies = [
- "rustc_version 0.4.0",
-]
-
 [[package]]
 name = "cast"
 version = "0.3.0"
@@ -906,11 +914,38 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "ciborium"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
 [[package]]
 name = "cid"
-version = "0.8.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a52cffa791ce5cf490ac3b2d6df970dc04f931b04e727be3c3e220e17164dfc4"
+checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2"
 dependencies = [
  "core2",
  "multibase",
@@ -950,20 +985,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "bitflags",
- "textwrap 0.11.0",
- "unicode-width",
-]
-
-[[package]]
-name = "clap"
-version = "3.2.20"
+version = "3.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd"
+checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750"
 dependencies = [
  "atty",
  "bitflags",
@@ -973,7 +997,7 @@ dependencies = [
  "once_cell",
  "strsim",
  "termcolor",
- "textwrap 0.15.0",
+ "textwrap",
 ]
 
 [[package]]
@@ -1233,19 +1257,21 @@ dependencies = [
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.87.1"
+version = "0.88.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f91425bea5a5ac6d76b788477064944a7e21f0e240fd93f6f368a774a3efdd1"
+checksum = "b27bbd3e6c422cf6282b047bcdd51ecd9ca9f3497a3be0132ffa08e509b824b0"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.87.1"
+version = "0.88.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b83b4bbf7bc96db77b7b5b5e41fafc4001536e9f0cbfd702ed7d4d8f848dc06"
+checksum = "872f5d4557a411b087bd731df6347c142ae1004e6467a144a7e33662e5715a01"
 dependencies = [
+ "arrayvec 0.7.2",
+ "bumpalo",
  "cranelift-bforest",
  "cranelift-codegen-meta",
  "cranelift-codegen-shared",
@@ -1260,33 +1286,33 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.87.1"
+version = "0.88.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da02e8fff048c381b313a3dfef4deb2343976fb6d7acc8e7d9c86d4c93e3fa06"
+checksum = "21b49fdebb29c62c1fc4da1eeebd609e9d530ecde24a9876def546275f73a244"
 dependencies = [
  "cranelift-codegen-shared",
 ]
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.87.1"
+version = "0.88.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9abc2a06e8fc29e36660ebbc9e2503e18a051057072acbb1e75e7f7cf19cb95e"
+checksum = "5fc0c091e2db055d4d7f6b7cec2d2ead286bcfaea3357c6a52c2a2613a8cb5ac"
 
 [[package]]
 name = "cranelift-entity"
-version = "0.87.1"
+version = "0.88.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aeced7874890fc25d85cacc5e626c4d67931c7c25aad1c2ad521684744c1ff5c"
+checksum = "354a9597be87996c9b278655e68b8447f65dd907256855ad773864edee8d985c"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.87.1"
+version = "0.88.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc1d301ccad6fce05d9c9793d433d225fafdd57661b98d268d8d162e9291ff2e"
+checksum = "0cd8dd3fb8b82c772f4172e87ae1677b971676fffa7c4e3398e3047e650a266b"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -1296,15 +1322,15 @@ dependencies = [
 
 [[package]]
 name = "cranelift-isle"
-version = "0.87.1"
+version = "0.88.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7b100db19320848986b4df1da19501dbddeb706a799f502222f72f889b0fab"
+checksum = "b82527802b1f7d8da288adc28f1dc97ea52943f5871c041213f7b5035ac698a7"
 
 [[package]]
 name = "cranelift-native"
-version = "0.87.1"
+version = "0.88.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be18d8b976cddc822e52343f328b7593d26dd2f1aeadd90da071596a210d524"
+checksum = "c30ba8b910f1be023af0c39109cb28a8809734942a6b3eecbf2de8993052ea5e"
 dependencies = [
  "cranelift-codegen",
  "libc",
@@ -1313,9 +1339,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-wasm"
-version = "0.87.1"
+version = "0.88.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f9e48bb632a2e189b38a9fa89fa5a6eea687a5a4c613bbef7c2b7522c3ad0e0"
+checksum = "776a8916d201894aca9637a20814f1e11abc62acd5cfbe0b4eb2e63922756971"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1338,15 +1364,16 @@ dependencies = [
 
 [[package]]
 name = "criterion"
-version = "0.3.6"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f"
+checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb"
 dependencies = [
+ "anes",
  "atty",
- "cast 0.3.0",
- "clap 2.34.0",
+ "cast",
+ "ciborium",
+ "clap",
  "criterion-plot",
- "csv",
  "futures",
  "itertools",
  "lazy_static",
@@ -1356,7 +1383,6 @@ dependencies = [
  "rayon",
  "regex",
  "serde",
- "serde_cbor",
  "serde_derive",
  "serde_json",
  "tinytemplate",
@@ -1366,11 +1392,11 @@ dependencies = [
 
 [[package]]
 name = "criterion-plot"
-version = "0.4.4"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57"
+checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
 dependencies = [
- "cast 0.2.7",
+ "cast",
  "itertools",
 ]
 
@@ -1476,28 +1502,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "csv"
-version = "1.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
-dependencies = [
- "bstr",
- "csv-core",
- "itoa 0.4.8",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "csv-core"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "ctor"
 version = "0.1.21"
@@ -1532,7 +1536,7 @@ dependencies = [
 name = "cumulus-client-cli"
 version = "0.1.0"
 dependencies = [
- "clap 3.2.20",
+ "clap",
  "parity-scale-codec",
  "sc-chain-spec",
  "sc-cli",
@@ -1985,7 +1989,6 @@ dependencies = [
  "async-trait",
  "cumulus-primitives-core",
  "cumulus-relay-chain-interface",
- "cumulus-test-service",
  "futures",
  "futures-timer",
  "polkadot-cli",
@@ -2146,7 +2149,7 @@ name = "cumulus-test-service"
 version = "0.1.0"
 dependencies = [
  "async-trait",
- "clap 3.2.20",
+ "clap",
  "criterion",
  "cumulus-client-cli",
  "cumulus-client-consensus-common",
@@ -2541,9 +2544,9 @@ dependencies = [
 
 [[package]]
 name = "enumn"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052bc8773a98bd051ff37db74a8a25f00e6bfa2cbd03373390c72e9f7afbf344"
+checksum = "038b1afa59052df211f9efd58f8b1d84c242935ede1c3dbaed26b018a9e06ae2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2786,7 +2789,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2803,7 +2806,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2826,11 +2829,12 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "Inflector",
+ "array-bytes",
  "chrono",
- "clap 3.2.20",
+ "clap",
  "comfy-table",
  "frame-benchmarking",
  "frame-support",
@@ -2838,7 +2842,6 @@ dependencies = [
  "gethostname",
  "handlebars",
  "hash-db",
- "hex",
  "itertools",
  "kvdb",
  "lazy_static",
@@ -2877,7 +2880,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -2888,7 +2891,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -2904,7 +2907,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2933,7 +2936,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2958,13 +2961,14 @@ dependencies = [
  "sp-state-machine",
  "sp-std",
  "sp-tracing",
+ "sp-weights",
  "tt-call",
 ]
 
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "Inflector",
  "cfg-expr",
@@ -2978,7 +2982,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -2990,7 +2994,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3000,7 +3004,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-support",
  "log",
@@ -3012,12 +3016,13 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "sp-version",
+ "sp-weights",
 ]
 
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3032,7 +3037,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -3041,7 +3046,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3920,7 +3925,7 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
 [[package]]
 name = "kusama-runtime"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -4013,7 +4018,7 @@ dependencies = [
 [[package]]
 name = "kusama-runtime-constants"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -4172,8 +4177,8 @@ dependencies = [
  "libp2p-request-response",
  "libp2p-swarm",
  "log",
- "prost",
- "prost-build",
+ "prost 0.10.3",
+ "prost-build 0.10.4",
  "rand 0.8.5",
 ]
 
@@ -4199,8 +4204,8 @@ dependencies = [
  "multistream-select",
  "parking_lot 0.12.1",
  "pin-project",
- "prost",
- "prost-build",
+ "prost 0.10.3",
+ "prost-build 0.10.4",
  "rand 0.8.5",
  "ring",
  "rw-stream-sink",
@@ -4250,8 +4255,8 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "prost",
- "prost-build",
+ "prost 0.10.3",
+ "prost-build 0.10.4",
  "rand 0.7.3",
  "smallvec",
 ]
@@ -4274,8 +4279,8 @@ dependencies = [
  "libp2p-swarm",
  "log",
  "prometheus-client",
- "prost",
- "prost-build",
+ "prost 0.10.3",
+ "prost-build 0.10.4",
  "rand 0.7.3",
  "regex",
  "sha2 0.10.2",
@@ -4297,8 +4302,8 @@ dependencies = [
  "libp2p-swarm",
  "log",
  "lru 0.7.7",
- "prost",
- "prost-build",
+ "prost 0.10.3",
+ "prost-build 0.10.4",
  "prost-codec",
  "smallvec",
  "thiserror",
@@ -4322,8 +4327,8 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "prost",
- "prost-build",
+ "prost 0.10.3",
+ "prost-build 0.10.4",
  "rand 0.7.3",
  "sha2 0.10.2",
  "smallvec",
@@ -4400,8 +4405,8 @@ dependencies = [
  "lazy_static",
  "libp2p-core",
  "log",
- "prost",
- "prost-build",
+ "prost 0.10.3",
+ "prost-build 0.10.4",
  "rand 0.8.5",
  "sha2 0.10.2",
  "snow",
@@ -4437,8 +4442,8 @@ dependencies = [
  "futures",
  "libp2p-core",
  "log",
- "prost",
- "prost-build",
+ "prost 0.10.3",
+ "prost-build 0.10.4",
  "unsigned-varint",
  "void",
 ]
@@ -4473,8 +4478,8 @@ dependencies = [
  "libp2p-swarm",
  "log",
  "pin-project",
- "prost",
- "prost-build",
+ "prost 0.10.3",
+ "prost-build 0.10.4",
  "prost-codec",
  "rand 0.8.5",
  "smallvec",
@@ -4497,8 +4502,8 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "prost",
- "prost-build",
+ "prost 0.10.3",
+ "prost-build 0.10.4",
  "rand 0.8.5",
  "sha2 0.10.2",
  "thiserror",
@@ -4755,20 +4760,20 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.6.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ea2d928b485416e8908cff2d97d621db22b27f7b3b6729e438bcf42c671ba91"
+checksum = "c84e6fe5655adc6ce00787cf7dcaf8dc4f998a0565d23eafc207a8b08ca3349a"
 dependencies = [
  "hashbrown 0.11.2",
 ]
 
 [[package]]
 name = "lru"
-version = "0.7.7"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c84e6fe5655adc6ce00787cf7dcaf8dc4f998a0565d23eafc207a8b08ca3349a"
+checksum = "936d98d2ddd79c18641c6709e7bb09981449694e402d1a0f0f657ea8d61f4a51"
 dependencies = [
- "hashbrown 0.11.2",
+ "hashbrown 0.12.3",
 ]
 
 [[package]]
@@ -4782,9 +4787,9 @@ dependencies = [
 
 [[package]]
 name = "lz4"
-version = "1.23.2"
+version = "1.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c"
+checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1"
 dependencies = [
  "libc",
  "lz4-sys",
@@ -4792,9 +4797,9 @@ dependencies = [
 
 [[package]]
 name = "lz4-sys"
-version = "1.9.2"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae"
+checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
 dependencies = [
  "cc",
  "libc",
@@ -4900,11 +4905,11 @@ dependencies = [
 
 [[package]]
 name = "memory-lru"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beeb98b3d1ed2c0054bd81b5ba949a0243c3ccad751d45ea898fa8059fa2860a"
+checksum = "ce95ae042940bad7e312857b929ee3d11b8f799a80cb7b9c7ec5125516906395"
 dependencies = [
- "lru 0.6.6",
+ "lru 0.8.0",
 ]
 
 [[package]]
@@ -5352,7 +5357,7 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
 [[package]]
 name = "orchestra"
 version = "0.0.1"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "async-trait",
  "dyn-clonable",
@@ -5368,7 +5373,7 @@ dependencies = [
 [[package]]
 name = "orchestra-proc-macro"
 version = "0.0.1"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "expander 0.0.6",
  "itertools",
@@ -5406,12 +5411,12 @@ dependencies = [
 [[package]]
 name = "pallet-alliance"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
+ "array-bytes",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "hex",
  "log",
  "pallet-collective",
  "pallet-identity",
@@ -5427,7 +5432,7 @@ dependencies = [
 [[package]]
 name = "pallet-asset-tx-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5444,7 +5449,7 @@ dependencies = [
 [[package]]
 name = "pallet-assets"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5458,7 +5463,7 @@ dependencies = [
 [[package]]
 name = "pallet-aura"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5474,7 +5479,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5490,7 +5495,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5505,7 +5510,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5529,7 +5534,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5549,7 +5554,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5564,7 +5569,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "beefy-primitives",
  "frame-support",
@@ -5580,13 +5585,13 @@ dependencies = [
 [[package]]
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
+ "array-bytes",
  "beefy-merkle-tree",
  "beefy-primitives",
  "frame-support",
  "frame-system",
- "hex",
  "log",
  "pallet-beefy",
  "pallet-mmr",
@@ -5603,7 +5608,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5621,7 +5626,7 @@ dependencies = [
 [[package]]
 name = "pallet-child-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5666,7 +5671,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5683,7 +5688,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "bitflags",
  "frame-benchmarking",
@@ -5711,7 +5716,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts-primitives"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "bitflags",
  "parity-scale-codec",
@@ -5726,7 +5731,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5736,7 +5741,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "jsonrpsee",
  "pallet-contracts-primitives",
@@ -5753,7 +5758,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "pallet-contracts-primitives",
  "parity-scale-codec",
@@ -5766,7 +5771,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5782,13 +5787,14 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
  "frame-support",
  "frame-system",
  "log",
+ "pallet-election-provider-support-benchmarking",
  "parity-scale-codec",
  "rand 0.7.3",
  "scale-info",
@@ -5805,7 +5811,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5818,7 +5824,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5836,7 +5842,7 @@ dependencies = [
 [[package]]
 name = "pallet-gilt"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5851,7 +5857,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5874,7 +5880,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5890,7 +5896,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5910,7 +5916,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5927,7 +5933,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5944,7 +5950,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "ckb-merkle-mountain-range",
  "frame-benchmarking",
@@ -5962,7 +5968,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -5977,7 +5983,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5992,7 +5998,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6009,7 +6015,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-benchmarking"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6021,6 +6027,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
+ "sp-runtime-interface",
  "sp-staking",
  "sp-std",
 ]
@@ -6028,7 +6035,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-runtime-api"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6038,7 +6045,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6055,7 +6062,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6078,7 +6085,7 @@ dependencies = [
 [[package]]
 name = "pallet-preimage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6094,7 +6101,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6109,7 +6116,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6123,7 +6130,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6138,7 +6145,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6154,7 +6161,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6175,7 +6182,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6191,7 +6198,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6205,7 +6212,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6228,7 +6235,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -6239,7 +6246,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -6248,7 +6255,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6277,7 +6284,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6295,7 +6302,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6314,7 +6321,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6330,7 +6337,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -6345,7 +6352,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -6356,7 +6363,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6373,7 +6380,7 @@ dependencies = [
 [[package]]
 name = "pallet-uniques"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6388,7 +6395,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6404,7 +6411,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6419,7 +6426,7 @@ dependencies = [
 [[package]]
 name = "pallet-xcm"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6437,7 +6444,7 @@ dependencies = [
 [[package]]
 name = "pallet-xcm-benchmarks"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6467,7 +6474,7 @@ dependencies = [
 name = "parachain-template-node"
 version = "0.1.0"
 dependencies = [
- "clap 3.2.20",
+ "clap",
  "cumulus-client-cli",
  "cumulus-client-collator",
  "cumulus-client-consensus-aura",
@@ -6637,9 +6644,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "3.1.5"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9182e4a71cae089267ab03e67c99368db7cd877baf50f931e5d6d4b71e195ac0"
+checksum = "366e44391a8af4cfd6002ef6ba072bae071a96aafca98d7d448a34c5dca38b6a"
 dependencies = [
  "arrayvec 0.7.2",
  "bitvec",
@@ -6952,6 +6959,17 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "pkcs8"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0"
+dependencies = [
+ "der",
+ "spki",
+ "zeroize",
+]
+
 [[package]]
 name = "pkg-config"
 version = "0.3.22"
@@ -6995,7 +7013,7 @@ dependencies = [
 [[package]]
 name = "polkadot-approval-distribution"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "futures",
  "polkadot-node-network-protocol",
@@ -7010,7 +7028,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "futures",
  "polkadot-node-network-protocol",
@@ -7024,7 +7042,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-distribution"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "derive_more",
  "fatality",
@@ -7047,7 +7065,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-recovery"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "fatality",
  "futures",
@@ -7068,9 +7086,9 @@ dependencies = [
 [[package]]
 name = "polkadot-cli"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
- "clap 3.2.20",
+ "clap",
  "frame-benchmarking-cli",
  "futures",
  "log",
@@ -7094,7 +7112,7 @@ dependencies = [
 [[package]]
 name = "polkadot-client"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "beefy-primitives",
  "frame-benchmarking",
@@ -7135,7 +7153,7 @@ dependencies = [
 [[package]]
 name = "polkadot-collator-protocol"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "always-assert",
  "fatality",
@@ -7156,7 +7174,7 @@ dependencies = [
 [[package]]
 name = "polkadot-core-primitives"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
@@ -7169,7 +7187,7 @@ dependencies = [
 [[package]]
 name = "polkadot-dispute-distribution"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "derive_more",
  "fatality",
@@ -7192,7 +7210,7 @@ dependencies = [
 [[package]]
 name = "polkadot-erasure-coding"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-primitives",
@@ -7206,7 +7224,7 @@ dependencies = [
 [[package]]
 name = "polkadot-gossip-support"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "futures",
  "futures-timer",
@@ -7226,7 +7244,7 @@ dependencies = [
 [[package]]
 name = "polkadot-network-bridge"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "always-assert",
  "async-trait",
@@ -7250,7 +7268,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-collation-generation"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "futures",
  "parity-scale-codec",
@@ -7268,7 +7286,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-approval-voting"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "bitvec",
  "derive_more",
@@ -7297,7 +7315,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-av-store"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "bitvec",
  "futures",
@@ -7317,7 +7335,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-backing"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "bitvec",
  "fatality",
@@ -7336,7 +7354,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "futures",
  "polkadot-node-subsystem",
@@ -7351,7 +7369,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-candidate-validation"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "async-trait",
  "futures",
@@ -7369,7 +7387,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-chain-api"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "futures",
  "polkadot-node-subsystem",
@@ -7384,7 +7402,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-chain-selection"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "futures",
  "futures-timer",
@@ -7401,7 +7419,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-dispute-coordinator"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "fatality",
  "futures",
@@ -7420,7 +7438,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-parachains-inherent"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "async-trait",
  "futures",
@@ -7437,7 +7455,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-provisioner"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "bitvec",
  "fatality",
@@ -7455,7 +7473,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-pvf"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "always-assert",
  "assert_matches",
@@ -7466,7 +7484,7 @@ dependencies = [
  "parity-scale-codec",
  "pin-project",
  "polkadot-core-primitives",
- "polkadot-node-subsystem-util",
+ "polkadot-node-metrics",
  "polkadot-parachain 0.9.29",
  "rand 0.8.5",
  "rayon",
@@ -7487,7 +7505,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-pvf-checker"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "futures",
  "polkadot-node-primitives",
@@ -7503,7 +7521,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-runtime-api"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "futures",
  "memory-lru",
@@ -7519,7 +7537,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-jaeger"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "async-std",
  "lazy_static",
@@ -7537,7 +7555,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-metrics"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "bs58",
  "futures",
@@ -7556,7 +7574,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-network-protocol"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7578,7 +7596,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-primitives"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "bounded-vec",
  "futures",
@@ -7600,7 +7618,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-node-subsystem-types",
@@ -7610,7 +7628,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-test-helpers"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "async-trait",
  "futures",
@@ -7628,7 +7646,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-types"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7651,7 +7669,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-util"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7684,7 +7702,7 @@ dependencies = [
 [[package]]
 name = "polkadot-overseer"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "async-trait",
  "futures",
@@ -7707,7 +7725,7 @@ dependencies = [
 [[package]]
 name = "polkadot-parachain"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "derive_more",
  "frame-support",
@@ -7727,7 +7745,7 @@ version = "0.9.230"
 dependencies = [
  "assert_cmd",
  "async-trait",
- "clap 3.2.20",
+ "clap",
  "collectives-polkadot-runtime",
  "contracts-rococo-runtime",
  "cumulus-client-cli",
@@ -7807,7 +7825,7 @@ dependencies = [
 [[package]]
 name = "polkadot-performance-test"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "env_logger 0.9.0",
  "kusama-runtime",
@@ -7822,7 +7840,7 @@ dependencies = [
 [[package]]
 name = "polkadot-primitives"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "bitvec",
  "frame-system",
@@ -7852,7 +7870,7 @@ dependencies = [
 [[package]]
 name = "polkadot-rpc"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "beefy-gadget",
  "beefy-gadget-rpc",
@@ -7884,7 +7902,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -7972,7 +7990,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-common"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -8019,7 +8037,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-constants"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -8031,7 +8049,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-metrics"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "bs58",
  "parity-scale-codec",
@@ -8043,7 +8061,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-parachains"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "bitflags",
  "bitvec",
@@ -8086,7 +8104,7 @@ dependencies = [
 [[package]]
 name = "polkadot-service"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "async-trait",
  "beefy-gadget",
@@ -8191,7 +8209,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-distribution"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "arrayvec 0.5.2",
  "fatality",
@@ -8212,7 +8230,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-table"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -8222,7 +8240,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-client"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-subsystem",
@@ -8247,7 +8265,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-runtime"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -8308,7 +8326,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-service"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "frame-benchmarking",
  "frame-system",
@@ -8453,7 +8471,7 @@ dependencies = [
 [[package]]
 name = "prioritized-metered-channel"
 version = "0.2.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "coarsetime",
  "crossbeam-queue",
@@ -8553,7 +8571,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc03e116981ff7d8da8e5c220e374587b98d294af7ba7dd7fda761158f00086f"
 dependencies = [
  "bytes",
- "prost-derive",
+ "prost-derive 0.10.1",
+]
+
+[[package]]
+name = "prost"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7"
+dependencies = [
+ "bytes",
+ "prost-derive 0.11.0",
 ]
 
 [[package]]
@@ -8571,8 +8599,28 @@ dependencies = [
  "log",
  "multimap",
  "petgraph",
- "prost",
- "prost-types",
+ "prost 0.10.3",
+ "prost-types 0.10.1",
+ "regex",
+ "tempfile",
+ "which",
+]
+
+[[package]]
+name = "prost-build"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f835c582e6bd972ba8347313300219fed5bfa52caf175298d860b61ff6069bb"
+dependencies = [
+ "bytes",
+ "heck",
+ "itertools",
+ "lazy_static",
+ "log",
+ "multimap",
+ "petgraph",
+ "prost 0.11.0",
+ "prost-types 0.11.1",
  "regex",
  "tempfile",
  "which",
@@ -8586,7 +8634,7 @@ checksum = "00af1e92c33b4813cc79fda3f2dbf56af5169709be0202df730e9ebc3e4cd007"
 dependencies = [
  "asynchronous-codec",
  "bytes",
- "prost",
+ "prost 0.10.3",
  "thiserror",
  "unsigned-varint",
 ]
@@ -8604,6 +8652,19 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "prost-derive"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364"
+dependencies = [
+ "anyhow",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "prost-types"
 version = "0.10.1"
@@ -8611,7 +8672,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68"
 dependencies = [
  "bytes",
- "prost",
+ "prost 0.10.3",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e"
+dependencies = [
+ "bytes",
+ "prost 0.11.0",
 ]
 
 [[package]]
@@ -8820,7 +8891,7 @@ dependencies = [
  "derive_more",
  "fs-err",
  "itertools",
- "static_init",
+ "static_init 0.5.2",
  "thiserror",
 ]
 
@@ -8885,7 +8956,7 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 [[package]]
 name = "remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "env_logger 0.9.0",
  "jsonrpsee",
@@ -9007,7 +9078,7 @@ dependencies = [
 [[package]]
 name = "rococo-runtime"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "beefy-merkle-tree",
  "beefy-primitives",
@@ -9091,7 +9162,7 @@ dependencies = [
 [[package]]
 name = "rococo-runtime-constants"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -9261,7 +9332,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "log",
  "sp-core",
@@ -9272,7 +9343,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "async-trait",
  "futures",
@@ -9281,8 +9352,8 @@ dependencies = [
  "libp2p",
  "log",
  "parity-scale-codec",
- "prost",
- "prost-build",
+ "prost 0.10.3",
+ "prost-build 0.10.4",
  "rand 0.7.3",
  "sc-client-api",
  "sc-network-common",
@@ -9299,7 +9370,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "futures",
  "futures-timer",
@@ -9322,7 +9393,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -9338,7 +9409,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "impl-trait-for-tuples",
  "memmap2 0.5.0",
@@ -9355,7 +9426,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -9366,13 +9437,13 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
+ "array-bytes",
  "chrono",
- "clap 3.2.20",
+ "clap",
  "fdlimit",
  "futures",
- "hex",
  "libp2p",
  "log",
  "names",
@@ -9405,7 +9476,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "fnv",
  "futures",
@@ -9433,7 +9504,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -9458,7 +9529,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "async-trait",
  "futures",
@@ -9482,7 +9553,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "async-trait",
  "futures",
@@ -9511,7 +9582,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -9553,7 +9624,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -9575,7 +9646,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -9588,7 +9659,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "async-trait",
  "futures",
@@ -9613,7 +9684,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "lazy_static",
  "lru 0.7.7",
@@ -9640,7 +9711,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -9656,7 +9727,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9671,7 +9742,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -9691,16 +9762,16 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "ahash",
+ "array-bytes",
  "async-trait",
  "dyn-clone",
  "finality-grandpa",
  "fork-tree",
  "futures",
  "futures-timer",
- "hex",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -9732,7 +9803,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "finality-grandpa",
  "futures",
@@ -9753,7 +9824,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "ansi_term",
  "futures",
@@ -9770,10 +9841,10 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
+ "array-bytes",
  "async-trait",
- "hex",
  "parking_lot 0.12.1",
  "serde_json",
  "sp-application-crypto",
@@ -9785,8 +9856,9 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
+ "array-bytes",
  "async-trait",
  "asynchronous-codec",
  "bitflags",
@@ -9797,7 +9869,6 @@ dependencies = [
  "fork-tree",
  "futures",
  "futures-timer",
- "hex",
  "ip_network",
  "libp2p",
  "linked-hash-map",
@@ -9807,8 +9878,7 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "pin-project",
- "prost",
- "prost-build",
+ "prost 0.10.3",
  "rand 0.7.3",
  "sc-block-builder",
  "sc-client-api",
@@ -9827,14 +9897,33 @@ dependencies = [
  "substrate-prometheus-endpoint",
  "thiserror",
  "unsigned-varint",
- "void",
  "zeroize",
 ]
 
+[[package]]
+name = "sc-network-bitswap"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
+dependencies = [
+ "cid",
+ "futures",
+ "libp2p",
+ "log",
+ "prost 0.11.0",
+ "prost-build 0.11.1",
+ "sc-client-api",
+ "sc-network-common",
+ "sp-blockchain",
+ "sp-runtime",
+ "thiserror",
+ "unsigned-varint",
+ "void",
+]
+
 [[package]]
 name = "sc-network-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "async-trait",
  "bitflags",
@@ -9842,7 +9931,7 @@ dependencies = [
  "futures",
  "libp2p",
  "parity-scale-codec",
- "prost-build",
+ "prost-build 0.10.4",
  "sc-consensus",
  "sc-peerset",
  "serde",
@@ -9857,7 +9946,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "ahash",
  "futures",
@@ -9875,15 +9964,15 @@ dependencies = [
 [[package]]
 name = "sc-network-light"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
+ "array-bytes",
  "futures",
- "hex",
  "libp2p",
  "log",
  "parity-scale-codec",
- "prost",
- "prost-build",
+ "prost 0.10.3",
+ "prost-build 0.10.4",
  "sc-client-api",
  "sc-network-common",
  "sc-peerset",
@@ -9896,17 +9985,17 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
+ "array-bytes",
  "fork-tree",
  "futures",
- "hex",
  "libp2p",
  "log",
  "lru 0.7.7",
  "parity-scale-codec",
- "prost",
- "prost-build",
+ "prost 0.10.3",
+ "prost-build 0.10.4",
  "sc-client-api",
  "sc-consensus",
  "sc-network-common",
@@ -9924,13 +10013,13 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
+ "array-bytes",
  "bytes",
  "fnv",
  "futures",
  "futures-timer",
- "hex",
  "hyper",
  "hyper-rustls",
  "libp2p",
@@ -9954,7 +10043,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "futures",
  "libp2p",
@@ -9967,7 +10056,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -9976,7 +10065,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "futures",
  "hash-db",
@@ -10006,7 +10095,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -10029,7 +10118,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -10042,7 +10131,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "async-trait",
  "directories",
@@ -10066,6 +10155,7 @@ dependencies = [
  "sc-informant",
  "sc-keystore",
  "sc-network",
+ "sc-network-bitswap",
  "sc-network-common",
  "sc-network-light",
  "sc-network-sync",
@@ -10098,6 +10188,7 @@ dependencies = [
  "sp-transaction-storage-proof",
  "sp-trie",
  "sp-version",
+ "static_init 1.0.3",
  "substrate-prometheus-endpoint",
  "tempfile",
  "thiserror",
@@ -10109,7 +10200,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -10123,7 +10214,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -10142,7 +10233,7 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "futures",
  "libc",
@@ -10161,7 +10252,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "chrono",
  "futures",
@@ -10179,7 +10270,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "ansi_term",
  "atty",
@@ -10210,7 +10301,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -10221,7 +10312,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "futures",
  "futures-timer",
@@ -10247,7 +10338,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "futures",
  "log",
@@ -10260,7 +10351,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "futures",
  "futures-timer",
@@ -10272,9 +10363,9 @@ dependencies = [
 
 [[package]]
 name = "scale-info"
-version = "2.1.2"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c46be926081c9f4dd5dd9b6f1d3e3229f2360bc6502dd8836f84a93b7c75e99a"
+checksum = "333af15b02563b8182cd863f925bd31ef8fa86a0e095d30c091956057d436153"
 dependencies = [
  "bitvec",
  "cfg-if 1.0.0",
@@ -10286,9 +10377,9 @@ dependencies = [
 
 [[package]]
 name = "scale-info-derive"
-version = "2.1.2"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e334bb10a245e28e5fd755cabcafd96cfcd167c99ae63a46924ca8d8703a3c"
+checksum = "53f56acbd0743d29ffa08f911ab5397def774ad01bab3786804cf6ee057fb5e1"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -10348,6 +10439,7 @@ checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1"
 dependencies = [
  "der",
  "generic-array 0.14.4",
+ "pkcs8",
  "subtle",
  "zeroize",
 ]
@@ -10476,16 +10568,6 @@ dependencies = [
  "serde_derive",
 ]
 
-[[package]]
-name = "serde_cbor"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
-dependencies = [
- "half",
- "serde",
-]
-
 [[package]]
 name = "serde_derive"
 version = "1.0.144"
@@ -10707,7 +10789,7 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec"
 [[package]]
 name = "slot-range-helper"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "enumn",
  "parity-scale-codec",
@@ -10783,7 +10865,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "hash-db",
  "log",
@@ -10801,7 +10883,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "blake2",
  "proc-macro-crate",
@@ -10813,7 +10895,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10826,7 +10908,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -10841,7 +10923,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10854,7 +10936,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10866,7 +10948,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -10878,7 +10960,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "futures",
  "log",
@@ -10896,7 +10978,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "async-trait",
  "futures",
@@ -10915,7 +10997,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10933,7 +11015,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "async-trait",
  "merlin",
@@ -10956,7 +11038,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10970,7 +11052,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10983,18 +11065,18 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
+ "array-bytes",
  "base58",
  "bitflags",
- "blake2-rfc",
+ "blake2",
  "byteorder",
  "dyn-clonable",
  "ed25519-zebra",
  "futures",
  "hash-db",
  "hash256-std-hasher",
- "hex",
  "impl-serde",
  "lazy_static",
  "libsecp256k1",
@@ -11029,7 +11111,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "blake2",
  "byteorder",
@@ -11043,7 +11125,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -11054,7 +11136,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.1",
@@ -11063,7 +11145,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -11073,7 +11155,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -11084,7 +11166,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -11102,7 +11184,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -11116,7 +11198,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "bytes",
  "futures",
@@ -11142,7 +11224,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -11153,7 +11235,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "async-trait",
  "futures",
@@ -11170,7 +11252,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "thiserror",
  "zstd",
@@ -11179,7 +11261,7 @@ dependencies = [
 [[package]]
 name = "sp-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -11194,7 +11276,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11208,7 +11290,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -11218,7 +11300,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -11228,7 +11310,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -11238,7 +11320,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -11255,12 +11337,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-std",
+ "sp-weights",
 ]
 
 [[package]]
 name = "sp-runtime-interface"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -11278,7 +11361,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -11290,7 +11373,7 @@ dependencies = [
 [[package]]
 name = "sp-sandbox"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -11304,7 +11387,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "serde",
  "serde_json",
@@ -11313,7 +11396,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11327,7 +11410,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11338,7 +11421,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "hash-db",
  "log",
@@ -11360,12 +11443,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 
 [[package]]
 name = "sp-storage"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -11378,7 +11461,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "log",
  "sp-core",
@@ -11391,7 +11474,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "async-trait",
  "futures-timer",
@@ -11407,7 +11490,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -11419,7 +11502,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -11428,7 +11511,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "async-trait",
  "log",
@@ -11444,7 +11527,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "ahash",
  "hash-db",
@@ -11467,7 +11550,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -11484,7 +11567,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -11495,7 +11578,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "impl-trait-for-tuples",
  "log",
@@ -11505,12 +11588,38 @@ dependencies = [
  "wasmtime",
 ]
 
+[[package]]
+name = "sp-weights"
+version = "4.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
+dependencies = [
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "smallvec",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-debug-derive",
+ "sp-std",
+]
+
 [[package]]
 name = "spin"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
+[[package]]
+name = "spki"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
 [[package]]
 name = "ss58-registry"
 version = "1.29.0"
@@ -11683,7 +11792,22 @@ dependencies = [
  "cfg_aliases",
  "libc",
  "parking_lot 0.11.2",
- "static_init_macro",
+ "static_init_macro 0.5.0",
+]
+
+[[package]]
+name = "static_init"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6"
+dependencies = [
+ "bitflags",
+ "cfg_aliases",
+ "libc",
+ "parking_lot 0.11.2",
+ "parking_lot_core 0.8.5",
+ "static_init_macro 1.0.2",
+ "winapi",
 ]
 
 [[package]]
@@ -11699,6 +11823,19 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "static_init_macro"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf"
+dependencies = [
+ "cfg_aliases",
+ "memchr",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "statrs"
 version = "0.15.0"
@@ -11756,7 +11893,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "platforms",
 ]
@@ -11764,7 +11901,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures",
@@ -11785,7 +11922,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "futures-util",
  "hyper",
@@ -11798,7 +11935,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-trie-migration-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "jsonrpsee",
  "log",
@@ -11819,11 +11956,11 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
+ "array-bytes",
  "async-trait",
  "futures",
- "hex",
  "parity-scale-codec",
  "sc-client-api",
  "sc-client-db",
@@ -11845,7 +11982,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "futures",
  "substrate-test-utils-derive",
@@ -11855,7 +11992,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -11866,7 +12003,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
  "ansi_term",
  "build-helper",
@@ -11888,9 +12025,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.99"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
+checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -11974,7 +12111,7 @@ checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16"
 [[package]]
 name = "test-runtime-constants"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -11985,33 +12122,24 @@ dependencies = [
 
 [[package]]
 name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
+checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
 
 [[package]]
 name = "thiserror"
-version = "1.0.34"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1b05ca9d106ba7d2e31a9dab4a64e7be2cce415321966ea3132c49a656e252"
+checksum = "c53f98874615aea268107765aa1ed8f6116782501d18e53d08b471733bea6c85"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.34"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487"
+checksum = "f8b463991b4eab2d801e724172285ec4195c650e8ec79b149e6c2a8e6dd3f783"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -12123,9 +12251,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.21.0"
+version = "1.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89797afd69d206ccd11fb0ea560a44bbb87731d020670e79416d442919257d42"
+checksum = "0020c875007ad96677dcc890298f4b942882c5d4eb7cc8f439fc3bf813dc9c95"
 dependencies = [
  "autocfg",
  "bytes",
@@ -12264,7 +12392,7 @@ dependencies = [
 [[package]]
 name = "tracing-gum"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-primitives",
@@ -12275,7 +12403,7 @@ dependencies = [
 [[package]]
 name = "tracing-gum-proc-macro"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "expander 0.0.6",
  "proc-macro-crate",
@@ -12402,9 +12530,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18"
+source = "git+https://github.com/paritytech/substrate?branch=master#1f720c11b90d45bba0c4ddad60d3b9a27ca85441"
 dependencies = [
- "clap 3.2.20",
+ "clap",
  "frame-try-runtime",
  "jsonrpsee",
  "log",
@@ -12715,9 +12843,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-instrument"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bca81f5279342b38b17d9acbf007a46ddeb73144e2bd5f0a21bfa9fc5d4ab3e"
+checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd"
 dependencies = [
  "parity-wasm 0.45.0",
 ]
@@ -12772,18 +12900,18 @@ dependencies = [
 
 [[package]]
 name = "wasmparser"
-version = "0.88.0"
+version = "0.89.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb8cf7dd82407fe68161bedcd57fde15596f32ebf6e9b3bdbf3ae1da20e38e5e"
+checksum = "ab5d3e08b13876f96dd55608d03cd4883a0545884932d5adf11925876c96daef"
 dependencies = [
  "indexmap",
 ]
 
 [[package]]
 name = "wasmtime"
-version = "0.40.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a020a3f6587fa7a7d98a021156177735ebb07212a6239a85ab5f14b2f728508f"
+checksum = "8a10dc9784d8c3a33c970e3939180424955f08af2e7f20368ec02685a0e8f065"
 dependencies = [
  "anyhow",
  "bincode",
@@ -12809,18 +12937,18 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-asm-macros"
-version = "0.40.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed4ada1fdd4d9a2aa37be652abcc31ae3188ad0efcefb4571ef4f785be2d777"
+checksum = "ee4dbdc6daf68528cad1275ac91e3f51848ce9824385facc94c759f529decdf8"
 dependencies = [
  "cfg-if 1.0.0",
 ]
 
 [[package]]
 name = "wasmtime-cache"
-version = "0.40.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96a03a5732ef39b83943d9d72de8ac2d58623d3bfaaea4d9a92aea5fcd9acf5"
+checksum = "9f507f3fa1ee1b2f9a83644e2514242b1dfe580782c0eb042f1ef70255bc4ffe"
 dependencies = [
  "anyhow",
  "base64",
@@ -12838,9 +12966,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-cranelift"
-version = "0.40.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc59c28fe895112db09e262fb9c483f9e7b82c78a82a6ded69567ccc0e9795b"
+checksum = "8f03cf79d982fc68e94ba0bea6a300a3b94621c4eb9705eece0a4f06b235a3b5"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -12859,9 +12987,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-environ"
-version = "0.40.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11086e573d2635a45ac0d44697a8e4586e058cf1b190f76bea466ca2ec36c30a"
+checksum = "5c587c62e91c5499df62012b87b88890d0eb470b2ffecc5964e9da967b70c77c"
 dependencies = [
  "anyhow",
  "cranelift-entity",
@@ -12878,9 +13006,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-jit"
-version = "0.40.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5444a78b74144718633f8642eccd7c4858f4c6f0c98ae6a3668998adf177ba2"
+checksum = "047839b5dabeae5424a078c19b8cc897e5943a7fadc69e3d888b9c9a897666b3"
 dependencies = [
  "addr2line",
  "anyhow",
@@ -12903,9 +13031,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-jit-debug"
-version = "0.40.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2bf6a667d2a29b2b0ed42bcf7564f00c595d92c24acb4d241c7c4d950b1910c"
+checksum = "b299569abf6f99b7b8e020afaf84a700e8636c6a42e242069267322cd5818235"
 dependencies = [
  "object 0.29.0",
  "once_cell",
@@ -12914,9 +13042,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-runtime"
-version = "0.40.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee064ce7b563cc201cdf3bb1cc4b233f386d8c57a96e55f4c4afe6103f4bd6a1"
+checksum = "ae79e0515160bd5abee5df50a16c4eb8db9f71b530fc988ae1d9ce34dcb8dd01"
 dependencies = [
  "anyhow",
  "cc",
@@ -12939,9 +13067,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-types"
-version = "0.40.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01e104bd9e625181d53ead85910bbc0863aa5f0c6ef96836fe9a5cc65da11b69"
+checksum = "790cf43ee8e2d5dad1780af30f00d7a972b74725fb1e4f90c28d62733819b185"
 dependencies = [
  "cranelift-entity",
  "serde",
@@ -12990,7 +13118,7 @@ dependencies = [
 [[package]]
 name = "westend-runtime"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -13079,7 +13207,7 @@ dependencies = [
 [[package]]
 name = "westend-runtime-constants"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -13365,7 +13493,7 @@ dependencies = [
 [[package]]
 name = "xcm"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "derivative",
  "impl-trait-for-tuples",
@@ -13379,7 +13507,7 @@ dependencies = [
 [[package]]
 name = "xcm-builder"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -13399,7 +13527,7 @@ dependencies = [
 [[package]]
 name = "xcm-executor"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -13417,7 +13545,7 @@ dependencies = [
 [[package]]
 name = "xcm-procedural"
 version = "0.9.29"
-source = "git+https://github.com/paritytech/polkadot?branch=master#53253de77f1649ecbb650df2ec3e29d0d1110a2d"
+source = "git+https://github.com/paritytech/polkadot?branch=master#50c514d448bb513b162a483b6ede473e01954131"
 dependencies = [
  "Inflector",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index d4497a7767e..487fc124da8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,7 +24,7 @@ members = [
 	"primitives/parachain-inherent",
 	"primitives/timestamp",
 	"primitives/utility",
-	"polkadot-parachain/",
+	"polkadot-parachain",
 	"parachains/common",
 	"parachains/pallets/parachain-info",
 	"parachains/pallets/ping",
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 1f74ca3311f..4f20e564ddb 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 
 [dependencies]
-clap = { version = "3.2.20", features = ["derive", "deprecated"] }
+clap = { version = "3.2.22", features = ["derive", "deprecated"] }
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 url = "2.3.1"
 
diff --git a/client/consensus/aura/src/import_queue.rs b/client/consensus/aura/src/import_queue.rs
index 31ed5779850..80b35a2bab9 100644
--- a/client/consensus/aura/src/import_queue.rs
+++ b/client/consensus/aura/src/import_queue.rs
@@ -25,7 +25,7 @@ use sc_telemetry::TelemetryHandle;
 use sp_api::{ApiExt, ProvideRuntimeApi};
 use sp_block_builder::BlockBuilder as BlockBuilderApi;
 use sp_blockchain::HeaderBackend;
-use sp_consensus::{CanAuthorWith, Error as ConsensusError};
+use sp_consensus::Error as ConsensusError;
 use sp_consensus_aura::AuraApi;
 use sp_core::crypto::Pair;
 use sp_inherents::CreateInherentDataProviders;
@@ -34,7 +34,7 @@ use std::{fmt::Debug, hash::Hash, sync::Arc};
 use substrate_prometheus_endpoint::Registry;
 
 /// Parameters of [`import_queue`].
-pub struct ImportQueueParams<'a, I, C, CIDP, S, CAW> {
+pub struct ImportQueueParams<'a, I, C, CIDP, S> {
 	/// The block import to use.
 	pub block_import: I,
 	/// The client to interact with the chain.
@@ -45,23 +45,20 @@ pub struct ImportQueueParams<'a, I, C, CIDP, S, CAW> {
 	pub spawner: &'a S,
 	/// The prometheus registry.
 	pub registry: Option<&'a Registry>,
-	/// Can we author with the current node?
-	pub can_author_with: CAW,
 	/// The telemetry handle.
 	pub telemetry: Option<TelemetryHandle>,
 }
 
 /// Start an import queue for the Aura consensus algorithm.
-pub fn import_queue<'a, P, Block, I, C, S, CAW, CIDP>(
+pub fn import_queue<'a, P, Block, I, C, S, CIDP>(
 	ImportQueueParams {
 		block_import,
 		client,
 		create_inherent_data_providers,
 		spawner,
 		registry,
-		can_author_with,
 		telemetry,
-	}: ImportQueueParams<'a, I, C, CIDP, S, CAW>,
+	}: ImportQueueParams<'a, I, C, CIDP, S>,
 ) -> Result<DefaultImportQueue<Block, C>, sp_consensus::Error>
 where
 	Block: BlockT,
@@ -82,48 +79,41 @@ where
 	P::Public: Clone + Eq + Send + Sync + Hash + Debug + Codec,
 	P::Signature: Codec,
 	S: sp_core::traits::SpawnEssentialNamed,
-	CAW: CanAuthorWith<Block> + Send + Sync + 'static,
 	CIDP: CreateInherentDataProviders<Block, ()> + Sync + Send + 'static,
 	CIDP::InherentDataProviders: InherentDataProviderExt + Send + Sync,
 {
-	sc_consensus_aura::import_queue::<P, _, _, _, _, _, _>(sc_consensus_aura::ImportQueueParams {
+	sc_consensus_aura::import_queue::<P, _, _, _, _, _>(sc_consensus_aura::ImportQueueParams {
 		block_import: cumulus_client_consensus_common::ParachainBlockImport::new(block_import),
 		justification_import: None,
 		client,
 		create_inherent_data_providers,
 		spawner,
 		registry,
-		can_author_with,
 		check_for_equivocation: sc_consensus_aura::CheckForEquivocation::No,
 		telemetry,
 	})
 }
 
 /// Parameters of [`build_verifier`].
-pub struct BuildVerifierParams<C, CIDP, CAW> {
+pub struct BuildVerifierParams<C, CIDP> {
 	/// The client to interact with the chain.
 	pub client: Arc<C>,
 	/// The inherent data providers, to create the inherent data.
 	pub create_inherent_data_providers: CIDP,
-	/// Can we author with the current node?
-	pub can_author_with: CAW,
 	/// The telemetry handle.
 	pub telemetry: Option<TelemetryHandle>,
 }
 
 /// Build the [`AuraVerifier`].
-pub fn build_verifier<P, C, CIDP, CAW>(
-	BuildVerifierParams {
-		client,
-		create_inherent_data_providers,
-		can_author_with,
-		telemetry,
-	}: BuildVerifierParams<C, CIDP, CAW>,
-) -> AuraVerifier<C, P, CAW, CIDP> {
+pub fn build_verifier<P, C, CIDP>(
+	BuildVerifierParams { client, create_inherent_data_providers, telemetry }: BuildVerifierParams<
+		C,
+		CIDP,
+	>,
+) -> AuraVerifier<C, P, CIDP> {
 	sc_consensus_aura::build_verifier(sc_consensus_aura::BuildVerifierParams {
 		client,
 		create_inherent_data_providers,
-		can_author_with,
 		telemetry,
 		check_for_equivocation: sc_consensus_aura::CheckForEquivocation::No,
 	})
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 13dc0947b38..fe285470033 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -33,7 +33,7 @@ cumulus-relay-chain-interface = { path = "../relay-chain-interface" }
 
 [dev-dependencies]
 portpicker = "0.1.1"
-tokio = { version = "1.21.0", features = ["macros"] }
+tokio = { version = "1.21.1", features = ["macros"] }
 url = "2.3.1"
 
 # Substrate
diff --git a/client/pov-recovery/Cargo.toml b/client/pov-recovery/Cargo.toml
index 89c5f4e2a2d..fd70e341f20 100644
--- a/client/pov-recovery/Cargo.toml
+++ b/client/pov-recovery/Cargo.toml
@@ -31,7 +31,7 @@ cumulus-primitives-core = { path = "../../primitives/core" }
 cumulus-relay-chain-interface = {path = "../relay-chain-interface"}
 
 [dev-dependencies]
-tokio = { version = "1.21.0", features = ["macros"] }
+tokio = { version = "1.21.1", features = ["macros"] }
 
 # Cumulus
 cumulus-test-service = { path = "../../test/service" }
diff --git a/client/relay-chain-inprocess-interface/Cargo.toml b/client/relay-chain-inprocess-interface/Cargo.toml
index c8d5b93a2d0..05d237ad9c3 100644
--- a/client/relay-chain-inprocess-interface/Cargo.toml
+++ b/client/relay-chain-inprocess-interface/Cargo.toml
@@ -42,6 +42,3 @@ sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master
 # Polkadot
 polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
 polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-
-# Cumulus
-cumulus-test-service = { path = "../../test/service" }
diff --git a/client/relay-chain-interface/Cargo.toml b/client/relay-chain-interface/Cargo.toml
index 288d9d52861..c84a4265d0c 100644
--- a/client/relay-chain-interface/Cargo.toml
+++ b/client/relay-chain-interface/Cargo.toml
@@ -21,6 +21,6 @@ futures = "0.3.24"
 parking_lot = "0.12.1"
 derive_more = "0.99.2"
 async-trait = "0.1.57"
-thiserror = "1.0.34"
+thiserror = "1.0.35"
 jsonrpsee-core = "0.15.1"
-parity-scale-codec = "3.1.5"
+parity-scale-codec = "3.2.1"
diff --git a/client/relay-chain-rpc-interface/Cargo.toml b/client/relay-chain-rpc-interface/Cargo.toml
index e1c3b2bebf6..188f709baeb 100644
--- a/client/relay-chain-rpc-interface/Cargo.toml
+++ b/client/relay-chain-rpc-interface/Cargo.toml
@@ -18,11 +18,11 @@ sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "
 sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-storage = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-tokio = { version = "1.21.0", features = ["sync"] }
+tokio = { version = "1.21.1", features = ["sync"] }
 
 futures = "0.3.24"
 futures-timer = "3.0.2"
-parity-scale-codec = "3.1.5"
+parity-scale-codec = "3.2.1"
 parking_lot = "0.12.1"
 jsonrpsee = { version = "0.15.1", features = ["ws-client"] }
 tracing = "0.1.36"
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index 5ca73a530a3..269112b1622 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -27,7 +27,7 @@ use sc_client_api::{
 	Backend as BackendT, BlockBackend, BlockchainEvents, Finalizer, UsageProvider,
 };
 use sc_consensus::{
-	import_queue::{ImportQueue, IncomingBlock, Link, Origin},
+	import_queue::{ImportQueue, IncomingBlock, Link, RuntimeOrigin},
 	BlockImport,
 };
 use sc_service::{Configuration, TaskManager};
@@ -125,9 +125,8 @@ where
 	task_manager
 		.spawn_essential_handle()
 		.spawn("cumulus-pov-recovery", None, pov_recovery.run());
-
 	cumulus_client_collator::start_collator(cumulus_client_collator::StartCollatorParams {
-		runtime_api: client.clone(),
+		runtime_api: client,
 		block_status,
 		announce_block,
 		overseer_handle,
@@ -261,7 +260,7 @@ impl<Block: BlockT> ImportQueue<Block> for SharedImportQueue<Block> {
 
 	fn import_justifications(
 		&mut self,
-		who: Origin,
+		who: RuntimeOrigin,
 		hash: Block::Hash,
 		number: NumberFor<Block>,
 		justifications: Justifications,
diff --git a/pallets/aura-ext/Cargo.toml b/pallets/aura-ext/Cargo.toml
index 593ad831387..22874e3edb2 100644
--- a/pallets/aura-ext/Cargo.toml
+++ b/pallets/aura-ext/Cargo.toml
@@ -7,7 +7,7 @@ description = "AURA consensus extension pallet for parachains"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.144", optional = true, features = ["derive"] }
 
 # Substrate
diff --git a/pallets/collator-selection/Cargo.toml b/pallets/collator-selection/Cargo.toml
index 4ed02a07c51..81f1d0f97cf 100644
--- a/pallets/collator-selection/Cargo.toml
+++ b/pallets/collator-selection/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 log = { version = "0.4.17", default-features = false }
 codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.0.0" }
 rand = { version = "0.8.5", features = ["std_rng"], default-features = false }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.144", default-features = false }
 
 sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/pallets/collator-selection/src/lib.rs b/pallets/collator-selection/src/lib.rs
index e2e8e95f9a0..16440344846 100644
--- a/pallets/collator-selection/src/lib.rs
+++ b/pallets/collator-selection/src/lib.rs
@@ -77,7 +77,7 @@ pub mod pallet {
 	pub use crate::weights::WeightInfo;
 	use core::ops::Div;
 	use frame_support::{
-		dispatch::DispatchResultWithPostInfo,
+		dispatch::{DispatchClass, DispatchResultWithPostInfo},
 		inherent::Vec,
 		pallet_prelude::*,
 		sp_runtime::{
@@ -88,7 +88,6 @@ pub mod pallet {
 			Currency, EnsureOrigin, ExistenceRequirement::KeepAlive, ReservableCurrency,
 			ValidatorRegistration,
 		},
-		weights::DispatchClass,
 		BoundedVec, PalletId,
 	};
 	use frame_system::{pallet_prelude::*, Config as SystemConfig};
@@ -118,7 +117,7 @@ pub mod pallet {
 		type Currency: ReservableCurrency<Self::AccountId>;
 
 		/// Origin that can dictate updating parameters of this pallet.
-		type UpdateOrigin: EnsureOrigin<Self::Origin>;
+		type UpdateOrigin: EnsureOrigin<Self::RuntimeOrigin>;
 
 		/// Account Identifier from which the internal Pot is generated.
 		type PotId: Get<PalletId>;
diff --git a/pallets/collator-selection/src/mock.rs b/pallets/collator-selection/src/mock.rs
index deac932ac21..4b3cc497731 100644
--- a/pallets/collator-selection/src/mock.rs
+++ b/pallets/collator-selection/src/mock.rs
@@ -59,7 +59,7 @@ impl system::Config for Test {
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
 	type BlockNumber = u64;
diff --git a/pallets/collator-selection/src/tests.rs b/pallets/collator-selection/src/tests.rs
index 730bfd489c6..459b107ecc5 100644
--- a/pallets/collator-selection/src/tests.rs
+++ b/pallets/collator-selection/src/tests.rs
@@ -38,14 +38,14 @@ fn it_should_set_invulnerables() {
 	new_test_ext().execute_with(|| {
 		let new_set = vec![1, 2, 3, 4];
 		assert_ok!(CollatorSelection::set_invulnerables(
-			Origin::signed(RootAccount::get()),
+			RuntimeOrigin::signed(RootAccount::get()),
 			new_set.clone()
 		));
 		assert_eq!(CollatorSelection::invulnerables(), new_set);
 
 		// cannot set with non-root.
 		assert_noop!(
-			CollatorSelection::set_invulnerables(Origin::signed(1), new_set.clone()),
+			CollatorSelection::set_invulnerables(RuntimeOrigin::signed(1), new_set.clone()),
 			BadOrigin
 		);
 
@@ -53,7 +53,7 @@ fn it_should_set_invulnerables() {
 		let invulnerables = vec![7];
 		assert_noop!(
 			CollatorSelection::set_invulnerables(
-				Origin::signed(RootAccount::get()),
+				RuntimeOrigin::signed(RootAccount::get()),
 				invulnerables.clone()
 			),
 			Error::<Test>::ValidatorNotRegistered
@@ -69,13 +69,16 @@ fn set_desired_candidates_works() {
 
 		// can set
 		assert_ok!(CollatorSelection::set_desired_candidates(
-			Origin::signed(RootAccount::get()),
+			RuntimeOrigin::signed(RootAccount::get()),
 			7
 		));
 		assert_eq!(CollatorSelection::desired_candidates(), 7);
 
 		// rejects bad origin
-		assert_noop!(CollatorSelection::set_desired_candidates(Origin::signed(1), 8), BadOrigin);
+		assert_noop!(
+			CollatorSelection::set_desired_candidates(RuntimeOrigin::signed(1), 8),
+			BadOrigin
+		);
 	});
 }
 
@@ -86,11 +89,14 @@ fn set_candidacy_bond() {
 		assert_eq!(CollatorSelection::candidacy_bond(), 10);
 
 		// can set
-		assert_ok!(CollatorSelection::set_candidacy_bond(Origin::signed(RootAccount::get()), 7));
+		assert_ok!(CollatorSelection::set_candidacy_bond(
+			RuntimeOrigin::signed(RootAccount::get()),
+			7
+		));
 		assert_eq!(CollatorSelection::candidacy_bond(), 7);
 
 		// rejects bad origin.
-		assert_noop!(CollatorSelection::set_candidacy_bond(Origin::signed(1), 8), BadOrigin);
+		assert_noop!(CollatorSelection::set_candidacy_bond(RuntimeOrigin::signed(1), 8), BadOrigin);
 	});
 }
 
@@ -102,17 +108,17 @@ fn cannot_register_candidate_if_too_many() {
 
 		// can't accept anyone anymore.
 		assert_noop!(
-			CollatorSelection::register_as_candidate(Origin::signed(3)),
+			CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)),
 			Error::<Test>::TooManyCandidates,
 		);
 
 		// reset desired candidates:
 		<crate::DesiredCandidates<Test>>::put(1);
-		assert_ok!(CollatorSelection::register_as_candidate(Origin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
 
 		// but no more
 		assert_noop!(
-			CollatorSelection::register_as_candidate(Origin::signed(5)),
+			CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)),
 			Error::<Test>::TooManyCandidates,
 		);
 	})
@@ -123,11 +129,11 @@ fn cannot_unregister_candidate_if_too_few() {
 	new_test_ext().execute_with(|| {
 		// reset desired candidates:
 		<crate::DesiredCandidates<Test>>::put(1);
-		assert_ok!(CollatorSelection::register_as_candidate(Origin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
 
 		// can not remove too few
 		assert_noop!(
-			CollatorSelection::leave_intent(Origin::signed(4)),
+			CollatorSelection::leave_intent(RuntimeOrigin::signed(4)),
 			Error::<Test>::TooFewCandidates,
 		);
 	})
@@ -140,7 +146,7 @@ fn cannot_register_as_candidate_if_invulnerable() {
 
 		// can't 1 because it is invulnerable.
 		assert_noop!(
-			CollatorSelection::register_as_candidate(Origin::signed(1)),
+			CollatorSelection::register_as_candidate(RuntimeOrigin::signed(1)),
 			Error::<Test>::AlreadyInvulnerable,
 		);
 	})
@@ -151,7 +157,7 @@ fn cannot_register_as_candidate_if_keys_not_registered() {
 	new_test_ext().execute_with(|| {
 		// can't 7 because keys not registered.
 		assert_noop!(
-			CollatorSelection::register_as_candidate(Origin::signed(7)),
+			CollatorSelection::register_as_candidate(RuntimeOrigin::signed(7)),
 			Error::<Test>::ValidatorNotRegistered
 		);
 	})
@@ -161,7 +167,7 @@ fn cannot_register_as_candidate_if_keys_not_registered() {
 fn cannot_register_dupe_candidate() {
 	new_test_ext().execute_with(|| {
 		// can add 3 as candidate
-		assert_ok!(CollatorSelection::register_as_candidate(Origin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
 		let addition = CandidateInfo { who: 3, deposit: 10 };
 		assert_eq!(CollatorSelection::candidates(), vec![addition]);
 		assert_eq!(CollatorSelection::last_authored_block(3), 10);
@@ -169,7 +175,7 @@ fn cannot_register_dupe_candidate() {
 
 		// but no more
 		assert_noop!(
-			CollatorSelection::register_as_candidate(Origin::signed(3)),
+			CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)),
 			Error::<Test>::AlreadyCandidate,
 		);
 	})
@@ -182,11 +188,11 @@ fn cannot_register_as_candidate_if_poor() {
 		assert_eq!(Balances::free_balance(&33), 0);
 
 		// works
-		assert_ok!(CollatorSelection::register_as_candidate(Origin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
 
 		// poor
 		assert_noop!(
-			CollatorSelection::register_as_candidate(Origin::signed(33)),
+			CollatorSelection::register_as_candidate(RuntimeOrigin::signed(33)),
 			BalancesError::<Test>::InsufficientBalance,
 		);
 	});
@@ -205,8 +211,8 @@ fn register_as_candidate_works() {
 		assert_eq!(Balances::free_balance(&3), 100);
 		assert_eq!(Balances::free_balance(&4), 100);
 
-		assert_ok!(CollatorSelection::register_as_candidate(Origin::signed(3)));
-		assert_ok!(CollatorSelection::register_as_candidate(Origin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
 
 		assert_eq!(Balances::free_balance(&3), 90);
 		assert_eq!(Balances::free_balance(&4), 90);
@@ -219,21 +225,21 @@ fn register_as_candidate_works() {
 fn leave_intent() {
 	new_test_ext().execute_with(|| {
 		// register a candidate.
-		assert_ok!(CollatorSelection::register_as_candidate(Origin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
 		assert_eq!(Balances::free_balance(3), 90);
 
 		// register too so can leave above min candidates
-		assert_ok!(CollatorSelection::register_as_candidate(Origin::signed(5)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
 		assert_eq!(Balances::free_balance(5), 90);
 
 		// cannot leave if not candidate.
 		assert_noop!(
-			CollatorSelection::leave_intent(Origin::signed(4)),
+			CollatorSelection::leave_intent(RuntimeOrigin::signed(4)),
 			Error::<Test>::NotCandidate
 		);
 
 		// bond is returned
-		assert_ok!(CollatorSelection::leave_intent(Origin::signed(3)));
+		assert_ok!(CollatorSelection::leave_intent(RuntimeOrigin::signed(3)));
 		assert_eq!(Balances::free_balance(3), 100);
 		assert_eq!(CollatorSelection::last_authored_block(3), 0);
 	});
@@ -247,7 +253,7 @@ fn authorship_event_handler() {
 
 		// 4 is the default author.
 		assert_eq!(Balances::free_balance(4), 100);
-		assert_ok!(CollatorSelection::register_as_candidate(Origin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
 		// triggers `note_author`
 		Authorship::on_initialize(1);
 
@@ -272,7 +278,7 @@ fn fees_edgecases() {
 		Balances::make_free_balance_be(&CollatorSelection::account_id(), 5);
 		// 4 is the default author.
 		assert_eq!(Balances::free_balance(4), 100);
-		assert_ok!(CollatorSelection::register_as_candidate(Origin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
 		// triggers `note_author`
 		Authorship::on_initialize(1);
 
@@ -301,7 +307,7 @@ fn session_management_works() {
 		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
 
 		// add a new collator
-		assert_ok!(CollatorSelection::register_as_candidate(Origin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
 
 		// session won't see this.
 		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
@@ -328,8 +334,8 @@ fn session_management_works() {
 fn kick_mechanism() {
 	new_test_ext().execute_with(|| {
 		// add a new collator
-		assert_ok!(CollatorSelection::register_as_candidate(Origin::signed(3)));
-		assert_ok!(CollatorSelection::register_as_candidate(Origin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
 		initialize_to_block(10);
 		assert_eq!(CollatorSelection::candidates().len(), 2);
 		initialize_to_block(20);
@@ -353,8 +359,8 @@ fn kick_mechanism() {
 fn should_not_kick_mechanism_too_few() {
 	new_test_ext().execute_with(|| {
 		// add a new collator
-		assert_ok!(CollatorSelection::register_as_candidate(Origin::signed(3)));
-		assert_ok!(CollatorSelection::register_as_candidate(Origin::signed(5)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
 		initialize_to_block(10);
 		assert_eq!(CollatorSelection::candidates().len(), 2);
 		initialize_to_block(20);
diff --git a/pallets/dmp-queue/Cargo.toml b/pallets/dmp-queue/Cargo.toml
index 9c199f3d9f4..b4f1be08ba0 100644
--- a/pallets/dmp-queue/Cargo.toml
+++ b/pallets/dmp-queue/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ], default-features = false }
 log = { version = "0.4.17", default-features = false }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 
 # Substrate
 frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
diff --git a/pallets/dmp-queue/src/lib.rs b/pallets/dmp-queue/src/lib.rs
index bf1141bb58f..cfcae5f3ad8 100644
--- a/pallets/dmp-queue/src/lib.rs
+++ b/pallets/dmp-queue/src/lib.rs
@@ -24,7 +24,8 @@
 use codec::{Decode, DecodeLimit, Encode};
 use cumulus_primitives_core::{relay_chain::BlockNumber as RelayBlockNumber, DmpMessageHandler};
 use frame_support::{
-	dispatch::Weight, traits::EnsureOrigin, weights::constants::WEIGHT_PER_MILLIS,
+	traits::EnsureOrigin,
+	weights::{constants::WEIGHT_PER_MILLIS, Weight},
 };
 pub use pallet::*;
 use scale_info::TypeInfo;
@@ -89,7 +90,7 @@ pub mod pallet {
 		type XcmExecutor: ExecuteXcm<Self::RuntimeCall>;
 
 		/// Origin which is allowed to execute overweight messages.
-		type ExecuteOverweightOrigin: EnsureOrigin<Self::Origin>;
+		type ExecuteOverweightOrigin: EnsureOrigin<Self::RuntimeOrigin>;
 	}
 
 	/// The configuration.
@@ -386,7 +387,7 @@ mod tests {
 	type AccountId = u64;
 
 	impl frame_system::Config for Test {
-		type Origin = Origin;
+		type RuntimeOrigin = RuntimeOrigin;
 		type RuntimeCall = RuntimeCall;
 		type Index = u64;
 		type BlockNumber = u64;
@@ -743,15 +744,23 @@ mod tests {
 			assert_eq!(overweights(), vec![0]);
 
 			assert_noop!(
-				DmpQueue::service_overweight(Origin::signed(1), 0, Weight::from_ref_time(20000)),
+				DmpQueue::service_overweight(
+					RuntimeOrigin::signed(1),
+					0,
+					Weight::from_ref_time(20000)
+				),
 				BadOrigin
 			);
 			assert_noop!(
-				DmpQueue::service_overweight(Origin::root(), 1, Weight::from_ref_time(20000)),
+				DmpQueue::service_overweight(
+					RuntimeOrigin::root(),
+					1,
+					Weight::from_ref_time(20000)
+				),
 				Error::<Test>::Unknown
 			);
 			assert_noop!(
-				DmpQueue::service_overweight(Origin::root(), 0, Weight::from_ref_time(9999)),
+				DmpQueue::service_overweight(RuntimeOrigin::root(), 0, Weight::from_ref_time(9999)),
 				Error::<Test>::OverLimit
 			);
 			assert_eq!(take_trace(), vec![msg_limit_reached(10000)]);
@@ -760,17 +769,24 @@ mod tests {
 				super::Call::<Test>::service_overweight { index: 0, weight_limit: Weight::zero() }
 					.get_dispatch_info()
 					.weight;
-			use frame_support::weights::GetDispatchInfo;
-			let info =
-				DmpQueue::service_overweight(Origin::root(), 0, Weight::from_ref_time(20000))
-					.unwrap();
+			use frame_support::dispatch::GetDispatchInfo;
+			let info = DmpQueue::service_overweight(
+				RuntimeOrigin::root(),
+				0,
+				Weight::from_ref_time(20000),
+			)
+			.unwrap();
 			let actual_weight = info.actual_weight.unwrap();
 			assert_eq!(actual_weight, base_weight + Weight::from_ref_time(10000));
 			assert_eq!(take_trace(), vec![msg_complete(10000)]);
 			assert!(overweights().is_empty());
 
 			assert_noop!(
-				DmpQueue::service_overweight(Origin::root(), 0, Weight::from_ref_time(20000)),
+				DmpQueue::service_overweight(
+					RuntimeOrigin::root(),
+					0,
+					Weight::from_ref_time(20000)
+				),
 				Error::<Test>::Unknown
 			);
 		});
diff --git a/pallets/parachain-system/Cargo.toml b/pallets/parachain-system/Cargo.toml
index 15f4be3dabe..4fa139422ac 100644
--- a/pallets/parachain-system/Cargo.toml
+++ b/pallets/parachain-system/Cargo.toml
@@ -11,7 +11,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 environmental = { version = "1.1.2", default-features = false }
 impl-trait-for-tuples = "0.2.1"
 log = { version = "0.4.17", default-features = false }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.144", optional = true, features = ["derive"] }
 
 # Substrate
diff --git a/pallets/parachain-system/proc-macro/Cargo.toml b/pallets/parachain-system/proc-macro/Cargo.toml
index 3debfc3ef36..1e9937d0c89 100644
--- a/pallets/parachain-system/proc-macro/Cargo.toml
+++ b/pallets/parachain-system/proc-macro/Cargo.toml
@@ -9,7 +9,7 @@ description = "Proc macros provided by the parachain-system pallet"
 proc-macro = true
 
 [dependencies]
-syn = "1.0.99"
+syn = "1.0.100"
 proc-macro2 = "1.0.43"
 quote = "1.0.21"
 proc-macro-crate = "1.2.1"
diff --git a/pallets/parachain-system/src/lib.rs b/pallets/parachain-system/src/lib.rs
index b8e15d6e6a6..4bcae1ff597 100644
--- a/pallets/parachain-system/src/lib.rs
+++ b/pallets/parachain-system/src/lib.rs
@@ -36,12 +36,12 @@ use cumulus_primitives_core::{
 };
 use cumulus_primitives_parachain_inherent::{MessageQueueChain, ParachainInherentData};
 use frame_support::{
-	dispatch::{DispatchError, DispatchResult},
+	dispatch::{DispatchError, DispatchResult, Pays, PostDispatchInfo},
 	ensure,
 	inherent::{InherentData, InherentIdentifier, ProvideInherent},
 	storage,
 	traits::Get,
-	weights::{Pays, PostDispatchInfo, Weight},
+	weights::Weight,
 };
 use frame_system::{ensure_none, ensure_root};
 use polkadot_parachain::primitives::RelayChainBlockNumber;
diff --git a/pallets/parachain-system/src/tests.rs b/pallets/parachain-system/src/tests.rs
index 5bb3c965e6c..9b4b24a242d 100755
--- a/pallets/parachain-system/src/tests.rs
+++ b/pallets/parachain-system/src/tests.rs
@@ -73,7 +73,7 @@ parameter_types! {
 	pub const ReservedDmpWeight: Weight = Weight::zero();
 }
 impl frame_system::Config for Test {
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
 	type BlockNumber = u64;
diff --git a/pallets/parachain-system/src/validate_block/implementation.rs b/pallets/parachain-system/src/validate_block/implementation.rs
index f37622688de..8c03f012be2 100644
--- a/pallets/parachain-system/src/validate_block/implementation.rs
+++ b/pallets/parachain-system/src/validate_block/implementation.rs
@@ -118,6 +118,11 @@ where
 	let inherent_data = block
 		.extrinsics()
 		.iter()
+		// Inherents are at the front of the block and are unsigned.
+		//
+		// If `is_signed` is returning `None`, we keep it safe and assume that it is "signed".
+		// We are searching for unsigned transactions anyway.
+		.take_while(|e| !e.is_signed().unwrap_or(true))
 		.filter_map(|e| e.call().is_sub_type())
 		.find_map(|c| match c {
 			crate::Call::set_validation_data { data: validation_data } =>
diff --git a/pallets/parachain-system/src/validate_block/tests.rs b/pallets/parachain-system/src/validate_block/tests.rs
index 6453b9cd394..6087e6a29a3 100644
--- a/pallets/parachain-system/src/validate_block/tests.rs
+++ b/pallets/parachain-system/src/validate_block/tests.rs
@@ -251,3 +251,41 @@ fn check_inherent_fails_on_validate_block_as_expected() {
 		);
 	}
 }
+
+#[test]
+fn check_inherents_are_unsigned_and_before_all_other_extrinsics() {
+	sp_tracing::try_init_simple();
+
+	if env::var("RUN_TEST").is_ok() {
+		let (client, parent_head) = create_test_client();
+
+		let TestBlockData { block, validation_data } =
+			build_block_with_witness(&client, Vec::new(), parent_head.clone(), Default::default());
+
+		let (header, mut extrinsics, proof) = block.deconstruct();
+
+		extrinsics.insert(0, transfer(&client, Alice, Bob, 69));
+
+		call_validate_block(
+			parent_head,
+			ParachainBlockData::new(header, extrinsics, proof),
+			validation_data.relay_parent_storage_root,
+		)
+		.unwrap_err();
+	} else {
+		let output = Command::new(env::current_exe().unwrap())
+			.args(&[
+				"check_inherents_are_unsigned_and_before_all_other_extrinsics",
+				"--",
+				"--nocapture",
+			])
+			.env("RUN_TEST", "1")
+			.output()
+			.expect("Runs the test");
+		assert!(output.status.success());
+
+		assert!(String::from_utf8(output.stderr)
+			.unwrap()
+			.contains("Could not find `set_validation_data` inherent"));
+	}
+}
diff --git a/pallets/session-benchmarking/Cargo.toml b/pallets/session-benchmarking/Cargo.toml
index a9e87247148..e30b460161f 100644
--- a/pallets/session-benchmarking/Cargo.toml
+++ b/pallets/session-benchmarking/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-parity-scale-codec = { version = "3.1.5", default-features = false }
+parity-scale-codec = { version = "3.2.1", default-features = false }
 sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
 frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/pallets/solo-to-para/src/lib.rs b/pallets/solo-to-para/src/lib.rs
index bea78d25d4d..b1e7c99d6a9 100644
--- a/pallets/solo-to-para/src/lib.rs
+++ b/pallets/solo-to-para/src/lib.rs
@@ -18,7 +18,10 @@
 
 use codec::{Decode, Encode};
 use cumulus_pallet_parachain_system as parachain_system;
-use frame_support::{dispatch::DispatchResult, pallet_prelude::*, weights::DispatchInfo};
+use frame_support::{
+	dispatch::{DispatchInfo, DispatchResult},
+	pallet_prelude::*,
+};
 use frame_system::pallet_prelude::*;
 pub use pallet::*;
 use polkadot_primitives::v2::PersistedValidationData;
diff --git a/pallets/xcm/Cargo.toml b/pallets/xcm/Cargo.toml
index 16f57d81abf..4d1a38da171 100644
--- a/pallets/xcm/Cargo.toml
+++ b/pallets/xcm/Cargo.toml
@@ -6,7 +6,7 @@ version = "0.1.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.144", optional = true, features = ["derive"] }
 
 sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
@@ -30,5 +30,6 @@ std = [
 	"sp-runtime/std",
 	"frame-support/std",
 	"frame-system/std",
+	"xcm/std",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/xcmp-queue/Cargo.toml b/pallets/xcmp-queue/Cargo.toml
index 0d4f83757ac..8c7aef6a354 100644
--- a/pallets/xcmp-queue/Cargo.toml
+++ b/pallets/xcmp-queue/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ], default-features = false }
 log = { version = "0.4.17", default-features = false }
 rand_chacha = { version = "0.3.0", default-features = false }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 
 # Substrate
 frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
diff --git a/pallets/xcmp-queue/src/lib.rs b/pallets/xcmp-queue/src/lib.rs
index bd48fa7c993..22d1d4c1bb6 100644
--- a/pallets/xcmp-queue/src/lib.rs
+++ b/pallets/xcmp-queue/src/lib.rs
@@ -90,14 +90,14 @@ pub mod pallet {
 		type VersionWrapper: WrapVersion;
 
 		/// The origin that is allowed to execute overweight messages.
-		type ExecuteOverweightOrigin: EnsureOrigin<Self::Origin>;
+		type ExecuteOverweightOrigin: EnsureOrigin<Self::RuntimeOrigin>;
 
 		/// The origin that is allowed to resume or suspend the XCMP queue.
-		type ControllerOrigin: EnsureOrigin<Self::Origin>;
+		type ControllerOrigin: EnsureOrigin<Self::RuntimeOrigin>;
 
 		/// The conversion function used to attempt to convert an XCM `MultiLocation` origin to a
 		/// superuser origin.
-		type ControllerOriginConverter: ConvertOrigin<Self::Origin>;
+		type ControllerOriginConverter: ConvertOrigin<Self::RuntimeOrigin>;
 
 		/// The weight information of this pallet.
 		type WeightInfo: WeightInfo;
diff --git a/pallets/xcmp-queue/src/mock.rs b/pallets/xcmp-queue/src/mock.rs
index cc591c37fcd..c07ae0a29cb 100644
--- a/pallets/xcmp-queue/src/mock.rs
+++ b/pallets/xcmp-queue/src/mock.rs
@@ -62,7 +62,7 @@ impl frame_system::Config for Test {
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -160,12 +160,14 @@ pub type XcmRouter = (
 	XcmpQueue,
 );
 
-pub struct SystemParachainAsSuperuser<Origin>(PhantomData<Origin>);
-impl<Origin: OriginTrait> ConvertOrigin<Origin> for SystemParachainAsSuperuser<Origin> {
+pub struct SystemParachainAsSuperuser<RuntimeOrigin>(PhantomData<RuntimeOrigin>);
+impl<RuntimeOrigin: OriginTrait> ConvertOrigin<RuntimeOrigin>
+	for SystemParachainAsSuperuser<RuntimeOrigin>
+{
 	fn convert_origin(
 		origin: impl Into<MultiLocation>,
 		kind: OriginKind,
-	) -> Result<Origin, MultiLocation> {
+	) -> Result<RuntimeOrigin, MultiLocation> {
 		let origin = origin.into();
 		if kind == OriginKind::Superuser &&
 			matches!(
@@ -175,7 +177,7 @@ impl<Origin: OriginTrait> ConvertOrigin<Origin> for SystemParachainAsSuperuser<O
 					interior: X1(Parachain(id)),
 				} if ParaId::from(id).is_system(),
 			) {
-			Ok(Origin::root())
+			Ok(RuntimeOrigin::root())
 		} else {
 			Err(origin)
 		}
@@ -189,7 +191,7 @@ impl Config for Test {
 	type VersionWrapper = ();
 	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
 	type ControllerOrigin = EnsureRoot<AccountId>;
-	type ControllerOriginConverter = SystemParachainAsSuperuser<Origin>;
+	type ControllerOriginConverter = SystemParachainAsSuperuser<RuntimeOrigin>;
 	type WeightInfo = ();
 }
 
diff --git a/pallets/xcmp-queue/src/tests.rs b/pallets/xcmp-queue/src/tests.rs
index 9d5288ce439..1b6303ddaf1 100644
--- a/pallets/xcmp-queue/src/tests.rs
+++ b/pallets/xcmp-queue/src/tests.rs
@@ -16,7 +16,7 @@
 use super::*;
 use cumulus_primitives_core::XcmpMessageHandler;
 use frame_support::{assert_noop, assert_ok};
-use mock::{new_test_ext, Origin, RuntimeCall, Test, XcmpQueue};
+use mock::{new_test_ext, RuntimeCall, RuntimeOrigin, Test, XcmpQueue};
 use sp_runtime::traits::BadOrigin;
 
 #[test]
@@ -96,7 +96,7 @@ fn handle_invalid_data() {
 fn service_overweight_unknown() {
 	new_test_ext().execute_with(|| {
 		assert_noop!(
-			XcmpQueue::service_overweight(Origin::root(), 0, Weight::from_ref_time(1000)),
+			XcmpQueue::service_overweight(RuntimeOrigin::root(), 0, Weight::from_ref_time(1000)),
 			Error::<Test>::BadOverweightIndex,
 		);
 	});
@@ -109,7 +109,7 @@ fn service_overweight_bad_xcm_format() {
 		Overweight::<Test>::insert(0, (ParaId::from(1000), 0, bad_xcm));
 
 		assert_noop!(
-			XcmpQueue::service_overweight(Origin::root(), 0, Weight::from_ref_time(1000)),
+			XcmpQueue::service_overweight(RuntimeOrigin::root(), 0, Weight::from_ref_time(1000)),
 			Error::<Test>::BadXcm
 		);
 	});
@@ -148,8 +148,8 @@ fn update_suspend_threshold_works() {
 	new_test_ext().execute_with(|| {
 		let data: QueueConfigData = <QueueConfig<Test>>::get();
 		assert_eq!(data.suspend_threshold, 2);
-		assert_ok!(XcmpQueue::update_suspend_threshold(Origin::root(), 3));
-		assert_noop!(XcmpQueue::update_suspend_threshold(Origin::signed(2), 5), BadOrigin);
+		assert_ok!(XcmpQueue::update_suspend_threshold(RuntimeOrigin::root(), 3));
+		assert_noop!(XcmpQueue::update_suspend_threshold(RuntimeOrigin::signed(2), 5), BadOrigin);
 		let data: QueueConfigData = <QueueConfig<Test>>::get();
 
 		assert_eq!(data.suspend_threshold, 3);
@@ -161,8 +161,8 @@ fn update_drop_threshold_works() {
 	new_test_ext().execute_with(|| {
 		let data: QueueConfigData = <QueueConfig<Test>>::get();
 		assert_eq!(data.drop_threshold, 5);
-		assert_ok!(XcmpQueue::update_drop_threshold(Origin::root(), 6));
-		assert_noop!(XcmpQueue::update_drop_threshold(Origin::signed(2), 7), BadOrigin);
+		assert_ok!(XcmpQueue::update_drop_threshold(RuntimeOrigin::root(), 6));
+		assert_noop!(XcmpQueue::update_drop_threshold(RuntimeOrigin::signed(2), 7), BadOrigin);
 		let data: QueueConfigData = <QueueConfig<Test>>::get();
 
 		assert_eq!(data.drop_threshold, 6);
@@ -174,8 +174,8 @@ fn update_resume_threshold_works() {
 	new_test_ext().execute_with(|| {
 		let data: QueueConfigData = <QueueConfig<Test>>::get();
 		assert_eq!(data.resume_threshold, 1);
-		assert_ok!(XcmpQueue::update_resume_threshold(Origin::root(), 2));
-		assert_noop!(XcmpQueue::update_resume_threshold(Origin::signed(7), 3), BadOrigin);
+		assert_ok!(XcmpQueue::update_resume_threshold(RuntimeOrigin::root(), 2));
+		assert_noop!(XcmpQueue::update_resume_threshold(RuntimeOrigin::signed(7), 3), BadOrigin);
 		let data: QueueConfigData = <QueueConfig<Test>>::get();
 
 		assert_eq!(data.resume_threshold, 2);
@@ -188,12 +188,12 @@ fn update_threshold_weight_works() {
 		let data: QueueConfigData = <QueueConfig<Test>>::get();
 		assert_eq!(data.threshold_weight, Weight::from_ref_time(100_000));
 		assert_ok!(XcmpQueue::update_threshold_weight(
-			Origin::root(),
+			RuntimeOrigin::root(),
 			Weight::from_ref_time(10_000)
 		));
 		assert_noop!(
 			XcmpQueue::update_threshold_weight(
-				Origin::signed(5),
+				RuntimeOrigin::signed(5),
 				Weight::from_ref_time(10_000_000)
 			),
 			BadOrigin
@@ -210,11 +210,14 @@ fn update_weight_restrict_decay_works() {
 		let data: QueueConfigData = <QueueConfig<Test>>::get();
 		assert_eq!(data.weight_restrict_decay, Weight::from_ref_time(2));
 		assert_ok!(XcmpQueue::update_weight_restrict_decay(
-			Origin::root(),
+			RuntimeOrigin::root(),
 			Weight::from_ref_time(5)
 		));
 		assert_noop!(
-			XcmpQueue::update_weight_restrict_decay(Origin::signed(6), Weight::from_ref_time(4)),
+			XcmpQueue::update_weight_restrict_decay(
+				RuntimeOrigin::signed(6),
+				Weight::from_ref_time(4)
+			),
 			BadOrigin
 		);
 		let data: QueueConfigData = <QueueConfig<Test>>::get();
@@ -229,12 +232,12 @@ fn update_xcmp_max_individual_weight() {
 		let data: QueueConfigData = <QueueConfig<Test>>::get();
 		assert_eq!(data.xcmp_max_individual_weight, 20u64 * WEIGHT_PER_MILLIS);
 		assert_ok!(XcmpQueue::update_xcmp_max_individual_weight(
-			Origin::root(),
+			RuntimeOrigin::root(),
 			30u64 * WEIGHT_PER_MILLIS
 		));
 		assert_noop!(
 			XcmpQueue::update_xcmp_max_individual_weight(
-				Origin::signed(3),
+				RuntimeOrigin::signed(3),
 				10u64 * WEIGHT_PER_MILLIS
 			),
 			BadOrigin
diff --git a/parachain-template/node/Cargo.toml b/parachain-template/node/Cargo.toml
index 6f6a9fac71d..4bfda52d30e 100644
--- a/parachain-template/node/Cargo.toml
+++ b/parachain-template/node/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2021"
 build = "build.rs"
 
 [dependencies]
-clap = { version = "3.2.20", features = ["derive"] }
+clap = { version = "3.2.22", features = ["derive"] }
 derive_more = "0.99.2"
 log = "0.4.17"
 codec = { package = "parity-scale-codec", version = "3.0.0" }
diff --git a/parachain-template/node/src/command.rs b/parachain-template/node/src/command.rs
index d1eebd127d8..7f7bfd140af 100644
--- a/parachain-template/node/src/command.rs
+++ b/parachain-template/node/src/command.rs
@@ -217,6 +217,15 @@ pub fn run() -> Result<()> {
 					)?;
 					cmd.run(partials.client)
 				}),
+				#[cfg(not(feature = "runtime-benchmarks"))]
+				BenchmarkCmd::Storage(_) =>
+					return Err(sc_cli::Error::Input(
+						"Compile with --features=runtime-benchmarks \
+						to enable storage benchmarks."
+							.into(),
+					)
+					.into()),
+				#[cfg(feature = "runtime-benchmarks")]
 				BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| {
 					let partials = new_partial::<RuntimeApi, TemplateRuntimeExecutor, _>(
 						&config,
diff --git a/parachain-template/node/src/service.rs b/parachain-template/node/src/service.rs
index 817d3dcad6c..84e0fbff3e6 100644
--- a/parachain-template/node/src/service.rs
+++ b/parachain-template/node/src/service.rs
@@ -25,7 +25,6 @@ use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayC
 use cumulus_relay_chain_rpc_interface::{create_client_and_start_worker, RelayChainRpcInterface};
 
 // Substrate Imports
-use sc_client_api::ExecutorProvider;
 use sc_executor::NativeElseWasmExecutor;
 use sc_network::NetworkService;
 use sc_network_common::service::NetworkBlock;
@@ -424,7 +423,6 @@ pub fn parachain_build_import_queue(
 		_,
 		_,
 		_,
-		_,
 	>(cumulus_client_consensus_aura::ImportQueueParams {
 		block_import: client.clone(),
 		client: client.clone(),
@@ -440,7 +438,6 @@ pub fn parachain_build_import_queue(
 			Ok((slot, timestamp))
 		},
 		registry: config.prometheus_registry(),
-		can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
 		spawner: &task_manager.spawn_essential_handle(),
 		telemetry,
 	})
diff --git a/parachain-template/pallets/template/src/mock.rs b/parachain-template/pallets/template/src/mock.rs
index 5debcc4a1c3..4a7ebac0fa8 100644
--- a/parachain-template/pallets/template/src/mock.rs
+++ b/parachain-template/pallets/template/src/mock.rs
@@ -32,7 +32,7 @@ impl system::Config for Test {
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
 	type BlockNumber = u64;
diff --git a/parachain-template/pallets/template/src/tests.rs b/parachain-template/pallets/template/src/tests.rs
index 22056586017..527aec8ed00 100644
--- a/parachain-template/pallets/template/src/tests.rs
+++ b/parachain-template/pallets/template/src/tests.rs
@@ -5,7 +5,7 @@ use frame_support::{assert_noop, assert_ok};
 fn it_works_for_default_value() {
 	new_test_ext().execute_with(|| {
 		// Dispatch a signed extrinsic.
-		assert_ok!(TemplateModule::do_something(Origin::signed(1), 42));
+		assert_ok!(TemplateModule::do_something(RuntimeOrigin::signed(1), 42));
 		// Read pallet storage and assert an expected result.
 		assert_eq!(TemplateModule::something(), Some(42));
 	});
@@ -15,6 +15,9 @@ fn it_works_for_default_value() {
 fn correct_error_for_none_value() {
 	new_test_ext().execute_with(|| {
 		// Ensure the expected error is thrown when no value is present.
-		assert_noop!(TemplateModule::cause_error(Origin::signed(1)), Error::<Test>::NoneValue);
+		assert_noop!(
+			TemplateModule::cause_error(RuntimeOrigin::signed(1)),
+			Error::<Test>::NoneValue
+		);
 	});
 }
diff --git a/parachain-template/runtime/Cargo.toml b/parachain-template/runtime/Cargo.toml
index 145c09fcc34..1662313ab75 100644
--- a/parachain-template/runtime/Cargo.toml
+++ b/parachain-template/runtime/Cargo.toml
@@ -18,7 +18,7 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 hex-literal = { version = "0.3.4", optional = true }
 log = { version = "0.4.17", default-features = false }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.144", optional = true, features = ["derive"] }
 smallvec = "1.9.0"
 
@@ -131,7 +131,7 @@ runtime-benchmarks = [
 	"hex-literal",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
-	"frame-system-benchmarking",
+	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
diff --git a/parachain-template/runtime/src/lib.rs b/parachain-template/runtime/src/lib.rs
index aa5b6805c1d..fc0c354f7e4 100644
--- a/parachain-template/runtime/src/lib.rs
+++ b/parachain-template/runtime/src/lib.rs
@@ -26,11 +26,13 @@ use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime,
+	dispatch::DispatchClass,
+	parameter_types,
 	traits::Everything,
 	weights::{
-		constants::WEIGHT_PER_SECOND, ConstantMultiplier, DispatchClass, Weight,
-		WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial,
+		constants::WEIGHT_PER_SECOND, ConstantMultiplier, Weight, WeightToFeeCoefficient,
+		WeightToFeeCoefficients, WeightToFeePolynomial,
 	},
 	PalletId,
 };
@@ -275,7 +277,7 @@ impl frame_system::Config for Runtime {
 	/// The ubiquitous event type.
 	type RuntimeEvent = RuntimeEvent;
 	/// The ubiquitous origin type.
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
 	type BlockHashCount = BlockHashCount;
 	/// Runtime version.
diff --git a/parachain-template/runtime/src/xcm_config.rs b/parachain-template/runtime/src/xcm_config.rs
index fb2e59bb9a2..c06bfb9532f 100644
--- a/parachain-template/runtime/src/xcm_config.rs
+++ b/parachain-template/runtime/src/xcm_config.rs
@@ -1,6 +1,6 @@
 use super::{
-	AccountId, Balances, Origin, ParachainInfo, ParachainSystem, PolkadotXcm, Runtime, RuntimeCall,
-	RuntimeEvent, WeightToFee, XcmpQueue,
+	AccountId, Balances, ParachainInfo, ParachainSystem, PolkadotXcm, Runtime, RuntimeCall,
+	RuntimeEvent, RuntimeOrigin, WeightToFee, XcmpQueue,
 };
 use core::marker::PhantomData;
 use frame_support::{
@@ -23,7 +23,7 @@ use xcm_executor::{traits::ShouldExecute, XcmExecutor};
 parameter_types! {
 	pub const RelayLocation: MultiLocation = MultiLocation::parent();
 	pub const RelayNetwork: NetworkId = NetworkId::Any;
-	pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();
+	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
 	pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
 }
 
@@ -60,18 +60,18 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location
 	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for
 	// foreign chains who want to have a local sovereign account on this chain which they control.
-	SovereignSignedViaLocation<LocationToAccountId, Origin>,
+	SovereignSignedViaLocation<LocationToAccountId, RuntimeOrigin>,
 	// Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when
 	// recognized.
-	RelayChainAsNative<RelayChainOrigin, Origin>,
+	RelayChainAsNative<RelayChainOrigin, RuntimeOrigin>,
 	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when
 	// recognized.
-	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,
+	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, RuntimeOrigin>,
 	// Native signed account converter; this just converts an `AccountId32` origin into a normal
-	// `Origin::Signed` origin of the same 32-byte value.
-	SignedAccountId32AsNative<RelayNetwork, Origin>,
+	// `RuntimeOrigin::Signed` origin of the same 32-byte value.
+	SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,
 	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
-	XcmPassthrough<Origin>,
+	XcmPassthrough<RuntimeOrigin>,
 );
 
 parameter_types! {
@@ -183,7 +183,7 @@ impl xcm_executor::Config for XcmConfig {
 }
 
 /// No local origins on this chain are allowed to dispatch XCM sends/executions.
-pub type LocalOriginToLocation = SignedToAccountId32<Origin, AccountId, RelayNetwork>;
+pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
 
 /// The means for routing XCM messages which are not for local execution into the right message
 /// queues.
@@ -196,9 +196,9 @@ pub type XcmRouter = (
 
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type SendXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;
+	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	type XcmRouter = XcmRouter;
-	type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;
+	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	type XcmExecuteFilter = Nothing;
 	// ^ Disable dispatchable execute on the XCM pallet.
 	// Needs to be `Everything` for local testing.
@@ -207,7 +207,7 @@ impl pallet_xcm::Config for Runtime {
 	type XcmReserveTransferFilter = Nothing;
 	type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;
 	type LocationInverter = LocationInverter<Ancestry>;
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 
 	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
diff --git a/parachains/common/Cargo.toml b/parachains/common/Cargo.toml
index dd70f4436aa..46c5704d9b7 100644
--- a/parachains/common/Cargo.toml
+++ b/parachains/common/Cargo.toml
@@ -10,7 +10,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 
 # Substrate
 frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -63,5 +63,7 @@ std = [
 	"sp-std/std",
 	"pallet-collator-selection/std",
 	"cumulus-primitives-utility/std",
+	"xcm/std",
+	"xcm-executor/std",
 	"xcm-builder/std"
 ]
diff --git a/parachains/common/src/impls.rs b/parachains/common/src/impls.rs
index c58e32a67e2..80c3015b47a 100644
--- a/parachains/common/src/impls.rs
+++ b/parachains/common/src/impls.rs
@@ -153,7 +153,7 @@ mod tests {
 
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
-		type Origin = Origin;
+		type RuntimeOrigin = RuntimeOrigin;
 		type Index = u64;
 		type BlockNumber = u64;
 		type RuntimeCall = RuntimeCall;
diff --git a/parachains/pallets/parachain-info/Cargo.toml b/parachains/pallets/parachain-info/Cargo.toml
index 0fa54dcc721..7cccb7db5e9 100644
--- a/parachains/pallets/parachain-info/Cargo.toml
+++ b/parachains/pallets/parachain-info/Cargo.toml
@@ -6,7 +6,7 @@ version = "0.1.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.144", optional = true, features = ["derive"] }
 
 frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
diff --git a/parachains/pallets/ping/Cargo.toml b/parachains/pallets/ping/Cargo.toml
index 4e97fcb6b8b..60a8eed188e 100644
--- a/parachains/pallets/ping/Cargo.toml
+++ b/parachains/pallets/ping/Cargo.toml
@@ -6,7 +6,7 @@ version = "0.1.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.144", optional = true, features = ["derive"] }
 
 sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
@@ -30,4 +30,5 @@ std = [
 	"sp-runtime/std",
 	"frame-support/std",
 	"frame-system/std",
+	"xcm/std",
 ]
diff --git a/parachains/pallets/ping/src/lib.rs b/parachains/pallets/ping/src/lib.rs
index 5e20a94c078..1ef9938e5c7 100644
--- a/parachains/pallets/ping/src/lib.rs
+++ b/parachains/pallets/ping/src/lib.rs
@@ -49,8 +49,8 @@ pub mod pallet {
 		/// The overarching event type.
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 
-		type Origin: From<<Self as SystemConfig>::Origin>
-			+ Into<Result<CumulusOrigin, <Self as Config>::Origin>>;
+		type RuntimeOrigin: From<<Self as SystemConfig>::RuntimeOrigin>
+			+ Into<Result<CumulusOrigin, <Self as Config>::RuntimeOrigin>>;
 
 		/// The overarching call type; we assume sibling chains use the same type.
 		type RuntimeCall: From<Call<Self>> + Encode;
@@ -190,7 +190,7 @@ pub mod pallet {
 		#[pallet::weight(0)]
 		pub fn ping(origin: OriginFor<T>, seq: u32, payload: Vec<u8>) -> DispatchResult {
 			// Only accept pings from other chains.
-			let para = ensure_sibling_para(<T as Config>::Origin::from(origin))?;
+			let para = ensure_sibling_para(<T as Config>::RuntimeOrigin::from(origin))?;
 
 			Self::deposit_event(Event::Pinged(para, seq, payload.clone()));
 			match T::XcmSender::send_xcm(
@@ -215,7 +215,7 @@ pub mod pallet {
 		#[pallet::weight(0)]
 		pub fn pong(origin: OriginFor<T>, seq: u32, payload: Vec<u8>) -> DispatchResult {
 			// Only accept pings from other chains.
-			let para = ensure_sibling_para(<T as Config>::Origin::from(origin))?;
+			let para = ensure_sibling_para(<T as Config>::RuntimeOrigin::from(origin))?;
 
 			if let Some(sent_at) = Pings::<T>::take(seq) {
 				Self::deposit_event(Event::Ponged(
diff --git a/parachains/runtimes/assets/statemine/Cargo.toml b/parachains/runtimes/assets/statemine/Cargo.toml
index a6313d4d274..519cb073906 100644
--- a/parachains/runtimes/assets/statemine/Cargo.toml
+++ b/parachains/runtimes/assets/statemine/Cargo.toml
@@ -9,7 +9,7 @@ description = "Kusama variant of Statemint parachain runtime"
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
 hex-literal = { version = "0.3.4", optional = true }
 log = { version = "0.4.17", default-features = false }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.144", optional = true, features = ["derive"] }
 smallvec = "1.9.0"
 
@@ -87,7 +87,7 @@ runtime-benchmarks = [
 	"hex-literal",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
-	"frame-system-benchmarking",
+	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
@@ -102,7 +102,7 @@ runtime-benchmarks = [
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
-	"pallet-xcm-benchmarks",
+	"pallet-xcm-benchmarks/runtime-benchmarks",
 ]
 try-runtime = [
 	"cumulus-pallet-aura-ext/try-runtime",
diff --git a/parachains/runtimes/assets/statemine/src/lib.rs b/parachains/runtimes/assets/statemine/src/lib.rs
index 579eafb82a0..4271985c243 100644
--- a/parachains/runtimes/assets/statemine/src/lib.rs
+++ b/parachains/runtimes/assets/statemine/src/lib.rs
@@ -46,9 +46,11 @@ use sp_version::RuntimeVersion;
 use codec::{Decode, Encode, MaxEncodedLen};
 use constants::{currency::*, fee::WeightToFee};
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime,
+	dispatch::DispatchClass,
+	parameter_types,
 	traits::{AsEnsureOriginWithArg, EitherOfDiverse, InstanceFilter},
-	weights::{ConstantMultiplier, DispatchClass, Weight},
+	weights::{ConstantMultiplier, Weight},
 	PalletId, RuntimeDebug,
 };
 use frame_system::{
@@ -88,7 +90,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_version: 9290,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 7,
+	transaction_version: 8,
 	state_version: 0,
 };
 
@@ -137,7 +139,7 @@ impl frame_system::Config for Runtime {
 	type Hashing = BlakeTwo256;
 	type Header = Header;
 	type RuntimeEvent = RuntimeEvent;
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type BlockHashCount = BlockHashCount;
 	type DbWeight = RocksDbWeight;
 	type Version = Version;
diff --git a/parachains/runtimes/assets/statemine/src/weights/pallet_proxy.rs b/parachains/runtimes/assets/statemine/src/weights/pallet_proxy.rs
index 55b51e8c7ce..ff2d24e4c67 100644
--- a/parachains/runtimes/assets/statemine/src/weights/pallet_proxy.rs
+++ b/parachains/runtimes/assets/statemine/src/weights/pallet_proxy.rs
@@ -138,7 +138,7 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
 	// Storage: Proxy Proxies (r:1 w:1)
 	/// The range of component `p` is `[1, 31]`.
-	fn anonymous(p: u32, ) -> Weight {
+	fn create_pure(p: u32, ) -> Weight {
 		Weight::from_ref_time(31_472_000 as u64)
 			// Standard Error: 2_000
 			.saturating_add(Weight::from_ref_time(21_000 as u64).saturating_mul(p as u64))
@@ -147,7 +147,7 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 	}
 	// Storage: Proxy Proxies (r:1 w:1)
 	/// The range of component `p` is `[0, 30]`.
-	fn kill_anonymous(p: u32, ) -> Weight {
+	fn kill_pure(p: u32, ) -> Weight {
 		Weight::from_ref_time(24_620_000 as u64)
 			// Standard Error: 2_000
 			.saturating_add(Weight::from_ref_time(85_000 as u64).saturating_mul(p as u64))
diff --git a/parachains/runtimes/assets/statemine/src/weights/xcm/mod.rs b/parachains/runtimes/assets/statemine/src/weights/xcm/mod.rs
index e52a0468098..7972667cf06 100644
--- a/parachains/runtimes/assets/statemine/src/weights/xcm/mod.rs
+++ b/parachains/runtimes/assets/statemine/src/weights/xcm/mod.rs
@@ -21,7 +21,7 @@ use crate::Runtime;
 use frame_support::weights::Weight;
 use pallet_xcm_benchmarks_fungible::WeightInfo as XcmFungibleWeight;
 use pallet_xcm_benchmarks_generic::WeightInfo as XcmGeneric;
-use sp_std::prelude::*;
+use sp_std::{cmp, prelude::*};
 use xcm::{
 	latest::{prelude::*, Weight as XCMWeight},
 	DoubleEncoded,
@@ -57,7 +57,7 @@ impl<Call> XcmWeightInfo<Call> for StatemineXcmWeight<Call> {
 	}
 	// Currently there is no trusted reserve
 	fn reserve_asset_deposited(_assets: &MultiAssets) -> XCMWeight {
-		unimplemented!()
+		u64::MAX
 	}
 	fn receive_teleported_asset(assets: &MultiAssets) -> XCMWeight {
 		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::receive_teleported_asset())
@@ -117,7 +117,10 @@ impl<Call> XcmWeightInfo<Call> for StatemineXcmWeight<Call> {
 		_max_assets: &u32,
 		_dest: &MultiLocation,
 	) -> XCMWeight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset())
+		// Hardcoded till the XCM pallet is fixed
+		let hardcoded_weight = Weight::from_ref_time(1_000_000_000 as u64).ref_time();
+		let weight = assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset());
+		cmp::min(hardcoded_weight, weight)
 	}
 	fn deposit_reserve_asset(
 		assets: &MultiAssetFilter,
@@ -142,7 +145,10 @@ impl<Call> XcmWeightInfo<Call> for StatemineXcmWeight<Call> {
 		_dest: &MultiLocation,
 		_xcm: &Xcm<()>,
 	) -> XCMWeight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_teleport())
+		// Hardcoded till the XCM pallet is fixed
+		let hardcoded_weight = Weight::from_ref_time(200_000_000 as u64).ref_time();
+		let weight = assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_teleport());
+		cmp::min(hardcoded_weight, weight)
 	}
 	fn query_holding(
 		_query_id: &u64,
diff --git a/parachains/runtimes/assets/statemine/src/xcm_config.rs b/parachains/runtimes/assets/statemine/src/xcm_config.rs
index 5036b889c1c..e4b8fd99fa0 100644
--- a/parachains/runtimes/assets/statemine/src/xcm_config.rs
+++ b/parachains/runtimes/assets/statemine/src/xcm_config.rs
@@ -14,8 +14,8 @@
 // limitations under the License.
 
 use super::{
-	AccountId, AssetId, Assets, Authorship, Balance, Balances, Origin, ParachainInfo,
-	ParachainSystem, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, WeightToFee, XcmpQueue,
+	AccountId, AssetId, Assets, Authorship, Balance, Balances, ParachainInfo, ParachainSystem,
+	PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, WeightToFee, XcmpQueue,
 };
 use frame_support::{
 	match_types, parameter_types,
@@ -45,7 +45,7 @@ use xcm_executor::{traits::JustTry, XcmExecutor};
 parameter_types! {
 	pub const KsmLocation: MultiLocation = MultiLocation::parent();
 	pub const RelayNetwork: NetworkId = NetworkId::Kusama;
-	pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();
+	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
 	pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
 	pub const Local: MultiLocation = Here.into();
 	pub AssetsPalletLocation: MultiLocation =
@@ -110,21 +110,21 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location
 	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for
 	// foreign chains who want to have a local sovereign account on this chain which they control.
-	SovereignSignedViaLocation<LocationToAccountId, Origin>,
+	SovereignSignedViaLocation<LocationToAccountId, RuntimeOrigin>,
 	// Native converter for Relay-chain (Parent) location; will convert to a `Relay` origin when
 	// recognised.
-	RelayChainAsNative<RelayChainOrigin, Origin>,
+	RelayChainAsNative<RelayChainOrigin, RuntimeOrigin>,
 	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when
 	// recognised.
-	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,
+	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, RuntimeOrigin>,
 	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a
 	// transaction from the Root origin.
-	ParentAsSuperuser<Origin>,
+	ParentAsSuperuser<RuntimeOrigin>,
 	// Native signed account converter; this just converts an `AccountId32` origin into a normal
-	// `Origin::Signed` origin of the same 32-byte value.
-	SignedAccountId32AsNative<RelayNetwork, Origin>,
+	// `RuntimeOrigin::Signed` origin of the same 32-byte value.
+	SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,
 	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
-	XcmPassthrough<Origin>,
+	XcmPassthrough<RuntimeOrigin>,
 );
 
 parameter_types! {
@@ -206,7 +206,7 @@ impl xcm_executor::Config for XcmConfig {
 
 /// Converts a local signed origin into an XCM multilocation.
 /// Forms the basis for local origins sending/executing XCMs.
-pub type LocalOriginToLocation = SignedToAccountId32<Origin, AccountId, RelayNetwork>;
+pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
 
 /// The means for routing XCM messages which are not for local execution into the right message
 /// queues.
@@ -220,10 +220,10 @@ pub type XcmRouter = (
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	// We want to disallow users sending (arbitrary) XCMs from this chain.
-	type SendXcmOrigin = EnsureXcmOrigin<Origin, ()>;
+	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, ()>;
 	type XcmRouter = XcmRouter;
 	// We support local origins dispatching XCM executions in principle...
-	type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;
+	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	// ... but disallow generic XCM execution. As a result only teleports and reserve transfers are allowed.
 	type XcmExecuteFilter = Nothing;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
@@ -236,7 +236,7 @@ impl pallet_xcm::Config for Runtime {
 	>;
 
 	type LocationInverter = LocationInverter<Ancestry>;
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
 	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
diff --git a/parachains/runtimes/assets/statemint/Cargo.toml b/parachains/runtimes/assets/statemint/Cargo.toml
index 1420852d9ec..9b5e58c86ad 100644
--- a/parachains/runtimes/assets/statemint/Cargo.toml
+++ b/parachains/runtimes/assets/statemint/Cargo.toml
@@ -10,7 +10,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 hex-literal = { version = "0.3.4", optional = true }
 log = { version = "0.4.17", default-features = false }
 serde = { version = "1.0.144", optional = true, features = ["derive"] }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 smallvec = "1.9.0"
 
 # Substrate
@@ -86,7 +86,7 @@ runtime-benchmarks = [
 	"hex-literal",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
-	"frame-system-benchmarking",
+	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
@@ -101,7 +101,7 @@ runtime-benchmarks = [
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
-	"pallet-xcm-benchmarks",
+	"pallet-xcm-benchmarks/runtime-benchmarks",
 ]
 try-runtime = [
 	"cumulus-pallet-aura-ext/try-runtime",
diff --git a/parachains/runtimes/assets/statemint/src/lib.rs b/parachains/runtimes/assets/statemint/src/lib.rs
index 5a54fa95cc2..b5f8b081ef8 100644
--- a/parachains/runtimes/assets/statemint/src/lib.rs
+++ b/parachains/runtimes/assets/statemint/src/lib.rs
@@ -75,9 +75,11 @@ use sp_version::RuntimeVersion;
 use codec::{Decode, Encode, MaxEncodedLen};
 use constants::{currency::*, fee::WeightToFee};
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime,
+	dispatch::DispatchClass,
+	parameter_types,
 	traits::{AsEnsureOriginWithArg, EitherOfDiverse, InstanceFilter},
-	weights::{ConstantMultiplier, DispatchClass, Weight},
+	weights::{ConstantMultiplier, Weight},
 	PalletId, RuntimeDebug,
 };
 use frame_system::{
@@ -118,7 +120,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_version: 9290,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 7,
+	transaction_version: 8,
 	state_version: 0,
 };
 
@@ -167,7 +169,7 @@ impl frame_system::Config for Runtime {
 	type Hashing = BlakeTwo256;
 	type Header = Header;
 	type RuntimeEvent = RuntimeEvent;
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type BlockHashCount = BlockHashCount;
 	type DbWeight = RocksDbWeight;
 	type Version = Version;
diff --git a/parachains/runtimes/assets/statemint/src/weights/pallet_proxy.rs b/parachains/runtimes/assets/statemint/src/weights/pallet_proxy.rs
index 1f07febb57a..b58c456557f 100644
--- a/parachains/runtimes/assets/statemint/src/weights/pallet_proxy.rs
+++ b/parachains/runtimes/assets/statemint/src/weights/pallet_proxy.rs
@@ -138,7 +138,7 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
 	// Storage: Proxy Proxies (r:1 w:1)
 	/// The range of component `p` is `[1, 31]`.
-	fn anonymous(p: u32, ) -> Weight {
+	fn create_pure(p: u32, ) -> Weight {
 		Weight::from_ref_time(30_378_000 as u64)
 			// Standard Error: 2_000
 			.saturating_add(Weight::from_ref_time(16_000 as u64).saturating_mul(p as u64))
@@ -147,7 +147,7 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 	}
 	// Storage: Proxy Proxies (r:1 w:1)
 	/// The range of component `p` is `[0, 30]`.
-	fn kill_anonymous(p: u32, ) -> Weight {
+	fn kill_pure(p: u32, ) -> Weight {
 		Weight::from_ref_time(23_977_000 as u64)
 			// Standard Error: 2_000
 			.saturating_add(Weight::from_ref_time(76_000 as u64).saturating_mul(p as u64))
diff --git a/parachains/runtimes/assets/statemint/src/weights/xcm/mod.rs b/parachains/runtimes/assets/statemint/src/weights/xcm/mod.rs
index ad9123676b8..1a0ffcdb229 100644
--- a/parachains/runtimes/assets/statemint/src/weights/xcm/mod.rs
+++ b/parachains/runtimes/assets/statemint/src/weights/xcm/mod.rs
@@ -21,7 +21,7 @@ use crate::Runtime;
 use frame_support::weights::Weight;
 use pallet_xcm_benchmarks_fungible::WeightInfo as XcmFungibleWeight;
 use pallet_xcm_benchmarks_generic::WeightInfo as XcmGeneric;
-use sp_std::prelude::*;
+use sp_std::{cmp, prelude::*};
 use xcm::{
 	latest::{prelude::*, Weight as XCMWeight},
 	DoubleEncoded,
@@ -57,7 +57,7 @@ impl<Call> XcmWeightInfo<Call> for StatemintXcmWeight<Call> {
 	}
 	// Currently there is no trusted reserve
 	fn reserve_asset_deposited(_assets: &MultiAssets) -> XCMWeight {
-		unimplemented!()
+		u64::MAX
 	}
 	fn receive_teleported_asset(assets: &MultiAssets) -> XCMWeight {
 		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::receive_teleported_asset())
@@ -117,7 +117,10 @@ impl<Call> XcmWeightInfo<Call> for StatemintXcmWeight<Call> {
 		_max_assets: &u32,
 		_dest: &MultiLocation,
 	) -> XCMWeight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset())
+		// Hardcoded till the XCM pallet is fixed
+		let hardcoded_weight = Weight::from_ref_time(1_000_000_000 as u64).ref_time();
+		let weight = assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset());
+		cmp::min(hardcoded_weight, weight)
 	}
 	fn deposit_reserve_asset(
 		assets: &MultiAssetFilter,
@@ -142,7 +145,10 @@ impl<Call> XcmWeightInfo<Call> for StatemintXcmWeight<Call> {
 		_dest: &MultiLocation,
 		_xcm: &Xcm<()>,
 	) -> XCMWeight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_teleport())
+		// Hardcoded till the XCM pallet is fixed
+		let hardcoded_weight = Weight::from_ref_time(200_000_000 as u64).ref_time();
+		let weight = assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_teleport());
+		cmp::min(hardcoded_weight, weight)
 	}
 	fn query_holding(
 		_query_id: &u64,
diff --git a/parachains/runtimes/assets/statemint/src/xcm_config.rs b/parachains/runtimes/assets/statemint/src/xcm_config.rs
index a7932e69dea..eaaa04f2f67 100644
--- a/parachains/runtimes/assets/statemint/src/xcm_config.rs
+++ b/parachains/runtimes/assets/statemint/src/xcm_config.rs
@@ -14,8 +14,8 @@
 // limitations under the License.
 
 use super::{
-	AccountId, AssetId, Assets, Authorship, Balance, Balances, Origin, ParachainInfo,
-	ParachainSystem, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, WeightToFee, XcmpQueue,
+	AccountId, AssetId, Assets, Authorship, Balance, Balances, ParachainInfo, ParachainSystem,
+	PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, WeightToFee, XcmpQueue,
 };
 use frame_support::{
 	match_types, parameter_types,
@@ -42,7 +42,7 @@ use xcm_executor::{traits::JustTry, XcmExecutor};
 parameter_types! {
 	pub const DotLocation: MultiLocation = MultiLocation::parent();
 	pub const RelayNetwork: NetworkId = NetworkId::Polkadot;
-	pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();
+	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
 	pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
 	pub const Local: MultiLocation = Here.into();
 	pub AssetsPalletLocation: MultiLocation =
@@ -107,21 +107,21 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location
 	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for
 	// foreign chains who want to have a local sovereign account on this chain which they control.
-	SovereignSignedViaLocation<LocationToAccountId, Origin>,
+	SovereignSignedViaLocation<LocationToAccountId, RuntimeOrigin>,
 	// Native converter for Relay-chain (Parent) location; will convert to a `Relay` origin when
 	// recognised.
-	RelayChainAsNative<RelayChainOrigin, Origin>,
+	RelayChainAsNative<RelayChainOrigin, RuntimeOrigin>,
 	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when
 	// recognised.
-	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,
+	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, RuntimeOrigin>,
 	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a
 	// transaction from the Root origin.
-	ParentAsSuperuser<Origin>,
+	ParentAsSuperuser<RuntimeOrigin>,
 	// Native signed account converter; this just converts an `AccountId32` origin into a normal
-	// `Origin::Signed` origin of the same 32-byte value.
-	SignedAccountId32AsNative<RelayNetwork, Origin>,
+	// `RuntimeOrigin::Signed` origin of the same 32-byte value.
+	SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,
 	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
-	XcmPassthrough<Origin>,
+	XcmPassthrough<RuntimeOrigin>,
 );
 
 parameter_types! {
@@ -182,7 +182,7 @@ impl xcm_executor::Config for XcmConfig {
 
 /// Converts a local signed origin into an XCM multilocation.
 /// Forms the basis for local origins sending/executing XCMs.
-pub type LocalOriginToLocation = SignedToAccountId32<Origin, AccountId, RelayNetwork>;
+pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
 
 /// The means for routing XCM messages which are not for local execution into the right message
 /// queues.
@@ -196,10 +196,10 @@ pub type XcmRouter = (
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	// We want to disallow users sending (arbitrary) XCMs from this chain.
-	type SendXcmOrigin = EnsureXcmOrigin<Origin, ()>;
+	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, ()>;
 	type XcmRouter = XcmRouter;
 	// We support local origins dispatching XCM executions in principle...
-	type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;
+	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	// ... but disallow generic XCM execution. As a result only teleports and reserve transfers are allowed.
 	type XcmExecuteFilter = Nothing;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
@@ -211,7 +211,7 @@ impl pallet_xcm::Config for Runtime {
 		MaxInstructions,
 	>;
 	type LocationInverter = LocationInverter<Ancestry>;
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
 	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
diff --git a/parachains/runtimes/assets/test-utils/src/lib.rs b/parachains/runtimes/assets/test-utils/src/lib.rs
index f37465e5bd6..fb4750bae9e 100644
--- a/parachains/runtimes/assets/test-utils/src/lib.rs
+++ b/parachains/runtimes/assets/test-utils/src/lib.rs
@@ -96,7 +96,7 @@ pub struct RuntimeHelper<Runtime>(PhantomData<Runtime>);
 impl<Runtime: frame_system::Config> RuntimeHelper<Runtime>
 where
 	AccountIdOf<Runtime>:
-		Into<<<Runtime as frame_system::Config>::Origin as OriginTrait>::AccountId>,
+		Into<<<Runtime as frame_system::Config>::RuntimeOrigin as OriginTrait>::AccountId>,
 {
 	pub fn run_to_block(n: u32, author: Option<AccountId>) {
 		while frame_system::Pallet::<Runtime>::block_number() < n.into() {
@@ -122,13 +122,13 @@ where
 		}
 	}
 
-	pub fn root_origin() -> <Runtime as frame_system::Config>::Origin {
-		<Runtime as frame_system::Config>::Origin::root()
+	pub fn root_origin() -> <Runtime as frame_system::Config>::RuntimeOrigin {
+		<Runtime as frame_system::Config>::RuntimeOrigin::root()
 	}
 
 	pub fn origin_of(
 		account_id: AccountIdOf<Runtime>,
-	) -> <Runtime as frame_system::Config>::Origin {
-		<Runtime as frame_system::Config>::Origin::signed(account_id.into())
+	) -> <Runtime as frame_system::Config>::RuntimeOrigin {
+		<Runtime as frame_system::Config>::RuntimeOrigin::signed(account_id.into())
 	}
 }
diff --git a/parachains/runtimes/assets/westmint/Cargo.toml b/parachains/runtimes/assets/westmint/Cargo.toml
index c3fe0925523..0add127f408 100644
--- a/parachains/runtimes/assets/westmint/Cargo.toml
+++ b/parachains/runtimes/assets/westmint/Cargo.toml
@@ -9,7 +9,7 @@ description = "Westend variant of Statemint parachain runtime"
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
 hex-literal = { version = "0.3.4", optional = true }
 log = { version = "0.4.17", default-features = false }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.144", optional = true, features = ["derive"] }
 smallvec = "1.9.0"
 
@@ -86,7 +86,7 @@ runtime-benchmarks = [
 	"hex-literal",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
-	"frame-system-benchmarking",
+	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
@@ -101,7 +101,7 @@ runtime-benchmarks = [
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
-	"pallet-xcm-benchmarks",
+	"pallet-xcm-benchmarks/runtime-benchmarks",
 ]
 try-runtime = [
 	"cumulus-pallet-aura-ext/try-runtime",
diff --git a/parachains/runtimes/assets/westmint/src/lib.rs b/parachains/runtimes/assets/westmint/src/lib.rs
index 27e6c15da02..25b51f42a95 100644
--- a/parachains/runtimes/assets/westmint/src/lib.rs
+++ b/parachains/runtimes/assets/westmint/src/lib.rs
@@ -46,9 +46,11 @@ use sp_version::RuntimeVersion;
 use codec::{Decode, Encode, MaxEncodedLen};
 use constants::{currency::*, fee::WeightToFee};
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime,
+	dispatch::DispatchClass,
+	parameter_types,
 	traits::{AsEnsureOriginWithArg, InstanceFilter},
-	weights::{ConstantMultiplier, DispatchClass, Weight},
+	weights::{ConstantMultiplier, Weight},
 	PalletId, RuntimeDebug,
 };
 use frame_system::{
@@ -86,7 +88,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_version: 9290,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 7,
+	transaction_version: 8,
 	state_version: 0,
 };
 
@@ -135,7 +137,7 @@ impl frame_system::Config for Runtime {
 	type Hashing = BlakeTwo256;
 	type Header = Header;
 	type RuntimeEvent = RuntimeEvent;
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type BlockHashCount = BlockHashCount;
 	type DbWeight = RocksDbWeight;
 	type Version = Version;
diff --git a/parachains/runtimes/assets/westmint/src/weights/pallet_proxy.rs b/parachains/runtimes/assets/westmint/src/weights/pallet_proxy.rs
index fc72d28e915..92c3bd17d87 100644
--- a/parachains/runtimes/assets/westmint/src/weights/pallet_proxy.rs
+++ b/parachains/runtimes/assets/westmint/src/weights/pallet_proxy.rs
@@ -138,7 +138,7 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
 	// Storage: Proxy Proxies (r:1 w:1)
 	/// The range of component `p` is `[1, 31]`.
-	fn anonymous(p: u32, ) -> Weight {
+	fn create_pure(p: u32, ) -> Weight {
 		Weight::from_ref_time(31_575_000 as u64)
 			// Standard Error: 2_000
 			.saturating_add(Weight::from_ref_time(35_000 as u64).saturating_mul(p as u64))
@@ -147,7 +147,7 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 	}
 	// Storage: Proxy Proxies (r:1 w:1)
 	/// The range of component `p` is `[0, 30]`.
-	fn kill_anonymous(p: u32, ) -> Weight {
+	fn kill_pure(p: u32, ) -> Weight {
 		Weight::from_ref_time(24_640_000 as u64)
 			// Standard Error: 2_000
 			.saturating_add(Weight::from_ref_time(80_000 as u64).saturating_mul(p as u64))
diff --git a/parachains/runtimes/assets/westmint/src/weights/xcm/mod.rs b/parachains/runtimes/assets/westmint/src/weights/xcm/mod.rs
index 52f643d8f5e..5f6bf034fdc 100644
--- a/parachains/runtimes/assets/westmint/src/weights/xcm/mod.rs
+++ b/parachains/runtimes/assets/westmint/src/weights/xcm/mod.rs
@@ -21,7 +21,7 @@ use crate::Runtime;
 use frame_support::weights::Weight;
 use pallet_xcm_benchmarks_fungible::WeightInfo as XcmFungibleWeight;
 use pallet_xcm_benchmarks_generic::WeightInfo as XcmGeneric;
-use sp_std::prelude::*;
+use sp_std::{cmp, prelude::*};
 use xcm::{
 	latest::{prelude::*, Weight as XCMWeight},
 	DoubleEncoded,
@@ -57,7 +57,7 @@ impl<Call> XcmWeightInfo<Call> for WestmintXcmWeight<Call> {
 	}
 	// Currently there is no trusted reserve
 	fn reserve_asset_deposited(_assets: &MultiAssets) -> XCMWeight {
-		unimplemented!()
+		u64::MAX
 	}
 	fn receive_teleported_asset(assets: &MultiAssets) -> XCMWeight {
 		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::receive_teleported_asset())
@@ -117,7 +117,10 @@ impl<Call> XcmWeightInfo<Call> for WestmintXcmWeight<Call> {
 		_max_assets: &u32,
 		_dest: &MultiLocation,
 	) -> XCMWeight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset())
+		// Hardcoded till the XCM pallet is fixed
+		let hardcoded_weight = Weight::from_ref_time(1_000_000_000 as u64).ref_time();
+		let weight = assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset());
+		cmp::min(hardcoded_weight, weight)
 	}
 	fn deposit_reserve_asset(
 		assets: &MultiAssetFilter,
@@ -142,7 +145,10 @@ impl<Call> XcmWeightInfo<Call> for WestmintXcmWeight<Call> {
 		_dest: &MultiLocation,
 		_xcm: &Xcm<()>,
 	) -> XCMWeight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_teleport())
+		// Hardcoded till the XCM pallet is fixed
+		let hardcoded_weight = Weight::from_ref_time(200_000_000 as u64).ref_time();
+		let weight = assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_teleport());
+		cmp::min(hardcoded_weight, weight)
 	}
 	fn query_holding(
 		_query_id: &u64,
diff --git a/parachains/runtimes/assets/westmint/src/xcm_config.rs b/parachains/runtimes/assets/westmint/src/xcm_config.rs
index bd869c977b8..6b36b797207 100644
--- a/parachains/runtimes/assets/westmint/src/xcm_config.rs
+++ b/parachains/runtimes/assets/westmint/src/xcm_config.rs
@@ -14,8 +14,8 @@
 // limitations under the License.
 
 use super::{
-	AccountId, AssetId, Assets, Authorship, Balance, Balances, Origin, ParachainInfo,
-	ParachainSystem, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, WeightToFee, XcmpQueue,
+	AccountId, AssetId, Assets, Authorship, Balance, Balances, ParachainInfo, ParachainSystem,
+	PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, WeightToFee, XcmpQueue,
 };
 use frame_support::{
 	match_types, parameter_types,
@@ -46,7 +46,7 @@ parameter_types! {
 	pub const WestendLocation: MultiLocation = MultiLocation::parent();
 	pub RelayNetwork: NetworkId =
 		NetworkId::Named(b"Westend".to_vec().try_into().expect("less than length limit; qed"));
-	pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();
+	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
 	pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
 	pub const Local: MultiLocation = Here.into();
 	pub AssetsPalletLocation: MultiLocation =
@@ -111,21 +111,21 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location
 	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for
 	// foreign chains who want to have a local sovereign account on this chain which they control.
-	SovereignSignedViaLocation<LocationToAccountId, Origin>,
+	SovereignSignedViaLocation<LocationToAccountId, RuntimeOrigin>,
 	// Native converter for Relay-chain (Parent) location; will convert to a `Relay` origin when
 	// recognised.
-	RelayChainAsNative<RelayChainOrigin, Origin>,
+	RelayChainAsNative<RelayChainOrigin, RuntimeOrigin>,
 	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when
 	// recognised.
-	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,
+	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, RuntimeOrigin>,
 	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a
 	// transaction from the Root origin.
-	ParentAsSuperuser<Origin>,
+	ParentAsSuperuser<RuntimeOrigin>,
 	// Native signed account converter; this just converts an `AccountId32` origin into a normal
-	// `Origin::Signed` origin of the same 32-byte value.
-	SignedAccountId32AsNative<RelayNetwork, Origin>,
+	// `RuntimeOrigin::Signed` origin of the same 32-byte value.
+	SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,
 	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
-	XcmPassthrough<Origin>,
+	XcmPassthrough<RuntimeOrigin>,
 );
 
 parameter_types! {
@@ -202,7 +202,7 @@ impl xcm_executor::Config for XcmConfig {
 }
 
 /// Local origins on this chain are allowed to dispatch XCM sends/executions.
-pub type LocalOriginToLocation = SignedToAccountId32<Origin, AccountId, RelayNetwork>;
+pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
 
 /// The means for routing XCM messages which are not for local execution into the right message
 /// queues.
@@ -215,9 +215,9 @@ pub type XcmRouter = (
 
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type SendXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;
+	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	type XcmRouter = XcmRouter;
-	type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;
+	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	type XcmExecuteFilter = Everything;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type XcmTeleportFilter = Everything;
@@ -228,7 +228,7 @@ impl pallet_xcm::Config for Runtime {
 		MaxInstructions,
 	>;
 	type LocationInverter = LocationInverter<Ancestry>;
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
 	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
diff --git a/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml b/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml
index 3bef7d21fe3..c6e70054770 100644
--- a/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml
+++ b/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml
@@ -10,7 +10,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 hex-literal = { version = "0.3.4", optional = true }
 log = { version = "0.4.17", default-features = false }
 serde = { version = "1.0.144", optional = true, features = ["derive"] }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 smallvec = "1.6.1"
 
 # Substrate
@@ -83,7 +83,7 @@ runtime-benchmarks = [
 	"hex-literal",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
-	"frame-system-benchmarking",
+	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-alliance/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
diff --git a/parachains/runtimes/collectives/collectives-polkadot/src/impls.rs b/parachains/runtimes/collectives/collectives-polkadot/src/impls.rs
index 6810267a679..107e387ed74 100644
--- a/parachains/runtimes/collectives/collectives-polkadot/src/impls.rs
+++ b/parachains/runtimes/collectives/collectives-polkadot/src/impls.rs
@@ -52,7 +52,7 @@ where
 	T: pallet_xcm::Config + frame_system::Config + pallet_alliance::Config<I>,
 	[u8; 32]: From<AccountIdOf<T>>,
 	BalanceOf<T, I>: Into<Fungibility>,
-	<<T as frame_system::Config>::Origin as OriginTrait>::AccountId: From<AccountIdOf<T>>,
+	<<T as frame_system::Config>::RuntimeOrigin as OriginTrait>::AccountId: From<AccountIdOf<T>>,
 {
 	fn on_unbalanced(amount: NegativeImbalanceOf<T, I>) {
 		let temp_account: AccountIdOf<T> = TempAcc::get();
@@ -62,7 +62,7 @@ where
 		<CurrencyOf<T, I>>::resolve_creating(&temp_account, amount);
 
 		let result = pallet_xcm::Pallet::<T>::teleport_assets(
-			<T as frame_system::Config>::Origin::signed(temp_account.into()),
+			<T as frame_system::Config>::RuntimeOrigin::signed(temp_account.into()),
 			Box::new(Parent.into()),
 			Box::new(
 				Junction::AccountId32 { network: NetworkId::Any, id: treasury_acc.into() }
diff --git a/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs b/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs
index a5c5a5daf64..604329a0ca9 100644
--- a/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs
+++ b/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs
@@ -61,9 +61,11 @@ use sp_version::RuntimeVersion;
 use codec::{Decode, Encode, MaxEncodedLen};
 use constants::{currency::*, fee::WeightToFee};
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime,
+	dispatch::DispatchClass,
+	parameter_types,
 	traits::{ConstU16, ConstU32, ConstU64, ConstU8, EitherOfDiverse, InstanceFilter},
-	weights::{ConstantMultiplier, DispatchClass, Weight},
+	weights::{ConstantMultiplier, Weight},
 	PalletId, RuntimeDebug,
 };
 use frame_system::{
@@ -160,7 +162,7 @@ impl frame_system::Config for Runtime {
 	type Hashing = BlakeTwo256;
 	type Header = Header;
 	type RuntimeEvent = RuntimeEvent;
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type BlockHashCount = BlockHashCount;
 	type DbWeight = RocksDbWeight;
 	type Version = Version;
@@ -437,7 +439,7 @@ pub const ALLIANCE_MAX_MEMBERS: u32 = 100;
 
 type AllianceCollective = pallet_collective::Instance1;
 impl pallet_collective::Config<AllianceCollective> for Runtime {
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type Proposal = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type MotionDuration = AllianceMotionDuration;
diff --git a/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_proxy.rs b/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_proxy.rs
index eb316a08649..4172fdd49ff 100644
--- a/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_proxy.rs
+++ b/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_proxy.rs
@@ -138,7 +138,7 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
 	// Storage: Proxy Proxies (r:1 w:1)
 	/// The range of component `p` is `[1, 31]`.
-	fn anonymous(p: u32, ) -> Weight {
+	fn create_pure(p: u32, ) -> Weight {
 		Weight::from_ref_time(29_260_000 as u64)
 			// Standard Error: 2_000
 			.saturating_add(Weight::from_ref_time(38_000 as u64).saturating_mul(p as u64))
@@ -147,7 +147,7 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 	}
 	// Storage: Proxy Proxies (r:1 w:1)
 	/// The range of component `p` is `[0, 30]`.
-	fn kill_anonymous(p: u32, ) -> Weight {
+	fn kill_pure(p: u32, ) -> Weight {
 		Weight::from_ref_time(23_012_000 as u64)
 			// Standard Error: 2_000
 			.saturating_add(Weight::from_ref_time(97_000 as u64).saturating_mul(p as u64))
diff --git a/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs b/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs
index bfcfd9567b2..1192306daa4 100644
--- a/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs
+++ b/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs
@@ -14,8 +14,8 @@
 // limitations under the License.
 
 use super::{
-	AccountId, Balances, Origin, ParachainInfo, ParachainSystem, PolkadotXcm, Runtime, RuntimeCall,
-	RuntimeEvent, WeightToFee, XcmpQueue,
+	AccountId, Balances, ParachainInfo, ParachainSystem, PolkadotXcm, Runtime, RuntimeCall,
+	RuntimeEvent, RuntimeOrigin, WeightToFee, XcmpQueue,
 };
 use frame_support::{
 	match_types, parameter_types,
@@ -41,7 +41,7 @@ use xcm_executor::XcmExecutor;
 parameter_types! {
 	pub const DotLocation: MultiLocation = MultiLocation::parent();
 	pub const RelayNetwork: NetworkId = NetworkId::Polkadot;
-	pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();
+	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
 	pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
 	pub const Local: MultiLocation = Here.into();
 	pub CheckingAccount: AccountId = PolkadotXcm::check_account();
@@ -80,21 +80,21 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location
 	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for
 	// foreign chains who want to have a local sovereign account on this chain which they control.
-	SovereignSignedViaLocation<LocationToAccountId, Origin>,
+	SovereignSignedViaLocation<LocationToAccountId, RuntimeOrigin>,
 	// Native converter for Relay-chain (Parent) location; will convert to a `Relay` origin when
 	// recognised.
-	RelayChainAsNative<RelayChainOrigin, Origin>,
+	RelayChainAsNative<RelayChainOrigin, RuntimeOrigin>,
 	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when
 	// recognised.
-	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,
+	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, RuntimeOrigin>,
 	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a
 	// transaction from the Root origin.
-	ParentAsSuperuser<Origin>,
+	ParentAsSuperuser<RuntimeOrigin>,
 	// Native signed account converter; this just converts an `AccountId32` origin into a normal
-	// `Origin::Signed` origin of the same 32-byte value.
-	SignedAccountId32AsNative<RelayNetwork, Origin>,
+	// `RuntimeOrigin::Signed` origin of the same 32-byte value.
+	SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,
 	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
-	XcmPassthrough<Origin>,
+	XcmPassthrough<RuntimeOrigin>,
 );
 
 parameter_types! {
@@ -154,7 +154,7 @@ impl xcm_executor::Config for XcmConfig {
 
 /// Converts a local signed origin into an XCM multilocation.
 /// Forms the basis for local origins sending/executing XCMs.
-pub type LocalOriginToLocation = SignedToAccountId32<Origin, AccountId, RelayNetwork>;
+pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
 
 /// The means for routing XCM messages which are not for local execution into the right message
 /// queues.
@@ -168,10 +168,10 @@ pub type XcmRouter = (
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	// We want to disallow users sending (arbitrary) XCMs from this chain.
-	type SendXcmOrigin = EnsureXcmOrigin<Origin, ()>;
+	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, ()>;
 	type XcmRouter = XcmRouter;
 	// We support local origins dispatching XCM executions in principle...
-	type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;
+	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	// ... but disallow generic XCM execution. As a result only teleports are allowed.
 	type XcmExecuteFilter = Nothing;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
@@ -179,7 +179,7 @@ impl pallet_xcm::Config for Runtime {
 	type XcmReserveTransferFilter = Nothing; // This parachain is not meant as a reserve location.
 	type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;
 	type LocationInverter = LocationInverter<Ancestry>;
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
 	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
diff --git a/parachains/runtimes/contracts/contracts-rococo/Cargo.toml b/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
index 379156f4260..5c277c2b0ec 100644
--- a/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
+++ b/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
@@ -14,7 +14,7 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 hex-literal = { version = "0.3.4", optional = true }
 log = { version = "0.4.17", default-features = false }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.144", optional = true, features = ["derive"] }
 smallvec = "1.9.0"
 
@@ -147,7 +147,7 @@ runtime-benchmarks = [
 	"hex-literal",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
-	"frame-system-benchmarking",
+	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
diff --git a/parachains/runtimes/contracts/contracts-rococo/src/contracts.rs b/parachains/runtimes/contracts/contracts-rococo/src/contracts.rs
index 3c4e81f3e3f..db59f925276 100644
--- a/parachains/runtimes/contracts/contracts-rococo/src/contracts.rs
+++ b/parachains/runtimes/contracts/contracts-rococo/src/contracts.rs
@@ -4,11 +4,10 @@ use crate::{
 };
 use frame_support::{
 	parameter_types,
-	traits::{ConstU32, Nothing, OnRuntimeUpgrade},
+	traits::{ConstU32, Nothing},
 	weights::Weight,
 };
 use pallet_contracts::{
-	migration,
 	weights::{SubstrateWeight, WeightInfo},
 	Config, DefaultAddressGenerator, DefaultContractAccessWeight, Frame, Schedule,
 };
@@ -58,13 +57,5 @@ impl Config for Runtime {
 	type AddressGenerator = DefaultAddressGenerator;
 	type ContractAccessWeight = DefaultContractAccessWeight<RuntimeBlockWeights>;
 	type MaxCodeLen = ConstU32<{ 128 * 1024 }>;
-	type RelaxedMaxCodeLen = ConstU32<{ 256 * 1024 }>;
 	type MaxStorageKeyLen = ConstU32<128>;
 }
-
-pub struct Migrations;
-impl OnRuntimeUpgrade for Migrations {
-	fn on_runtime_upgrade() -> Weight {
-		migration::migrate::<Runtime>()
-	}
-}
diff --git a/parachains/runtimes/contracts/contracts-rococo/src/lib.rs b/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
index 46c53a95efe..1769c20dc8d 100644
--- a/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
+++ b/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
@@ -47,9 +47,11 @@ use sp_version::RuntimeVersion;
 
 use constants::{currency::*, fee::WeightToFee};
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime,
+	dispatch::DispatchClass,
+	parameter_types,
 	traits::{ConstU128, ConstU16, ConstU32, ConstU64, ConstU8, Everything},
-	weights::{ConstantMultiplier, DispatchClass, Weight},
+	weights::{ConstantMultiplier, Weight},
 	PalletId,
 };
 use frame_system::limits::{BlockLength, BlockWeights};
@@ -100,7 +102,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPalletsWithSystem,
-	contracts::Migrations,
+	pallet_contracts::Migration<Runtime>,
 >;
 
 impl_opaque_keys! {
@@ -165,7 +167,7 @@ impl frame_system::Config for Runtime {
 	type Hashing = BlakeTwo256;
 	type Header = Header;
 	type RuntimeEvent = RuntimeEvent;
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type BlockHashCount = BlockHashCount;
 	type DbWeight = RocksDbWeight;
 	type Version = Version;
diff --git a/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs b/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs
index fbccf508c1d..14619efb021 100644
--- a/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs
+++ b/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs
@@ -14,8 +14,8 @@
 // limitations under the License.
 
 use super::{
-	AccountId, Balances, Origin, ParachainInfo, ParachainSystem, PolkadotXcm, Runtime, RuntimeCall,
-	RuntimeEvent, WeightToFee, XcmpQueue,
+	AccountId, Balances, ParachainInfo, ParachainSystem, PolkadotXcm, Runtime, RuntimeCall,
+	RuntimeEvent, RuntimeOrigin, WeightToFee, XcmpQueue,
 };
 use frame_support::{
 	match_types, parameter_types,
@@ -39,7 +39,7 @@ use xcm_executor::XcmExecutor;
 parameter_types! {
 	pub const RelayLocation: MultiLocation = MultiLocation::parent();
 	pub const RelayNetwork: NetworkId = NetworkId::Any;
-	pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();
+	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
 	pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
 	pub const Local: MultiLocation = Here.into();
 	pub CheckingAccount: AccountId = PolkadotXcm::check_account();
@@ -85,21 +85,21 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location
 	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for
 	// foreign chains who want to have a local sovereign account on this chain which they control.
-	SovereignSignedViaLocation<LocationToAccountId, Origin>,
+	SovereignSignedViaLocation<LocationToAccountId, RuntimeOrigin>,
 	// Native converter for Relay-chain (Parent) location; will convert to a `Relay` origin when
 	// recognised.
-	RelayChainAsNative<RelayChainOrigin, Origin>,
+	RelayChainAsNative<RelayChainOrigin, RuntimeOrigin>,
 	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when
 	// recognised.
-	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,
+	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, RuntimeOrigin>,
 	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a
 	// transaction from the Root origin.
-	ParentAsSuperuser<Origin>,
+	ParentAsSuperuser<RuntimeOrigin>,
 	// Native signed account converter; this just converts an `AccountId32` origin into a normal
-	// `Origin::Signed` origin of the same 32-byte value.
-	SignedAccountId32AsNative<RelayNetwork, Origin>,
+	// `RuntimeOrigin::Signed` origin of the same 32-byte value.
+	SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,
 	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
-	XcmPassthrough<Origin>,
+	XcmPassthrough<RuntimeOrigin>,
 );
 
 parameter_types! {
@@ -153,7 +153,7 @@ impl xcm_executor::Config for XcmConfig {
 
 /// Converts a local signed origin into an XCM multilocation.
 /// Forms the basis for local origins sending/executing XCMs.
-pub type LocalOriginToLocation = SignedToAccountId32<Origin, AccountId, RelayNetwork>;
+pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
 
 /// The means for routing XCM messages which are not for local execution into the right message
 /// queues.
@@ -167,10 +167,10 @@ pub type XcmRouter = (
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	// We want to disallow users sending (arbitrary) XCMs from this chain.
-	type SendXcmOrigin = EnsureXcmOrigin<Origin, ()>;
+	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, ()>;
 	type XcmRouter = XcmRouter;
 	// We support local origins dispatching XCM executions in principle...
-	type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;
+	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	// ... but disallow generic XCM execution. As a result only teleports and reserve transfers are allowed.
 	type XcmExecuteFilter = Nothing;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
@@ -178,7 +178,7 @@ impl pallet_xcm::Config for Runtime {
 	type XcmReserveTransferFilter = Everything;
 	type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;
 	type LocationInverter = LocationInverter<Ancestry>;
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
 	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
diff --git a/parachains/runtimes/starters/seedling/Cargo.toml b/parachains/runtimes/starters/seedling/Cargo.toml
index 430ef29a1f2..952294f8c3b 100644
--- a/parachains/runtimes/starters/seedling/Cargo.toml
+++ b/parachains/runtimes/starters/seedling/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.14", default-features = false }
-scale-info = { version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.144", optional = true, features = ["derive"] }
 
 # Substrate
diff --git a/parachains/runtimes/starters/seedling/src/lib.rs b/parachains/runtimes/starters/seedling/src/lib.rs
index 035dff2eb45..d35d96f6748 100644
--- a/parachains/runtimes/starters/seedling/src/lib.rs
+++ b/parachains/runtimes/starters/seedling/src/lib.rs
@@ -43,11 +43,13 @@ use sp_version::RuntimeVersion;
 
 // A few exports that help ease life for downstream crates.
 pub use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime,
+	dispatch::DispatchClass,
+	parameter_types,
 	traits::{IsInVec, Randomness},
 	weights::{
 		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
-		DispatchClass, IdentityFee, Weight,
+		IdentityFee, Weight,
 	},
 	StorageValue,
 };
@@ -130,7 +132,7 @@ impl frame_system::Config for Runtime {
 	/// The ubiquitous event type.
 	type RuntimeEvent = RuntimeEvent;
 	/// The ubiquitous origin type.
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
 	type BlockHashCount = BlockHashCount;
 	/// Runtime version.
diff --git a/parachains/runtimes/starters/shell/Cargo.toml b/parachains/runtimes/starters/shell/Cargo.toml
index 6a351cb5c26..87ebd609ea6 100644
--- a/parachains/runtimes/starters/shell/Cargo.toml
+++ b/parachains/runtimes/starters/shell/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.144", optional = true, features = ["derive"] }
 
 # Substrate
diff --git a/parachains/runtimes/starters/shell/src/lib.rs b/parachains/runtimes/starters/shell/src/lib.rs
index fab27c2fc6f..f75a734c947 100644
--- a/parachains/runtimes/starters/shell/src/lib.rs
+++ b/parachains/runtimes/starters/shell/src/lib.rs
@@ -50,11 +50,13 @@ use sp_version::RuntimeVersion;
 
 // A few exports that help ease life for downstream crates.
 pub use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime,
+	dispatch::DispatchClass,
+	parameter_types,
 	traits::{Everything, IsInVec, Randomness},
 	weights::{
 		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
-		DispatchClass, IdentityFee, Weight,
+		IdentityFee, Weight,
 	},
 	StorageValue,
 };
@@ -138,7 +140,7 @@ impl frame_system::Config for Runtime {
 	/// The ubiquitous event type.
 	type RuntimeEvent = RuntimeEvent;
 	/// The ubiquitous origin type.
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
 	type BlockHashCount = BlockHashCount;
 	/// Runtime version.
diff --git a/parachains/runtimes/starters/shell/src/xcm_config.rs b/parachains/runtimes/starters/shell/src/xcm_config.rs
index 8e754299aba..2c51387a15c 100644
--- a/parachains/runtimes/starters/shell/src/xcm_config.rs
+++ b/parachains/runtimes/starters/shell/src/xcm_config.rs
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use super::{AccountId, Origin, ParachainInfo, Runtime, RuntimeCall, RuntimeEvent};
+use super::{AccountId, ParachainInfo, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin};
 use frame_support::{match_types, parameter_types};
 use xcm::latest::prelude::*;
 use xcm_builder::{
@@ -34,10 +34,10 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location
 	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for
 	// foreign chains who want to have a local sovereign account on this chain which they control.
-	SovereignSignedViaLocation<ParentIsPreset<AccountId>, Origin>,
+	SovereignSignedViaLocation<ParentIsPreset<AccountId>, RuntimeOrigin>,
 	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a
 	// transaction from the Root origin.
-	ParentAsSuperuser<Origin>,
+	ParentAsSuperuser<RuntimeOrigin>,
 );
 
 match_types! {
diff --git a/parachains/runtimes/testing/penpal/Cargo.toml b/parachains/runtimes/testing/penpal/Cargo.toml
index dfa7b160b12..b38addb9b3d 100644
--- a/parachains/runtimes/testing/penpal/Cargo.toml
+++ b/parachains/runtimes/testing/penpal/Cargo.toml
@@ -18,7 +18,7 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 hex-literal = { version = "0.3.4", optional = true }
 log = { version = "0.4.16", default-features = false }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.144", optional = true, features = ["derive"] }
 smallvec = "1.9.0"
 
@@ -134,7 +134,7 @@ runtime-benchmarks = [
 	"hex-literal",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
-	"frame-system-benchmarking",
+	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
diff --git a/parachains/runtimes/testing/penpal/src/lib.rs b/parachains/runtimes/testing/penpal/src/lib.rs
index a9342c3a657..ecaa8a09b6f 100644
--- a/parachains/runtimes/testing/penpal/src/lib.rs
+++ b/parachains/runtimes/testing/penpal/src/lib.rs
@@ -32,11 +32,13 @@ pub mod xcm_config;
 
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime,
+	dispatch::DispatchClass,
+	parameter_types,
 	traits::Everything,
 	weights::{
-		constants::WEIGHT_PER_SECOND, ConstantMultiplier, DispatchClass, Weight,
-		WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial,
+		constants::WEIGHT_PER_SECOND, ConstantMultiplier, Weight, WeightToFeeCoefficient,
+		WeightToFeeCoefficients, WeightToFeePolynomial,
 	},
 	PalletId,
 };
@@ -288,7 +290,7 @@ impl frame_system::Config for Runtime {
 	/// The ubiquitous event type.
 	type RuntimeEvent = RuntimeEvent;
 	/// The ubiquitous origin type.
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
 	type BlockHashCount = BlockHashCount;
 	/// Runtime version.
diff --git a/parachains/runtimes/testing/penpal/src/xcm_config.rs b/parachains/runtimes/testing/penpal/src/xcm_config.rs
index 5c814be50c1..87159950350 100644
--- a/parachains/runtimes/testing/penpal/src/xcm_config.rs
+++ b/parachains/runtimes/testing/penpal/src/xcm_config.rs
@@ -22,8 +22,9 @@
 //! with statemine as the reserve. At present no derivative tokens are minted on receipt of a
 //! ReserveAssetTransferDeposited message but that will but the intension will be to support this soon.
 use super::{
-	AccountId, AssetId as AssetIdPalletAssets, Assets, Balance, Balances, Origin, ParachainInfo,
-	ParachainSystem, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, WeightToFee, XcmpQueue,
+	AccountId, AssetId as AssetIdPalletAssets, Assets, Balance, Balances, ParachainInfo,
+	ParachainSystem, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, WeightToFee,
+	XcmpQueue,
 };
 use core::marker::PhantomData;
 use frame_support::{
@@ -56,7 +57,7 @@ use xcm_executor::{
 parameter_types! {
 	pub const RelayLocation: MultiLocation = MultiLocation::parent();
 	pub const RelayNetwork: NetworkId = NetworkId::Any;
-	pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();
+	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
 	pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
 }
 
@@ -118,18 +119,18 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location
 	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for
 	// foreign chains who want to have a local sovereign account on this chain which they control.
-	SovereignSignedViaLocation<LocationToAccountId, Origin>,
+	SovereignSignedViaLocation<LocationToAccountId, RuntimeOrigin>,
 	// Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when
 	// recognized.
-	RelayChainAsNative<RelayChainOrigin, Origin>,
+	RelayChainAsNative<RelayChainOrigin, RuntimeOrigin>,
 	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when
 	// recognized.
-	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,
+	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, RuntimeOrigin>,
 	// Native signed account converter; this just converts an `AccountId32` origin into a normal
-	// `Origin::Signed` origin of the same 32-byte value.
-	SignedAccountId32AsNative<RelayNetwork, Origin>,
+	// `RuntimeOrigin::Signed` origin of the same 32-byte value.
+	SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,
 	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
-	XcmPassthrough<Origin>,
+	XcmPassthrough<RuntimeOrigin>,
 );
 
 parameter_types! {
@@ -339,7 +340,7 @@ impl xcm_executor::Config for XcmConfig {
 }
 
 /// No local origins on this chain are allowed to dispatch XCM sends/executions.
-pub type LocalOriginToLocation = SignedToAccountId32<Origin, AccountId, RelayNetwork>;
+pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
 
 /// The means for routing XCM messages which are not for local execution into the right message
 /// queues.
@@ -352,9 +353,9 @@ pub type XcmRouter = (
 
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type SendXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;
+	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	type XcmRouter = XcmRouter;
-	type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;
+	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	type XcmExecuteFilter = Nothing;
 	// ^ Disable dispatchable execute on the XCM pallet.
 	// Needs to be `Everything` for local testing.
@@ -363,7 +364,7 @@ impl pallet_xcm::Config for Runtime {
 	type XcmReserveTransferFilter = Everything;
 	type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;
 	type LocationInverter = LocationInverter<Ancestry>;
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 
 	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
diff --git a/parachains/runtimes/testing/rococo-parachain/Cargo.toml b/parachains/runtimes/testing/rococo-parachain/Cargo.toml
index 2904940f34b..ad77957c46e 100644
--- a/parachains/runtimes/testing/rococo-parachain/Cargo.toml
+++ b/parachains/runtimes/testing/rococo-parachain/Cargo.toml
@@ -8,7 +8,7 @@ description = "Simple runtime used by the rococo parachain(s)"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.144", optional = true, features = ["derive"] }
 
 # Substrate
diff --git a/parachains/runtimes/testing/rococo-parachain/src/lib.rs b/parachains/runtimes/testing/rococo-parachain/src/lib.rs
index 96ba3bdef2b..e5d75c3493d 100644
--- a/parachains/runtimes/testing/rococo-parachain/src/lib.rs
+++ b/parachains/runtimes/testing/rococo-parachain/src/lib.rs
@@ -38,11 +38,13 @@ use sp_version::RuntimeVersion;
 
 // A few exports that help ease life for downstream crates.
 pub use frame_support::{
-	construct_runtime, match_types, parameter_types,
+	construct_runtime,
+	dispatch::DispatchClass,
+	match_types, parameter_types,
 	traits::{EitherOfDiverse, Everything, IsInVec, Randomness},
 	weights::{
 		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
-		ConstantMultiplier, DispatchClass, IdentityFee, Weight,
+		ConstantMultiplier, IdentityFee, Weight,
 	},
 	StorageValue,
 };
@@ -180,7 +182,7 @@ impl frame_system::Config for Runtime {
 	/// The ubiquitous event type.
 	type RuntimeEvent = RuntimeEvent;
 	/// The ubiquitous origin type.
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
 	type BlockHashCount = BlockHashCount;
 	/// Runtime version.
@@ -277,7 +279,7 @@ impl cumulus_pallet_aura_ext::Config for Runtime {}
 parameter_types! {
 	pub const RocLocation: MultiLocation = MultiLocation::parent();
 	pub const RococoNetwork: NetworkId = NetworkId::Polkadot;
-	pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();
+	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
 	pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
 	pub CheckingAccount: AccountId = PolkadotXcm::check_account();
 }
@@ -339,21 +341,21 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location
 	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for
 	// foreign chains who want to have a local sovereign account on this chain which they control.
-	SovereignSignedViaLocation<LocationToAccountId, Origin>,
+	SovereignSignedViaLocation<LocationToAccountId, RuntimeOrigin>,
 	// Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when
 	// recognised.
-	RelayChainAsNative<RelayChainOrigin, Origin>,
+	RelayChainAsNative<RelayChainOrigin, RuntimeOrigin>,
 	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when
 	// recognised.
-	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,
+	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, RuntimeOrigin>,
 	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a
 	// transaction from the Root origin.
-	ParentAsSuperuser<Origin>,
+	ParentAsSuperuser<RuntimeOrigin>,
 	// Native signed account converter; this just converts an `AccountId32` origin into a normal
-	// `Origin::Signed` origin of the same 32-byte value.
-	SignedAccountId32AsNative<RococoNetwork, Origin>,
+	// `RuntimeOrigin::Signed` origin of the same 32-byte value.
+	SignedAccountId32AsNative<RococoNetwork, RuntimeOrigin>,
 	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
-	XcmPassthrough<Origin>,
+	XcmPassthrough<RuntimeOrigin>,
 );
 
 parameter_types! {
@@ -416,7 +418,7 @@ impl Config for XcmConfig {
 }
 
 /// Local origins on this chain are allowed to dispatch XCM sends/executions.
-pub type LocalOriginToLocation = SignedToAccountId32<Origin, AccountId, RococoNetwork>;
+pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RococoNetwork>;
 
 /// The means for routing XCM messages which are not for local execution into the right message
 /// queues.
@@ -429,16 +431,16 @@ pub type XcmRouter = (
 
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type SendXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;
+	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	type XcmRouter = XcmRouter;
-	type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;
+	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	type XcmExecuteFilter = Everything;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type XcmTeleportFilter = Everything;
 	type XcmReserveTransferFilter = frame_support::traits::Nothing;
 	type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;
 	type LocationInverter = LocationInverter<Ancestry>;
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
 	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
@@ -468,7 +470,7 @@ impl cumulus_pallet_dmp_queue::Config for Runtime {
 
 impl cumulus_ping::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type XcmSender = XcmRouter;
 }
diff --git a/polkadot-parachain/Cargo.toml b/polkadot-parachain/Cargo.toml
index b1b7ecf9218..2febe33aea4 100644
--- a/polkadot-parachain/Cargo.toml
+++ b/polkadot-parachain/Cargo.toml
@@ -8,7 +8,7 @@ description = "Runs a polkadot parachain node which could be a collator."
 
 [dependencies]
 async-trait = "0.1.57"
-clap = { version = "3.2.20", features = ["derive", "deprecated"] }
+clap = { version = "3.2.22", features = ["derive", "deprecated"] }
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 futures = "0.3.24"
 hex-literal = "0.3.4"
@@ -94,7 +94,7 @@ substrate-build-script-utils = { git = "https://github.com/paritytech/substrate"
 assert_cmd = "2.0"
 nix = "0.25"
 tempfile = "3.3.0"
-tokio = { version = "1.21.0", features = ["macros", "time", "parking_lot"] }
+tokio = { version = "1.21.1", features = ["macros", "time", "parking_lot"] }
 wait-timeout = "0.2"
 # purge_chain_works works with rococo-local and needs to allow this
 polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master", features = ["rococo-native"] }
diff --git a/polkadot-parachain/src/command.rs b/polkadot-parachain/src/command.rs
index e07a8cfed54..0c3fbe67026 100644
--- a/polkadot-parachain/src/command.rs
+++ b/polkadot-parachain/src/command.rs
@@ -572,6 +572,15 @@ pub fn run() -> Result<()> {
 				BenchmarkCmd::Block(cmd) => runner.sync_run(|config| {
 					construct_benchmark_partials!(config, |partials| cmd.run(partials.client))
 				}),
+				#[cfg(not(feature = "runtime-benchmarks"))]
+				BenchmarkCmd::Storage(_) =>
+					return Err(sc_cli::Error::Input(
+						"Compile with --features=runtime-benchmarks \
+						to enable storage benchmarks."
+							.into(),
+					)
+					.into()),
+				#[cfg(feature = "runtime-benchmarks")]
 				BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| {
 					construct_benchmark_partials!(config, |partials| {
 						let db = partials.backend.expose_db();
diff --git a/polkadot-parachain/src/service.rs b/polkadot-parachain/src/service.rs
index a0fdf8050a2..3085804a2b4 100644
--- a/polkadot-parachain/src/service.rs
+++ b/polkadot-parachain/src/service.rs
@@ -710,7 +710,6 @@ pub fn rococo_parachain_build_import_queue(
 		_,
 		_,
 		_,
-		_,
 	>(cumulus_client_consensus_aura::ImportQueueParams {
 		block_import: client.clone(),
 		client,
@@ -726,7 +725,6 @@ pub fn rococo_parachain_build_import_queue(
 			Ok((slot, timestamp))
 		},
 		registry: config.prometheus_registry(),
-		can_author_with: sp_consensus::AlwaysCanAuthor,
 		spawner: &task_manager.spawn_essential_handle(),
 		telemetry,
 	})
@@ -1086,26 +1084,23 @@ where
 	let aura_verifier = move || {
 		let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client2).unwrap();
 
-		Box::new(
-			cumulus_client_consensus_aura::build_verifier::<<AuraId as AppKey>::Pair, _, _, _>(
-				cumulus_client_consensus_aura::BuildVerifierParams {
-					client: client2.clone(),
-					create_inherent_data_providers: move |_, _| async move {
-						let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
+		Box::new(cumulus_client_consensus_aura::build_verifier::<<AuraId as AppKey>::Pair, _, _>(
+			cumulus_client_consensus_aura::BuildVerifierParams {
+				client: client2.clone(),
+				create_inherent_data_providers: move |_, _| async move {
+					let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
 
-						let slot =
+					let slot =
 							sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
 								*timestamp,
 								slot_duration,
 							);
 
-						Ok((slot, timestamp))
-					},
-					can_author_with: sp_consensus::AlwaysCanAuthor,
-					telemetry: telemetry_handle,
+					Ok((slot, timestamp))
 				},
-			),
-		) as Box<_>
+				telemetry: telemetry_handle,
+			},
+		)) as Box<_>
 	};
 
 	let relay_chain_verifier =
@@ -1530,7 +1525,6 @@ pub fn contracts_rococo_build_import_queue(
 		_,
 		_,
 		_,
-		_,
 	>(cumulus_client_consensus_aura::ImportQueueParams {
 		block_import: client.clone(),
 		client,
@@ -1546,7 +1540,6 @@ pub fn contracts_rococo_build_import_queue(
 			Ok((slot, timestamp))
 		},
 		registry: config.prometheus_registry(),
-		can_author_with: sp_consensus::AlwaysCanAuthor,
 		spawner: &task_manager.spawn_essential_handle(),
 		telemetry,
 	})
diff --git a/polkadot-parachain/tests/benchmark_storage_works.rs b/polkadot-parachain/tests/benchmark_storage_works.rs
index df3c7fe9194..916d65c0a1b 100644
--- a/polkadot-parachain/tests/benchmark_storage_works.rs
+++ b/polkadot-parachain/tests/benchmark_storage_works.rs
@@ -1,3 +1,5 @@
+#![cfg(feature = "runtime-benchmarks")]
+
 use assert_cmd::cargo::cargo_bin;
 use std::{
 	path::Path,
diff --git a/primitives/parachain-inherent/Cargo.toml b/primitives/parachain-inherent/Cargo.toml
index e3fc81dec09..ebe971a116d 100644
--- a/primitives/parachain-inherent/Cargo.toml
+++ b/primitives/parachain-inherent/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 [dependencies]
 async-trait = { version = "0.1.57", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive" ] }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 tracing = { version = "0.1.36", optional = true }
 
 # Substrate
diff --git a/primitives/utility/Cargo.toml b/primitives/utility/Cargo.toml
index 6a76740bde1..668e612f2b2 100644
--- a/primitives/utility/Cargo.toml
+++ b/primitives/utility/Cargo.toml
@@ -38,5 +38,7 @@ std = [
 	"polkadot-parachain/std",
 	"polkadot-primitives/std",
 	"cumulus-primitives-core/std",
+	"xcm/std",
+	"xcm-builder/std",
 	"xcm-executor/std",
 ]
diff --git a/test/runtime/Cargo.toml b/test/runtime/Cargo.toml
index 42b78f935a3..6842412e186 100644
--- a/test/runtime/Cargo.toml
+++ b/test/runtime/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.144", optional = true, features = ["derive"] }
 
 # Substrate
diff --git a/test/runtime/src/lib.rs b/test/runtime/src/lib.rs
index 0d5838d0014..ea1800f0762 100644
--- a/test/runtime/src/lib.rs
+++ b/test/runtime/src/lib.rs
@@ -45,11 +45,13 @@ use sp_version::RuntimeVersion;
 
 // A few exports that help ease life for downstream crates.
 pub use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime,
+	dispatch::DispatchClass,
+	parameter_types,
 	traits::Randomness,
 	weights::{
 		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
-		ConstantMultiplier, DispatchClass, IdentityFee, Weight,
+		ConstantMultiplier, IdentityFee, Weight,
 	},
 	StorageValue,
 };
@@ -186,7 +188,7 @@ impl frame_system::Config for Runtime {
 	/// The ubiquitous event type.
 	type RuntimeEvent = RuntimeEvent;
 	/// The ubiquitous origin type.
-	type Origin = Origin;
+	type RuntimeOrigin = RuntimeOrigin;
 	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
 	type BlockHashCount = BlockHashCount;
 	/// Runtime version.
diff --git a/test/service/Cargo.toml b/test/service/Cargo.toml
index ba581d6c874..1a652e96ab5 100644
--- a/test/service/Cargo.toml
+++ b/test/service/Cargo.toml
@@ -10,13 +10,13 @@ path = "src/main.rs"
 
 [dependencies]
 async-trait = "0.1.57"
-clap = { version = "3.2.20", features = ["derive", "deprecated"] }
+clap = { version = "3.2.22", features = ["derive", "deprecated"] }
 codec = { package = "parity-scale-codec", version = "3.0.0" }
-criterion = { version = "0.3.6", features = [ "async_tokio" ] }
+criterion = { version = "0.4.0", features = [ "async_tokio" ] }
 jsonrpsee = { version = "0.15.1", features = ["server"] }
 rand = "0.8.5"
 serde = { version = "1.0.144", features = ["derive"] }
-tokio = { version = "1.21.0", features = ["macros"] }
+tokio = { version = "1.21.1", features = ["macros"] }
 tracing = "0.1.36"
 url = "2.3.1"
 
diff --git a/test/service/src/lib.rs b/test/service/src/lib.rs
index a45b3c8bf1d..53a04d47e6d 100644
--- a/test/service/src/lib.rs
+++ b/test/service/src/lib.rs
@@ -608,7 +608,7 @@ pub fn node_config(
 	is_collator: bool,
 ) -> Result<Configuration, ServiceError> {
 	let base_path = BasePath::new_temp_dir()?;
-	let root = base_path.path().to_path_buf();
+	let root = base_path.path().join(format!("cumulus_test_service_{}", key.to_string()));
 	let role = if is_collator { Role::Authority } else { Role::Full };
 	let key_seed = key.to_seed();
 	let mut spec = Box::new(chain_spec::get_chain_spec(para_id));