diff --git a/.cargo/config.toml b/.cargo/config.toml
index 1b8ffe1a1c82..68a0d7b552dc 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -9,3 +9,7 @@ rustdocflags = [
 CC_x86_64_unknown_linux_musl = { value = ".cargo/musl-gcc", force = true, relative = true }
 CXX_x86_64_unknown_linux_musl = { value = ".cargo/musl-g++", force = true, relative = true }
 CARGO_WORKSPACE_ROOT_DIR = { value = "", relative = true }
+
+[net]
+retry = 5
+# git-fetch-with-cli = true # commented because there is a risk that a runner can be banned by github
diff --git a/.config/taplo.toml b/.config/taplo.toml
index 7cbc1b075125..4b8afc74a52e 100644
--- a/.config/taplo.toml
+++ b/.config/taplo.toml
@@ -40,3 +40,10 @@ keys = ["workspace.dependencies"]
 
 [rule.formatting]
 reorder_keys = true
+
+[[rule]]
+include = ["**/Cargo.toml"]
+keys = ["build-dependencies", "dependencies", "dev-dependencies"]
+
+[rule.formatting]
+reorder_keys = true
diff --git a/.github/scripts/common/lib.sh b/.github/scripts/common/lib.sh
index 00f8c089831e..c9be21e45dcb 100755
--- a/.github/scripts/common/lib.sh
+++ b/.github/scripts/common/lib.sh
@@ -297,7 +297,6 @@ fetch_release_artifacts_from_s3() {
   pwd
   ls -al --color
   popd > /dev/null
-  unset OUTPUT_DIR
 }
 
 # Pass the name of the binary as input, it will
diff --git a/.github/workflows/build-misc.yml b/.github/workflows/build-misc.yml
index c4a7281b9ebc..335c26282027 100644
--- a/.github/workflows/build-misc.yml
+++ b/.github/workflows/build-misc.yml
@@ -20,7 +20,7 @@ jobs:
     uses: ./.github/workflows/reusable-preflight.yml
 
   build-runtimes-polkavm:
-    timeout-minutes: 20
+    timeout-minutes: 60
     needs: [preflight]
     runs-on: ${{ needs.preflight.outputs.RUNNER }}
     container:
@@ -38,11 +38,7 @@ jobs:
         env:
           SUBSTRATE_RUNTIME_TARGET: riscv
         id: required
-        run: |
-          forklift cargo check -p minimal-template-runtime
-          forklift cargo check -p westend-runtime
-          forklift cargo check -p rococo-runtime
-          forklift cargo check -p polkadot-test-runtime
+        run: forklift cargo check -p minimal-template-runtime -p westend-runtime -p rococo-runtime -p polkadot-test-runtime
       - name: Stop all workflows if failed
         if: ${{ failure() && steps.required.conclusion == 'failure' && !github.event.pull_request.head.repo.fork }}
         uses: ./.github/actions/workflow-stopper
diff --git a/.github/workflows/cmd.yml b/.github/workflows/cmd.yml
index b6a50ea0d15e..42b2eab3b9e4 100644
--- a/.github/workflows/cmd.yml
+++ b/.github/workflows/cmd.yml
@@ -400,6 +400,14 @@ jobs:
           name: command-output
           path: /tmp/cmd/command_output.log
 
+      # Generate token for commit, as the earlier token expires after 1 hour, while cmd can take longer
+      - name: Generate token for commit
+        uses: actions/create-github-app-token@v1
+        id: generate_token_commit
+        with:
+          app-id: ${{ secrets.CMD_BOT_APP_ID }}
+          private-key: ${{ secrets.CMD_BOT_APP_KEY }}
+
       - name: Commit changes
         run: |
           if [ -n "$(git status --porcelain)" ]; then
@@ -410,7 +418,7 @@ jobs:
             # Push the results to the target branch
             git remote add \
               github \
-              "https://token:${{ steps.generate_token.outputs.token }}@github.com/${{ github.event.repository.owner.login }}/${{ github.event.repository.name }}.git" || :
+              "https://x-access-token:${{ steps.generate_token_commit.outputs.token }}@github.com/${{ needs.get-pr-branch.outputs.repo }}.git" || :
 
             push_changes() {
               git push github "HEAD:${{ needs.get-pr-branch.outputs.pr-branch }}"
diff --git a/.github/workflows/publish-check-compile.yml b/.github/workflows/publish-check-compile.yml
index ada8635e314e..ce1b2cb231d0 100644
--- a/.github/workflows/publish-check-compile.yml
+++ b/.github/workflows/publish-check-compile.yml
@@ -16,7 +16,7 @@ jobs:
   preflight:
     uses: ./.github/workflows/reusable-preflight.yml
 
-  check-publish:
+  check-publish-compile:
     timeout-minutes: 90
     needs: [preflight]
     runs-on: ${{ needs.preflight.outputs.RUNNER }}
diff --git a/.github/workflows/release-50_publish-docker.yml b/.github/workflows/release-50_publish-docker.yml
index 5c3c3a6e854d..a3c49598d6b1 100644
--- a/.github/workflows/release-50_publish-docker.yml
+++ b/.github/workflows/release-50_publish-docker.yml
@@ -46,7 +46,7 @@ on:
         required: true
 
       stable_tag:
-        description: Tag matching the actual stable release version in the format stableYYMM or stableYYMM-X for patch releases
+        description: Tag matching the actual stable release version in the format polkadpt-stableYYMM(-rcX) or plkadot-stableYYMM-X(-rcX) for patch releases
         required: true
 
 permissions:
@@ -311,9 +311,9 @@ jobs:
           # TODO: The owner should be used below but buildx does not resolve the VARs
           # TODO: It would be good to get rid of this GHA that we don't really need.
           tags: |
-            egorpop/polkadot:${{ steps.fetch-data.outputs.stable }}
-            egorpop/polkadot:latest
-            egorpop/polkadot:${{ needs.fetch-latest-debian-package-version.outputs.polkadot_container_tag }}
+            parity/polkadot:${{ steps.fetch-data.outputs.stable }}
+            parity/polkadot:latest
+            parity/polkadot:${{ needs.fetch-latest-debian-package-version.outputs.polkadot_container_tag }}
           build-args: |
             VCS_REF=${{ github.ref }}
             POLKADOT_VERSION=${{ needs.fetch-latest-debian-package-version.outputs.polkadot_apt_version }}
diff --git a/.gitlab/pipeline/zombienet/polkadot.yml b/.gitlab/pipeline/zombienet/polkadot.yml
index e722239d890c..14a235bcda86 100644
--- a/.gitlab/pipeline/zombienet/polkadot.yml
+++ b/.gitlab/pipeline/zombienet/polkadot.yml
@@ -63,6 +63,8 @@
     LOCAL_SDK_TEST: "/builds/parity/mirrors/polkadot-sdk/polkadot/zombienet-sdk-tests"
     FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1
     RUN_IN_CONTAINER: "1"
+    # don't retry sdk tests
+    NEXTEST_RETRIES: 0
   artifacts:
     name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
     when: always
@@ -190,6 +192,7 @@ zombienet-polkadot-elastic-scaling-0001-basic-3cores-6s-blocks:
       --local-dir="${LOCAL_DIR}/elastic_scaling"
       --test="0002-elastic-scaling-doesnt-break-parachains.zndsl"
 
+
 .zombienet-polkadot-functional-0012-spam-statement-distribution-requests:
   extends:
     - .zombienet-polkadot-common
@@ -397,3 +400,19 @@ zombienet-polkadot-malus-0001-dispute-valid:
     - unset NEXTEST_FAILURE_OUTPUT
     - unset NEXTEST_SUCCESS_OUTPUT
     - cargo nextest run --archive-file ./artifacts/polkadot-zombienet-tests.tar.zst --no-capture -- smoke::coretime_revenue::coretime_revenue_test
+
+zombienet-polkadot-elastic-scaling-slot-based-3cores:
+  extends:
+    - .zombienet-polkadot-common
+  needs:
+    - job: build-polkadot-zombienet-tests
+      artifacts: true
+  before_script:
+    - !reference [ ".zombienet-polkadot-common", "before_script" ]
+    - export POLKADOT_IMAGE="${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
+    - export CUMULUS_IMAGE="docker.io/paritypr/test-parachain:${PIPELINE_IMAGE_TAG}"
+  script:
+    # we want to use `--no-capture` in zombienet tests.
+    - unset NEXTEST_FAILURE_OUTPUT
+    - unset NEXTEST_SUCCESS_OUTPUT
+    - cargo nextest run --archive-file ./artifacts/polkadot-zombienet-tests.tar.zst --no-capture -- elastic_scaling::slot_based_3cores::slot_based_3cores_test
diff --git a/Cargo.lock b/Cargo.lock
index 0731138fbaea..e02ec8a763f5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -841,30 +841,14 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
-[[package]]
-name = "asn1-rs"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
-dependencies = [
- "asn1-rs-derive 0.4.0",
- "asn1-rs-impl 0.1.0",
- "displaydoc",
- "nom",
- "num-traits",
- "rusticata-macros",
- "thiserror",
- "time",
-]
-
 [[package]]
 name = "asn1-rs"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d"
 dependencies = [
- "asn1-rs-derive 0.5.0",
- "asn1-rs-impl 0.2.0",
+ "asn1-rs-derive",
+ "asn1-rs-impl",
  "displaydoc",
  "nom",
  "num-traits",
@@ -873,18 +857,6 @@ dependencies = [
  "time",
 ]
 
-[[package]]
-name = "asn1-rs-derive"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 1.0.109",
- "synstructure 0.12.6",
-]
-
 [[package]]
 name = "asn1-rs-derive"
 version = "0.5.0"
@@ -897,17 +869,6 @@ dependencies = [
  "synstructure 0.13.1",
 ]
 
-[[package]]
-name = "asn1-rs-impl"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "asn1-rs-impl"
 version = "0.2.0"
@@ -1618,6 +1579,19 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "asynchronous-codec"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a860072022177f903e59730004fb5dc13db9275b79bb2aef7ba8ce831956c233"
+dependencies = [
+ "bytes",
+ "futures-sink",
+ "futures-util",
+ "memchr",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "atomic-take"
 version = "1.1.0"
@@ -3276,6 +3250,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chacha"
 version = "0.3.0"
@@ -5906,9 +5886,9 @@ dependencies = [
 
 [[package]]
 name = "data-encoding"
-version = "2.4.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "data-encoding-macro"
@@ -5949,27 +5929,13 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "der-parser"
-version = "8.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
-dependencies = [
- "asn1-rs 0.5.2",
- "displaydoc",
- "nom",
- "num-bigint",
- "num-traits",
- "rusticata-macros",
-]
-
 [[package]]
 name = "der-parser"
 version = "9.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553"
 dependencies = [
- "asn1-rs 0.6.1",
+ "asn1-rs",
  "displaydoc",
  "nom",
  "num-bigint",
@@ -6437,18 +6403,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "enum-as-inner"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "enum-as-inner"
 version = "0.6.0"
@@ -7588,7 +7542,7 @@ dependencies = [
  "macro_magic",
  "parity-scale-codec",
  "pretty_assertions",
- "proc-macro-warning 1.0.0",
+ "proc-macro-warning",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "regex",
@@ -7615,7 +7569,7 @@ dependencies = [
  "frame-support-procedural-tools 13.0.0",
  "itertools 0.11.0",
  "macro_magic",
- "proc-macro-warning 1.0.0",
+ "proc-macro-warning",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -7898,9 +7852,9 @@ dependencies = [
 
 [[package]]
 name = "futures-bounded"
-version = "0.1.0"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b07bbbe7d7e78809544c6f718d875627addc73a7c3582447abc052cd3dc67e0"
+checksum = "91f328e7fb845fc832912fb6a34f40cf6d1888c92f974d1893a54e97b5ff542e"
 dependencies = [
  "futures-timer",
  "futures-util",
@@ -7981,12 +7935,13 @@ dependencies = [
 
 [[package]]
 name = "futures-rustls"
-version = "0.24.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28"
+checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb"
 dependencies = [
  "futures-io",
- "rustls 0.21.7",
+ "rustls 0.23.18",
+ "rustls-pki-types",
 ]
 
 [[package]]
@@ -8008,7 +7963,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 dependencies = [
  "gloo-timers",
- "send_wrapper 0.4.0",
+ "send_wrapper",
 ]
 
 [[package]]
@@ -8471,7 +8426,7 @@ dependencies = [
  "async-trait",
  "cfg-if",
  "data-encoding",
- "enum-as-inner 0.6.0",
+ "enum-as-inner",
  "futures-channel",
  "futures-io",
  "futures-util",
@@ -8479,6 +8434,7 @@ dependencies = [
  "ipnet",
  "once_cell",
  "rand",
+ "socket2 0.5.7",
  "thiserror",
  "tinyvec",
  "tokio",
@@ -8813,17 +8769,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
-[[package]]
-name = "idna"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
 [[package]]
 name = "idna"
 version = "0.4.0"
@@ -9098,7 +9043,7 @@ dependencies = [
  "socket2 0.5.7",
  "widestring",
  "windows-sys 0.48.0",
- "winreg 0.50.0",
+ "winreg",
 ]
 
 [[package]]
@@ -9826,9 +9771,31 @@ dependencies = [
  "futures-timer",
  "getrandom",
  "instant",
- "libp2p-allow-block-list",
- "libp2p-connection-limits",
- "libp2p-core",
+ "libp2p-allow-block-list 0.2.0",
+ "libp2p-connection-limits 0.2.1",
+ "libp2p-core 0.40.1",
+ "libp2p-identity",
+ "libp2p-swarm 0.43.7",
+ "multiaddr 0.18.1",
+ "pin-project",
+ "rw-stream-sink",
+ "thiserror",
+]
+
+[[package]]
+name = "libp2p"
+version = "0.54.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbbe80f9c7e00526cd6b838075b9c171919404a4732cb2fa8ece0a093223bfc4"
+dependencies = [
+ "bytes",
+ "either",
+ "futures",
+ "futures-timer",
+ "getrandom",
+ "libp2p-allow-block-list 0.4.0",
+ "libp2p-connection-limits 0.4.0",
+ "libp2p-core 0.42.0",
  "libp2p-dns",
  "libp2p-identify",
  "libp2p-identity",
@@ -9839,10 +9806,9 @@ dependencies = [
  "libp2p-ping",
  "libp2p-quic",
  "libp2p-request-response",
- "libp2p-swarm",
+ "libp2p-swarm 0.45.1",
  "libp2p-tcp",
  "libp2p-upnp",
- "libp2p-wasm-ext",
  "libp2p-websocket",
  "libp2p-yamux",
  "multiaddr 0.18.1",
@@ -9857,9 +9823,21 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55b46558c5c0bf99d3e2a1a38fd54ff5476ca66dd1737b12466a1824dd219311"
 dependencies = [
- "libp2p-core",
+ "libp2p-core 0.40.1",
  "libp2p-identity",
- "libp2p-swarm",
+ "libp2p-swarm 0.43.7",
+ "void",
+]
+
+[[package]]
+name = "libp2p-allow-block-list"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1027ccf8d70320ed77e984f273bc8ce952f623762cb9bf2d126df73caef8041"
+dependencies = [
+ "libp2p-core 0.42.0",
+ "libp2p-identity",
+ "libp2p-swarm 0.45.1",
  "void",
 ]
 
@@ -9869,9 +9847,21 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f5107ad45cb20b2f6c3628c7b6014b996fcb13a88053f4569c872c6e30abf58"
 dependencies = [
- "libp2p-core",
+ "libp2p-core 0.40.1",
+ "libp2p-identity",
+ "libp2p-swarm 0.43.7",
+ "void",
+]
+
+[[package]]
+name = "libp2p-connection-limits"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d003540ee8baef0d254f7b6bfd79bac3ddf774662ca0abf69186d517ef82ad8"
+dependencies = [
+ "libp2p-core 0.42.0",
  "libp2p-identity",
- "libp2p-swarm",
+ "libp2p-swarm 0.45.1",
  "void",
 ]
 
@@ -9903,42 +9893,70 @@ dependencies = [
  "void",
 ]
 
+[[package]]
+name = "libp2p-core"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a61f26c83ed111104cd820fe9bc3aaabbac5f1652a1d213ed6e900b7918a1298"
+dependencies = [
+ "either",
+ "fnv",
+ "futures",
+ "futures-timer",
+ "libp2p-identity",
+ "multiaddr 0.18.1",
+ "multihash 0.19.1",
+ "multistream-select",
+ "once_cell",
+ "parking_lot 0.12.3",
+ "pin-project",
+ "quick-protobuf 0.8.1",
+ "rand",
+ "rw-stream-sink",
+ "smallvec",
+ "thiserror",
+ "tracing",
+ "unsigned-varint 0.8.0",
+ "void",
+ "web-time",
+]
+
 [[package]]
 name = "libp2p-dns"
-version = "0.40.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6a18db73084b4da2871438f6239fef35190b05023de7656e877c18a00541a3b"
+checksum = "97f37f30d5c7275db282ecd86e54f29dd2176bd3ac656f06abf43bedb21eb8bd"
 dependencies = [
  "async-trait",
  "futures",
- "libp2p-core",
+ "hickory-resolver",
+ "libp2p-core 0.42.0",
  "libp2p-identity",
- "log",
  "parking_lot 0.12.3",
  "smallvec",
- "trust-dns-resolver",
+ "tracing",
 ]
 
 [[package]]
 name = "libp2p-identify"
-version = "0.43.1"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a96638a0a176bec0a4bcaebc1afa8cf909b114477209d7456ade52c61cd9cd"
+checksum = "1711b004a273be4f30202778856368683bd9a83c4c7dcc8f848847606831a4e3"
 dependencies = [
- "asynchronous-codec",
+ "asynchronous-codec 0.7.0",
  "either",
  "futures",
  "futures-bounded",
  "futures-timer",
- "libp2p-core",
+ "libp2p-core 0.42.0",
  "libp2p-identity",
- "libp2p-swarm",
- "log",
+ "libp2p-swarm 0.45.1",
  "lru 0.12.3",
  "quick-protobuf 0.8.1",
  "quick-protobuf-codec",
  "smallvec",
  "thiserror",
+ "tracing",
  "void",
 ]
 
@@ -9962,83 +9980,84 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.44.6"
+version = "0.46.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16ea178dabba6dde6ffc260a8e0452ccdc8f79becf544946692fff9d412fc29d"
+checksum = "ced237d0bd84bbebb7c2cad4c073160dacb4fe40534963c32ed6d4c6bb7702a3"
 dependencies = [
  "arrayvec 0.7.4",
- "asynchronous-codec",
+ "asynchronous-codec 0.7.0",
  "bytes",
  "either",
  "fnv",
  "futures",
+ "futures-bounded",
  "futures-timer",
- "instant",
- "libp2p-core",
+ "libp2p-core 0.42.0",
  "libp2p-identity",
- "libp2p-swarm",
- "log",
+ "libp2p-swarm 0.45.1",
  "quick-protobuf 0.8.1",
  "quick-protobuf-codec",
  "rand",
  "sha2 0.10.8",
  "smallvec",
  "thiserror",
+ "tracing",
  "uint 0.9.5",
- "unsigned-varint 0.7.2",
  "void",
+ "web-time",
 ]
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.44.0"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42a2567c305232f5ef54185e9604579a894fd0674819402bb0ac0246da82f52a"
+checksum = "14b8546b6644032565eb29046b42744aee1e9f261ed99671b2c93fb140dba417"
 dependencies = [
  "data-encoding",
  "futures",
+ "hickory-proto",
  "if-watch",
- "libp2p-core",
+ "libp2p-core 0.42.0",
  "libp2p-identity",
- "libp2p-swarm",
- "log",
+ "libp2p-swarm 0.45.1",
  "rand",
  "smallvec",
  "socket2 0.5.7",
  "tokio",
- "trust-dns-proto 0.22.0",
+ "tracing",
  "void",
 ]
 
 [[package]]
 name = "libp2p-metrics"
-version = "0.13.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239ba7d28f8d0b5d77760dc6619c05c7e88e74ec8fbbe97f856f20a56745e620"
+checksum = "77ebafa94a717c8442d8db8d3ae5d1c6a15e30f2d347e0cd31d057ca72e42566"
 dependencies = [
- "instant",
- "libp2p-core",
+ "futures",
+ "libp2p-core 0.42.0",
  "libp2p-identify",
  "libp2p-identity",
  "libp2p-kad",
  "libp2p-ping",
- "libp2p-swarm",
- "once_cell",
+ "libp2p-swarm 0.45.1",
+ "pin-project",
  "prometheus-client",
+ "web-time",
 ]
 
 [[package]]
 name = "libp2p-noise"
-version = "0.43.2"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2eeec39ad3ad0677551907dd304b2f13f17208ccebe333bef194076cd2e8921"
+checksum = "36b137cb1ae86ee39f8e5d6245a296518912014eaa87427d24e6ff58cfc1b28c"
 dependencies = [
+ "asynchronous-codec 0.7.0",
  "bytes",
  "curve25519-dalek 4.1.3",
  "futures",
- "libp2p-core",
+ "libp2p-core 0.42.0",
  "libp2p-identity",
- "log",
  "multiaddr 0.18.1",
  "multihash 0.19.1",
  "once_cell",
@@ -10048,68 +10067,71 @@ dependencies = [
  "snow",
  "static_assertions",
  "thiserror",
+ "tracing",
  "x25519-dalek",
  "zeroize",
 ]
 
 [[package]]
 name = "libp2p-ping"
-version = "0.43.1"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e702d75cd0827dfa15f8fd92d15b9932abe38d10d21f47c50438c71dd1b5dae3"
+checksum = "005a34420359223b974ee344457095f027e51346e992d1e0dcd35173f4cdd422"
 dependencies = [
  "either",
  "futures",
  "futures-timer",
- "instant",
- "libp2p-core",
+ "libp2p-core 0.42.0",
  "libp2p-identity",
- "libp2p-swarm",
- "log",
+ "libp2p-swarm 0.45.1",
  "rand",
+ "tracing",
  "void",
+ "web-time",
 ]
 
 [[package]]
 name = "libp2p-quic"
-version = "0.9.3"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "130d451d83f21b81eb7b35b360bc7972aeafb15177784adc56528db082e6b927"
+checksum = "46352ac5cd040c70e88e7ff8257a2ae2f891a4076abad2c439584a31c15fd24e"
 dependencies = [
  "bytes",
  "futures",
  "futures-timer",
  "if-watch",
- "libp2p-core",
+ "libp2p-core 0.42.0",
  "libp2p-identity",
  "libp2p-tls",
- "log",
  "parking_lot 0.12.3",
- "quinn 0.10.2",
+ "quinn",
  "rand",
- "ring 0.16.20",
- "rustls 0.21.7",
+ "ring 0.17.8",
+ "rustls 0.23.18",
  "socket2 0.5.7",
  "thiserror",
  "tokio",
+ "tracing",
 ]
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.25.3"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8e3b4d67870478db72bac87bfc260ee6641d0734e0e3e275798f089c3fecfd4"
+checksum = "1356c9e376a94a75ae830c42cdaea3d4fe1290ba409a22c809033d1b7dcab0a6"
 dependencies = [
  "async-trait",
  "futures",
- "instant",
- "libp2p-core",
+ "futures-bounded",
+ "futures-timer",
+ "libp2p-core 0.42.0",
  "libp2p-identity",
- "libp2p-swarm",
- "log",
+ "libp2p-swarm 0.45.1",
  "rand",
  "smallvec",
+ "tracing",
  "void",
+ "web-time",
 ]
 
 [[package]]
@@ -10123,26 +10145,47 @@ dependencies = [
  "futures",
  "futures-timer",
  "instant",
- "libp2p-core",
+ "libp2p-core 0.40.1",
  "libp2p-identity",
- "libp2p-swarm-derive",
  "log",
  "multistream-select",
  "once_cell",
  "rand",
  "smallvec",
+ "void",
+]
+
+[[package]]
+name = "libp2p-swarm"
+version = "0.45.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7dd6741793d2c1fb2088f67f82cf07261f25272ebe3c0b0c311e0c6b50e851a"
+dependencies = [
+ "either",
+ "fnv",
+ "futures",
+ "futures-timer",
+ "libp2p-core 0.42.0",
+ "libp2p-identity",
+ "libp2p-swarm-derive",
+ "lru 0.12.3",
+ "multistream-select",
+ "once_cell",
+ "rand",
+ "smallvec",
  "tokio",
+ "tracing",
  "void",
+ "web-time",
 ]
 
 [[package]]
 name = "libp2p-swarm-derive"
-version = "0.33.0"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4d5ec2a3df00c7836d7696c136274c9c59705bac69133253696a6c932cd1d74"
+checksum = "206e0aa0ebe004d778d79fb0966aa0de996c19894e2c0605ba2f8524dd4443d8"
 dependencies = [
- "heck 0.4.1",
- "proc-macro-warning 0.4.2",
+ "heck 0.5.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "syn 2.0.87",
@@ -10150,102 +10193,90 @@ dependencies = [
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.40.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b558dd40d1bcd1aaaed9de898e9ec6a436019ecc2420dd0016e712fbb61c5508"
+checksum = "ad964f312c59dcfcac840acd8c555de8403e295d39edf96f5240048b5fcaa314"
 dependencies = [
  "futures",
  "futures-timer",
  "if-watch",
  "libc",
- "libp2p-core",
+ "libp2p-core 0.42.0",
  "libp2p-identity",
- "log",
  "socket2 0.5.7",
  "tokio",
+ "tracing",
 ]
 
 [[package]]
 name = "libp2p-tls"
-version = "0.2.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8218d1d5482b122ccae396bbf38abdcb283ecc96fa54760e1dfd251f0546ac61"
+checksum = "47b23dddc2b9c355f73c1e36eb0c3ae86f7dc964a3715f0731cfad352db4d847"
 dependencies = [
  "futures",
  "futures-rustls",
- "libp2p-core",
+ "libp2p-core 0.42.0",
  "libp2p-identity",
- "rcgen",
- "ring 0.16.20",
- "rustls 0.21.7",
+ "rcgen 0.11.3",
+ "ring 0.17.8",
+ "rustls 0.23.18",
  "rustls-webpki 0.101.4",
  "thiserror",
- "x509-parser 0.15.1",
+ "x509-parser",
  "yasna",
 ]
 
 [[package]]
 name = "libp2p-upnp"
-version = "0.1.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82775a47b34f10f787ad3e2a22e2c1541e6ebef4fe9f28f3ac553921554c94c1"
+checksum = "01bf2d1b772bd3abca049214a3304615e6a36fa6ffc742bdd1ba774486200b8f"
 dependencies = [
  "futures",
  "futures-timer",
  "igd-next",
- "libp2p-core",
- "libp2p-swarm",
- "log",
+ "libp2p-core 0.42.0",
+ "libp2p-swarm 0.45.1",
  "tokio",
+ "tracing",
  "void",
 ]
 
-[[package]]
-name = "libp2p-wasm-ext"
-version = "0.40.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e5d8e3a9e07da0ef5b55a9f26c009c8fb3c725d492d8bb4b431715786eea79c"
-dependencies = [
- "futures",
- "js-sys",
- "libp2p-core",
- "send_wrapper 0.6.0",
- "wasm-bindgen",
- "wasm-bindgen-futures",
-]
-
 [[package]]
 name = "libp2p-websocket"
-version = "0.42.2"
+version = "0.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "004ee9c4a4631435169aee6aad2f62e3984dc031c43b6d29731e8e82a016c538"
+checksum = "888b2ff2e5d8dcef97283daab35ad1043d18952b65e05279eecbe02af4c6e347"
 dependencies = [
  "either",
  "futures",
  "futures-rustls",
- "libp2p-core",
+ "libp2p-core 0.42.0",
  "libp2p-identity",
- "log",
  "parking_lot 0.12.3",
  "pin-project-lite",
  "rw-stream-sink",
  "soketto 0.8.0",
  "thiserror",
+ "tracing",
  "url",
  "webpki-roots 0.25.2",
 ]
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.44.1"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eedcb62824c4300efb9cfd4e2a6edaf3ca097b9e68b36dabe45a44469fd6a85"
+checksum = "788b61c80789dba9760d8c669a5bedb642c8267555c803fabd8396e4ca5c5882"
 dependencies = [
+ "either",
  "futures",
- "libp2p-core",
- "log",
+ "libp2p-core 0.42.0",
  "thiserror",
- "yamux",
+ "tracing",
+ "yamux 0.12.1",
+ "yamux 0.13.3",
 ]
 
 [[package]]
@@ -10431,7 +10462,7 @@ dependencies = [
  "prost 0.12.6",
  "prost-build",
  "rand",
- "rcgen",
+ "rcgen 0.10.0",
  "ring 0.16.20",
  "rustls 0.20.9",
  "serde",
@@ -10451,7 +10482,7 @@ dependencies = [
  "unsigned-varint 0.8.0",
  "url",
  "x25519-dalek",
- "x509-parser 0.16.0",
+ "x509-parser",
  "yasna",
  "zeroize",
 ]
@@ -10644,12 +10675,6 @@ dependencies = [
  "regex-automata 0.1.10",
 ]
 
-[[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-
 [[package]]
 name = "matrixmultiply"
 version = "0.3.7"
@@ -11248,14 +11273,13 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
 dependencies = [
  "bitflags 1.3.2",
  "cfg-if",
  "libc",
- "static_assertions",
 ]
 
 [[package]]
@@ -11271,13 +11295,13 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
- "cfg_aliases",
+ "cfg_aliases 0.2.1",
  "libc",
 ]
 
@@ -11652,22 +11676,13 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "oid-registry"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff"
-dependencies = [
- "asn1-rs 0.5.2",
-]
-
 [[package]]
 name = "oid-registry"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c958dd45046245b9c3c2547369bb634eb461670b2e7e0de552905801a648d1d"
 dependencies = [
- "asn1-rs 0.6.1",
+ "asn1-rs",
 ]
 
 [[package]]
@@ -12106,14 +12121,10 @@ dependencies = [
 name = "pallet-atomic-swap"
 version = "28.0.0"
 dependencies = [
- "frame-support 28.0.0",
- "frame-system 28.0.0",
  "pallet-balances 28.0.0",
  "parity-scale-codec",
+ "polkadot-sdk-frame 0.1.0",
  "scale-info",
- "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
 ]
 
 [[package]]
@@ -14812,7 +14823,6 @@ version = "0.1.0"
 dependencies = [
  "array-bytes",
  "assert_matches",
- "bitflags 1.3.2",
  "derive_more 0.99.17",
  "environmental",
  "ethereum-types 0.15.1",
@@ -14833,7 +14843,7 @@ dependencies = [
  "pallet-utility 28.0.0",
  "parity-scale-codec",
  "paste",
- "polkavm 0.17.0",
+ "polkavm 0.18.0",
  "pretty_assertions",
  "rlp 0.6.1",
  "scale-info",
@@ -14848,7 +14858,6 @@ dependencies = [
  "sp-runtime 31.0.1",
  "sp-std 14.0.0",
  "sp-tracing 16.0.0",
- "sp-weights 27.0.0",
  "staging-xcm 7.0.0",
  "staging-xcm-builder 7.0.0",
  "subxt-signer",
@@ -14895,7 +14904,6 @@ dependencies = [
  "ethabi",
  "futures",
  "hex",
- "hex-literal",
  "jsonrpsee",
  "log",
  "pallet-revive 0.1.0",
@@ -14906,12 +14914,8 @@ dependencies = [
  "sc-rpc",
  "sc-rpc-api",
  "sc-service",
- "scale-info",
- "secp256k1 0.28.2",
- "serde_json",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
- "sp-runtime 31.0.1",
  "sp-weights 27.0.0",
  "static_init",
  "substrate-cli-test-utils",
@@ -14927,12 +14931,9 @@ name = "pallet-revive-fixtures"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "frame-system 28.0.0",
- "log",
- "polkavm-linker 0.17.1",
+ "polkavm-linker 0.18.0",
  "sp-core 28.0.0",
  "sp-io 30.0.0",
- "sp-runtime 31.0.1",
  "toml 0.8.12",
 ]
 
@@ -14961,13 +14962,10 @@ dependencies = [
  "pallet-assets 29.1.0",
  "pallet-balances 28.0.0",
  "pallet-message-queue 31.0.0",
- "pallet-proxy 28.0.0",
  "pallet-revive 0.1.0",
  "pallet-revive-fixtures 0.1.0",
- "pallet-revive-proc-macro 0.1.0",
  "pallet-revive-uapi 0.1.0",
  "pallet-timestamp 27.0.0",
- "pallet-utility 28.0.0",
  "pallet-xcm 7.0.0",
  "parity-scale-codec",
  "polkadot-parachain-primitives 6.0.0",
@@ -14975,10 +14973,8 @@ dependencies = [
  "polkadot-runtime-parachains 7.0.0",
  "pretty_assertions",
  "scale-info",
- "sp-api 26.0.0",
  "sp-core 28.0.0",
  "sp-io 30.0.0",
- "sp-keystore 0.34.0",
  "sp-runtime 31.0.1",
  "sp-tracing 16.0.0",
  "staging-xcm 7.0.0",
@@ -15047,9 +15043,10 @@ name = "pallet-revive-uapi"
 version = "0.1.0"
 dependencies = [
  "bitflags 1.3.2",
+ "pallet-revive-proc-macro 0.1.0",
  "parity-scale-codec",
  "paste",
- "polkavm-derive 0.17.0",
+ "polkavm-derive 0.18.0",
  "scale-info",
 ]
 
@@ -17062,7 +17059,7 @@ version = "6.0.0"
 dependencies = [
  "assert_cmd",
  "color-eyre",
- "nix 0.28.0",
+ "nix 0.29.0",
  "polkadot-cli",
  "polkadot-core-primitives 7.0.0",
  "polkadot-node-core-pvf",
@@ -17811,7 +17808,7 @@ dependencies = [
  "futures",
  "landlock",
  "libc",
- "nix 0.28.0",
+ "nix 0.29.0",
  "parity-scale-codec",
  "polkadot-parachain-primitives 6.0.0",
  "polkadot-primitives 7.0.0",
@@ -17836,7 +17833,7 @@ dependencies = [
  "cfg-if",
  "cpu-time",
  "libc",
- "nix 0.28.0",
+ "nix 0.29.0",
  "parity-scale-codec",
  "polkadot-node-core-pvf-common",
  "polkadot-node-primitives",
@@ -17854,7 +17851,7 @@ dependencies = [
  "cfg-if",
  "criterion",
  "libc",
- "nix 0.28.0",
+ "nix 0.29.0",
  "parity-scale-codec",
  "polkadot-node-core-pvf-common",
  "polkadot-node-primitives",
@@ -18107,7 +18104,7 @@ dependencies = [
  "futures-timer",
  "jsonrpsee",
  "log",
- "nix 0.28.0",
+ "nix 0.29.0",
  "pallet-transaction-payment 28.0.0",
  "pallet-transaction-payment-rpc",
  "pallet-transaction-payment-rpc-runtime-api 28.0.0",
@@ -18142,7 +18139,6 @@ dependencies = [
  "sp-crypto-hashing 0.1.0",
  "sp-genesis-builder 0.8.0",
  "sp-inherents 26.0.0",
- "sp-io 30.0.0",
  "sp-keystore 0.34.0",
  "sp-runtime 31.0.1",
  "sp-session 27.0.0",
@@ -18150,7 +18146,6 @@ dependencies = [
  "sp-timestamp 26.0.0",
  "sp-transaction-pool 26.0.0",
  "sp-version 29.0.0",
- "sp-wasm-interface 20.0.0",
  "sp-weights 27.0.0",
  "substrate-frame-rpc-system",
  "substrate-prometheus-endpoint",
@@ -19896,15 +19891,15 @@ dependencies = [
 
 [[package]]
 name = "polkavm"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84979be196ba2855f73616413e7b1d18258128aa396b3dc23f520a00a807720e"
+checksum = "dd044ab1d3b11567ab6b98ca71259a992b4034220d5972988a0e96518e5d343d"
 dependencies = [
  "libc",
  "log",
- "polkavm-assembler 0.17.0",
- "polkavm-common 0.17.0",
- "polkavm-linux-raw 0.17.0",
+ "polkavm-assembler 0.18.0",
+ "polkavm-common 0.18.0",
+ "polkavm-linux-raw 0.18.0",
 ]
 
 [[package]]
@@ -19927,9 +19922,9 @@ dependencies = [
 
 [[package]]
 name = "polkavm-assembler"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ba7b434ff630b0f73a1560e8baea807246ca22098abe49f97821e0e2d2accc4"
+checksum = "eaad38dc420bfed79e6f731471c973ce5ff5e47ab403e63cf40358fef8a6368f"
 dependencies = [
  "log",
 ]
@@ -19961,12 +19956,12 @@ dependencies = [
 
 [[package]]
 name = "polkavm-common"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f0dbafef4ab6ceecb4982ac3b550df430ef4f9fdbf07c108b7d4f91a0682fce"
+checksum = "31ff33982a807d8567645d4784b9b5d7ab87bcb494f534a57cadd9012688e102"
 dependencies = [
  "log",
- "polkavm-assembler 0.17.0",
+ "polkavm-assembler 0.18.0",
 ]
 
 [[package]]
@@ -19998,11 +19993,11 @@ dependencies = [
 
 [[package]]
 name = "polkavm-derive"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0c3dbb6c8c7bd3e5f5b05aa7fc9355acf14df7ce5d392911e77d01090a38d0d"
+checksum = "c2eb703f3b6404c13228402e98a5eae063fd16b8f58afe334073ec105ee4117e"
 dependencies = [
- "polkavm-derive-impl-macro 0.17.0",
+ "polkavm-derive-impl-macro 0.18.0",
 ]
 
 [[package]]
@@ -20043,11 +20038,11 @@ dependencies = [
 
 [[package]]
 name = "polkavm-derive-impl"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42565aed4adbc4034612d0b17dea8db3681fb1bd1aed040d6edc5455a9f478a1"
+checksum = "12d2840cc62a0550156b1676fed8392271ddf2fab4a00661db56231424674624"
 dependencies = [
- "polkavm-common 0.17.0",
+ "polkavm-common 0.18.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "syn 2.0.87",
@@ -20085,11 +20080,11 @@ dependencies = [
 
 [[package]]
 name = "polkavm-derive-impl-macro"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d9838e95241b0bce4fe269cdd4af96464160505840ed5a8ac8536119ba19e2"
+checksum = "48c16669ddc7433e34c1007d31080b80901e3e8e523cb9d4b441c3910cf9294b"
 dependencies = [
- "polkavm-derive-impl 0.17.0",
+ "polkavm-derive-impl 0.18.0",
  "syn 2.0.87",
 ]
 
@@ -20125,16 +20120,16 @@ dependencies = [
 
 [[package]]
 name = "polkavm-linker"
-version = "0.17.1"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0422ead3030d5cde69e2206dbc7d65da872b121876507cd5363f6c6e6aa45157"
+checksum = "e9bfe793b094d9ea5c99b7c43ba46e277b0f8f48f4bbfdbabf8d3ebf701a4bd3"
 dependencies = [
  "dirs",
  "gimli 0.31.1",
  "hashbrown 0.14.5",
  "log",
  "object 0.36.1",
- "polkavm-common 0.17.0",
+ "polkavm-common 0.18.0",
  "regalloc2 0.9.3",
  "rustc-demangle",
 ]
@@ -20153,9 +20148,9 @@ checksum = "26e45fa59c7e1bb12ef5289080601e9ec9b31435f6e32800a5c90c132453d126"
 
 [[package]]
 name = "polkavm-linux-raw"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64c3d93a58ffbc3099d1227f0da9675a025a9ea6c917038f266920c1de1e568"
+checksum = "23eff02c070c70f31878a3d915e88a914ecf3e153741e2fb572dde28cce20fde"
 
 [[package]]
 name = "polling"
@@ -20242,7 +20237,7 @@ dependencies = [
  "findshlibs",
  "libc",
  "log",
- "nix 0.26.2",
+ "nix 0.26.4",
  "once_cell",
  "parking_lot 0.12.3",
  "smallvec",
@@ -20449,17 +20444,6 @@ version = "0.5.20+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
-[[package]]
-name = "proc-macro-warning"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.87",
-]
-
 [[package]]
 name = "proc-macro-warning"
 version = "1.0.0"
@@ -20531,9 +20515,9 @@ dependencies = [
 
 [[package]]
 name = "prometheus-client"
-version = "0.21.2"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c99afa9a01501019ac3a14d71d9f94050346f55ca471ce90c799a15c58f61e2"
+checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca"
 dependencies = [
  "dtoa",
  "itoa",
@@ -20704,7 +20688,7 @@ dependencies = [
  "log",
  "names",
  "prost 0.11.9",
- "reqwest 0.11.20",
+ "reqwest 0.11.27",
  "thiserror",
  "url",
  "winapi",
@@ -20764,15 +20748,15 @@ dependencies = [
 
 [[package]]
 name = "quick-protobuf-codec"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ededb1cd78531627244d51dd0c7139fbe736c7d57af0092a76f0ffb2f56e98"
+checksum = "15a0580ab32b169745d7a39db2ba969226ca16738931be152a3209b409de2474"
 dependencies = [
- "asynchronous-codec",
+ "asynchronous-codec 0.7.0",
  "bytes",
  "quick-protobuf 0.8.1",
  "thiserror",
- "unsigned-varint 0.7.2",
+ "unsigned-varint 0.8.0",
 ]
 
 [[package]]
@@ -20797,24 +20781,6 @@ dependencies = [
  "rand",
 ]
 
-[[package]]
-name = "quinn"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75"
-dependencies = [
- "bytes",
- "futures-io",
- "pin-project-lite",
- "quinn-proto 0.10.6",
- "quinn-udp 0.4.1",
- "rustc-hash 1.1.0",
- "rustls 0.21.7",
- "thiserror",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "quinn"
 version = "0.11.5"
@@ -20822,9 +20788,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
 dependencies = [
  "bytes",
+ "futures-io",
  "pin-project-lite",
- "quinn-proto 0.11.8",
- "quinn-udp 0.5.4",
+ "quinn-proto",
+ "quinn-udp",
  "rustc-hash 2.0.0",
  "rustls 0.23.18",
  "socket2 0.5.7",
@@ -20833,23 +20800,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "quinn-proto"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a"
-dependencies = [
- "bytes",
- "rand",
- "ring 0.16.20",
- "rustc-hash 1.1.0",
- "rustls 0.21.7",
- "slab",
- "thiserror",
- "tinyvec",
- "tracing",
-]
-
 [[package]]
 name = "quinn-proto"
 version = "0.11.8"
@@ -20858,7 +20808,7 @@ checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
 dependencies = [
  "bytes",
  "rand",
- "ring 0.17.7",
+ "ring 0.17.8",
  "rustc-hash 2.0.0",
  "rustls 0.23.18",
  "slab",
@@ -20867,19 +20817,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "quinn-udp"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7"
-dependencies = [
- "bytes",
- "libc",
- "socket2 0.5.7",
- "tracing",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "quinn-udp"
 version = "0.5.4"
@@ -21049,6 +20986,18 @@ dependencies = [
  "yasna",
 ]
 
+[[package]]
+name = "rcgen"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52c4f3084aa3bc7dfbba4eff4fab2a54db4324965d8872ab933565e6fbd83bc6"
+dependencies = [
+ "pem 3.0.4",
+ "ring 0.16.20",
+ "time",
+ "yasna",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
@@ -21283,9 +21232,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.20"
+version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
  "base64 0.21.7",
  "bytes",
@@ -21311,6 +21260,8 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
+ "sync_wrapper 0.1.2",
+ "system-configuration",
  "tokio",
  "tokio-native-tls",
  "tokio-rustls 0.24.1",
@@ -21320,14 +21271,14 @@ dependencies = [
  "wasm-bindgen-futures",
  "web-sys",
  "webpki-roots 0.25.2",
- "winreg 0.50.0",
+ "winreg",
 ]
 
 [[package]]
 name = "reqwest"
-version = "0.12.5"
+version = "0.12.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -21347,14 +21298,14 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "quinn 0.11.5",
+ "quinn",
  "rustls 0.23.18",
  "rustls-pemfile 2.0.0",
  "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper",
+ "sync_wrapper 1.0.1",
  "tokio",
  "tokio-rustls 0.26.0",
  "tower-service",
@@ -21363,7 +21314,7 @@ dependencies = [
  "wasm-bindgen-futures",
  "web-sys",
  "webpki-roots 0.26.3",
- "winreg 0.52.0",
+ "windows-registry",
 ]
 
 [[package]]
@@ -21420,16 +21371,17 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.7"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
+ "cfg-if",
  "getrandom",
  "libc",
  "spin 0.9.8",
  "untrusted 0.9.0",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -21943,7 +21895,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
 dependencies = [
  "log",
- "ring 0.17.7",
+ "ring 0.17.8",
  "rustls-pki-types",
  "rustls-webpki 0.102.8",
  "subtle 2.5.0",
@@ -21958,7 +21910,7 @@ checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f"
 dependencies = [
  "log",
  "once_cell",
- "ring 0.17.7",
+ "ring 0.17.8",
  "rustls-pki-types",
  "rustls-webpki 0.102.8",
  "subtle 2.5.0",
@@ -22071,7 +22023,7 @@ version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
- "ring 0.17.7",
+ "ring 0.17.8",
  "rustls-pki-types",
  "untrusted 0.9.0",
 ]
@@ -22882,7 +22834,7 @@ dependencies = [
 name = "sc-executor-common"
 version = "0.29.0"
 dependencies = [
- "polkavm 0.9.3",
+ "polkavm 0.18.0",
  "sc-allocator 23.0.0",
  "sp-maybe-compressed-blob 11.0.0",
  "sp-wasm-interface 20.0.0",
@@ -22923,7 +22875,7 @@ name = "sc-executor-polkavm"
 version = "0.29.0"
 dependencies = [
  "log",
- "polkavm 0.9.3",
+ "polkavm 0.18.0",
  "sc-executor-common 0.29.0",
  "sp-wasm-interface 20.0.0",
 ]
@@ -23080,7 +23032,7 @@ dependencies = [
  "assert_matches",
  "async-channel 1.9.0",
  "async-trait",
- "asynchronous-codec",
+ "asynchronous-codec 0.6.2",
  "bytes",
  "cid 0.9.0",
  "criterion",
@@ -23089,7 +23041,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "ip_network",
- "libp2p",
+ "libp2p 0.54.1",
  "linked_hash_set",
  "litep2p",
  "log",
@@ -23265,7 +23217,7 @@ dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
- "libp2p",
+ "libp2p 0.54.1",
  "log",
  "parking_lot 0.12.3",
  "rand",
@@ -23723,7 +23675,7 @@ version = "15.0.0"
 dependencies = [
  "chrono",
  "futures",
- "libp2p",
+ "libp2p 0.54.1",
  "log",
  "parking_lot 0.12.3",
  "pin-project",
@@ -24274,12 +24226,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
 
-[[package]]
-name = "send_wrapper"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
-
 [[package]]
 name = "separator"
 version = "0.4.1"
@@ -24883,7 +24829,7 @@ dependencies = [
  "chacha20poly1305",
  "curve25519-dalek 4.1.3",
  "rand_core 0.6.4",
- "ring 0.17.7",
+ "ring 0.17.8",
  "rustc_version 0.4.0",
  "sha2 0.10.8",
  "subtle 2.5.0",
@@ -26714,7 +26660,7 @@ dependencies = [
  "libsecp256k1",
  "log",
  "parity-scale-codec",
- "polkavm-derive 0.17.0",
+ "polkavm-derive 0.18.0",
  "rustversion",
  "secp256k1 0.28.2",
  "sp-core 28.0.0",
@@ -27198,7 +27144,7 @@ dependencies = [
  "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec",
- "polkavm-derive 0.17.0",
+ "polkavm-derive 0.18.0",
  "primitive-types 0.13.1",
  "rustversion",
  "sp-core 28.0.0",
@@ -27903,7 +27849,7 @@ name = "sp-version-proc-macro"
 version = "13.0.0"
 dependencies = [
  "parity-scale-codec",
- "proc-macro-warning 1.0.0",
+ "proc-macro-warning",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "sp-version 29.0.0",
@@ -28107,7 +28053,7 @@ dependencies = [
  "jsonrpsee",
  "kitchensink-runtime",
  "log",
- "nix 0.28.0",
+ "nix 0.29.0",
  "node-primitives",
  "node-rpc",
  "node-testing",
@@ -28330,7 +28276,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6"
 dependencies = [
  "bitflags 1.3.2",
- "cfg_aliases",
+ "cfg_aliases 0.1.1",
  "libc",
  "parking_lot 0.11.2",
  "parking_lot_core 0.8.6",
@@ -28344,7 +28290,7 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf"
 dependencies = [
- "cfg_aliases",
+ "cfg_aliases 0.1.1",
  "memchr",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
@@ -28535,7 +28481,7 @@ version = "0.1.0"
 dependencies = [
  "assert_cmd",
  "futures",
- "nix 0.28.0",
+ "nix 0.29.0",
  "node-primitives",
  "regex",
  "sc-cli",
@@ -28842,7 +28788,7 @@ dependencies = [
  "merkleized-metadata",
  "parity-scale-codec",
  "parity-wasm",
- "polkavm-linker 0.17.1",
+ "polkavm-linker 0.18.0",
  "sc-executor 0.32.0",
  "shlex",
  "sp-core 28.0.0",
@@ -28908,7 +28854,7 @@ dependencies = [
  "log",
  "num-format",
  "rand",
- "reqwest 0.12.5",
+ "reqwest 0.12.9",
  "scale-info",
  "semver 1.0.18",
  "serde",
@@ -29241,11 +29187,20 @@ dependencies = [
  "syn 2.0.87",
 ]
 
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
 [[package]]
 name = "sync_wrapper"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+dependencies = [
+ "futures-core",
+]
 
 [[package]]
 name = "synstructure"
@@ -30182,78 +30137,6 @@ dependencies = [
  "keccak-hasher",
 ]
 
-[[package]]
-name = "trust-dns-proto"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26"
-dependencies = [
- "async-trait",
- "cfg-if",
- "data-encoding",
- "enum-as-inner 0.5.1",
- "futures-channel",
- "futures-io",
- "futures-util",
- "idna 0.2.3",
- "ipnet",
- "lazy_static",
- "rand",
- "smallvec",
- "socket2 0.4.9",
- "thiserror",
- "tinyvec",
- "tokio",
- "tracing",
- "url",
-]
-
-[[package]]
-name = "trust-dns-proto"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374"
-dependencies = [
- "async-trait",
- "cfg-if",
- "data-encoding",
- "enum-as-inner 0.6.0",
- "futures-channel",
- "futures-io",
- "futures-util",
- "idna 0.4.0",
- "ipnet",
- "once_cell",
- "rand",
- "smallvec",
- "thiserror",
- "tinyvec",
- "tokio",
- "tracing",
- "url",
-]
-
-[[package]]
-name = "trust-dns-resolver"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6"
-dependencies = [
- "cfg-if",
- "futures-util",
- "ipconfig",
- "lru-cache",
- "once_cell",
- "parking_lot 0.12.3",
- "rand",
- "resolv-conf",
- "smallvec",
- "thiserror",
- "tokio",
- "tracing",
- "trust-dns-proto 0.23.2",
-]
-
 [[package]]
 name = "try-lock"
 version = "0.2.4"
@@ -30463,7 +30346,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105"
 dependencies = [
- "asynchronous-codec",
+ "asynchronous-codec 0.6.2",
  "bytes",
  "futures-io",
  "futures-util",
@@ -31212,7 +31095,7 @@ version = "0.22.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
 dependencies = [
- "ring 0.17.7",
+ "ring 0.17.8",
  "untrusted 0.9.0",
 ]
 
@@ -31505,6 +31388,36 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.45.0"
@@ -31747,16 +31660,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -31778,35 +31681,18 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "x509-parser"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da"
-dependencies = [
- "asn1-rs 0.5.2",
- "data-encoding",
- "der-parser 8.2.0",
- "lazy_static",
- "nom",
- "oid-registry 0.6.1",
- "rusticata-macros",
- "thiserror",
- "time",
-]
-
 [[package]]
 name = "x509-parser"
 version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69"
 dependencies = [
- "asn1-rs 0.6.1",
+ "asn1-rs",
  "data-encoding",
- "der-parser 9.0.0",
+ "der-parser",
  "lazy_static",
  "nom",
- "oid-registry 0.7.0",
+ "oid-registry",
  "rusticata-macros",
  "thiserror",
  "time",
@@ -32096,6 +31982,22 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "yamux"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a31b5e376a8b012bee9c423acdbb835fc34d45001cfa3106236a624e4b738028"
+dependencies = [
+ "futures",
+ "log",
+ "nohash-hasher",
+ "parking_lot 0.12.3",
+ "pin-project",
+ "rand",
+ "static_assertions",
+ "web-time",
+]
+
 [[package]]
 name = "yansi"
 version = "0.5.1"
@@ -32163,7 +32065,7 @@ version = "1.0.0"
 dependencies = [
  "futures-util",
  "parity-scale-codec",
- "reqwest 0.11.20",
+ "reqwest 0.12.9",
  "serde",
  "serde_json",
  "thiserror",
@@ -32175,15 +32077,15 @@ dependencies = [
 
 [[package]]
 name = "zombienet-configuration"
-version = "0.2.16"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad4fc5b0f1aa54de6bf2d6771c449b41cad47e1cf30559af0a71452686b47ab"
+checksum = "d716b3ff8112d98ced15f53b0c72454f8cde533fe2b68bb04379228961efbd80"
 dependencies = [
  "anyhow",
  "lazy_static",
  "multiaddr 0.18.1",
  "regex",
- "reqwest 0.11.20",
+ "reqwest 0.11.27",
  "serde",
  "serde_json",
  "thiserror",
@@ -32195,21 +32097,21 @@ dependencies = [
 
 [[package]]
 name = "zombienet-orchestrator"
-version = "0.2.16"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a7dd25842ded75c7f4dc4f38f05fef567bd0b37fd3057c223d4ee34d8fa817"
+checksum = "4098a7d33b729b59e32c41a87aa4d484bd1b8771a059bbd4edfb4d430b3b2d74"
 dependencies = [
  "anyhow",
  "async-trait",
  "futures",
  "glob-match",
  "hex",
- "libp2p",
+ "libp2p 0.52.4",
  "libsecp256k1",
  "multiaddr 0.18.1",
  "rand",
  "regex",
- "reqwest 0.11.20",
+ "reqwest 0.11.27",
  "serde",
  "serde_json",
  "sha2 0.10.8",
@@ -32228,9 +32130,9 @@ dependencies = [
 
 [[package]]
 name = "zombienet-prom-metrics-parser"
-version = "0.2.16"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a63e0c6024dd19b0f8b28afa94f78c211e5c163350ecda4a48084532d74d7cfe"
+checksum = "961e30be45b34f6ebeabf29ee2f47b0cd191ea62e40c064752572207509a6f5c"
 dependencies = [
  "pest",
  "pest_derive",
@@ -32239,9 +32141,9 @@ dependencies = [
 
 [[package]]
 name = "zombienet-provider"
-version = "0.2.16"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d87c29390a342d0f4f62b6796861fb82e0e56c49929a272b689e8dbf24eaab9"
+checksum = "ab0f7f01780b7c99a6c40539d195d979f234305f32808d547438b50829d44262"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -32252,7 +32154,7 @@ dependencies = [
  "kube",
  "nix 0.27.1",
  "regex",
- "reqwest 0.11.20",
+ "reqwest 0.11.27",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -32270,14 +32172,15 @@ dependencies = [
 
 [[package]]
 name = "zombienet-sdk"
-version = "0.2.16"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829e5111182caf00ba57cd63656cf0bde6ce6add7f6a9747d15821c202a3f27e"
+checksum = "99a3c5f2d657235b3ab7dc384677e63cde21983029e99106766ecd49e9f8d7f3"
 dependencies = [
  "async-trait",
  "futures",
  "lazy_static",
  "subxt",
+ "subxt-signer",
  "tokio",
  "zombienet-configuration",
  "zombienet-orchestrator",
@@ -32287,9 +32190,9 @@ dependencies = [
 
 [[package]]
 name = "zombienet-support"
-version = "0.2.16"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99568384a1d9645458ab9de377b3517cb543a1ece5aba905aeb58d269139df4e"
+checksum = "296f887ea88e07edd771f8e1d0dec5297a58b422f4b884a6292a21ebe03277cb"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -32297,7 +32200,7 @@ dependencies = [
  "nix 0.27.1",
  "rand",
  "regex",
- "reqwest 0.11.20",
+ "reqwest 0.11.27",
  "thiserror",
  "tokio",
  "tracing",
diff --git a/Cargo.toml b/Cargo.toml
index 63f17efb98b5..64a11a340d10 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -841,7 +841,7 @@ kvdb-shared-tests = { version = "0.11.0" }
 landlock = { version = "0.3.0" }
 libc = { version = "0.2.155" }
 libfuzzer-sys = { version = "0.4" }
-libp2p = { version = "0.52.4" }
+libp2p = { version = "0.54.1" }
 libp2p-identity = { version = "0.2.9" }
 libsecp256k1 = { version = "0.7.0", default-features = false }
 linked-hash-map = { version = "0.5.4" }
@@ -871,7 +871,7 @@ multihash = { version = "0.19.1", default-features = false }
 multihash-codetable = { version = "0.1.1" }
 multistream-select = { version = "0.13.0" }
 names = { version = "0.14.0", default-features = false }
-nix = { version = "0.28.0" }
+nix = { version = "0.29.0" }
 node-cli = { path = "substrate/bin/node/cli", package = "staging-node-cli" }
 node-inspect = { path = "substrate/bin/node/inspect", default-features = false, package = "staging-node-inspect" }
 node-primitives = { path = "substrate/bin/node/primitives", default-features = false }
@@ -1089,9 +1089,9 @@ polkadot-subsystem-bench = { path = "polkadot/node/subsystem-bench" }
 polkadot-test-client = { path = "polkadot/node/test/client" }
 polkadot-test-runtime = { path = "polkadot/runtime/test-runtime" }
 polkadot-test-service = { path = "polkadot/node/test/service" }
-polkavm = { version = "0.9.3", default-features = false }
-polkavm-derive = "0.17.0"
-polkavm-linker = "0.17.1"
+polkavm = { version = "0.18.0", default-features = false }
+polkavm-derive = "0.18.0"
+polkavm-linker = "0.18.0"
 portpicker = { version = "0.1.1" }
 pretty_assertions = { version = "1.3.0" }
 primitive-types = { version = "0.13.1", default-features = false, features = [
@@ -1123,7 +1123,7 @@ regex = { version = "1.10.2" }
 relay-substrate-client = { path = "bridges/relays/client-substrate" }
 relay-utils = { path = "bridges/relays/utils" }
 remote-externalities = { path = "substrate/utils/frame/remote-externalities", default-features = false, package = "frame-remote-externalities" }
-reqwest = { version = "0.11", default-features = false }
+reqwest = { version = "0.12.9", default-features = false }
 rlp = { version = "0.6.1", default-features = false }
 rococo-emulated-chain = { path = "cumulus/parachains/integration-tests/emulated/chains/relays/rococo" }
 rococo-parachain-runtime = { path = "cumulus/parachains/runtimes/testing/rococo-parachain" }
@@ -1389,7 +1389,7 @@ xcm-procedural = { path = "polkadot/xcm/procedural", default-features = false }
 xcm-runtime-apis = { path = "polkadot/xcm/xcm-runtime-apis", default-features = false }
 xcm-simulator = { path = "polkadot/xcm/xcm-simulator", default-features = false }
 zeroize = { version = "1.7.0", default-features = false }
-zombienet-sdk = { version = "0.2.16" }
+zombienet-sdk = { version = "0.2.19" }
 zstd = { version = "0.12.4", default-features = false }
 
 [profile.release]
diff --git a/bridges/chains/chain-bridge-hub-cumulus/Cargo.toml b/bridges/chains/chain-bridge-hub-cumulus/Cargo.toml
index 99ba721991ee..b9eb1d2d69c1 100644
--- a/bridges/chains/chain-bridge-hub-cumulus/Cargo.toml
+++ b/bridges/chains/chain-bridge-hub-cumulus/Cargo.toml
@@ -16,14 +16,14 @@ workspace = true
 [dependencies]
 # Bridge Dependencies
 
-bp-polkadot-core = { workspace = true }
 bp-messages = { workspace = true }
+bp-polkadot-core = { workspace = true }
 bp-runtime = { workspace = true }
 
 # Substrate Based Dependencies
 
-frame-system = { workspace = true }
 frame-support = { workspace = true }
+frame-system = { workspace = true }
 sp-api = { workspace = true }
 sp-std = { workspace = true }
 
diff --git a/bridges/chains/chain-bridge-hub-kusama/Cargo.toml b/bridges/chains/chain-bridge-hub-kusama/Cargo.toml
index 39f7b44daa55..136832d0199d 100644
--- a/bridges/chains/chain-bridge-hub-kusama/Cargo.toml
+++ b/bridges/chains/chain-bridge-hub-kusama/Cargo.toml
@@ -17,8 +17,8 @@ workspace = true
 # Bridge Dependencies
 
 bp-bridge-hub-cumulus = { workspace = true }
-bp-runtime = { workspace = true }
 bp-messages = { workspace = true }
+bp-runtime = { workspace = true }
 
 # Substrate Based Dependencies
 
diff --git a/bridges/chains/chain-bridge-hub-polkadot/Cargo.toml b/bridges/chains/chain-bridge-hub-polkadot/Cargo.toml
index 3b0ac96e7cd3..04ce144b7906 100644
--- a/bridges/chains/chain-bridge-hub-polkadot/Cargo.toml
+++ b/bridges/chains/chain-bridge-hub-polkadot/Cargo.toml
@@ -18,8 +18,8 @@ workspace = true
 # Bridge Dependencies
 
 bp-bridge-hub-cumulus = { workspace = true }
-bp-runtime = { workspace = true }
 bp-messages = { workspace = true }
+bp-runtime = { workspace = true }
 
 # Substrate Based Dependencies
 
diff --git a/bridges/chains/chain-bridge-hub-rococo/Cargo.toml b/bridges/chains/chain-bridge-hub-rococo/Cargo.toml
index 23fbd9a2742f..08a704add2b7 100644
--- a/bridges/chains/chain-bridge-hub-rococo/Cargo.toml
+++ b/bridges/chains/chain-bridge-hub-rococo/Cargo.toml
@@ -18,8 +18,8 @@ codec = { features = ["derive"], workspace = true }
 
 # Bridge Dependencies
 bp-bridge-hub-cumulus = { workspace = true }
-bp-runtime = { workspace = true }
 bp-messages = { workspace = true }
+bp-runtime = { workspace = true }
 bp-xcm-bridge-hub = { workspace = true }
 
 # Substrate Based Dependencies
diff --git a/bridges/chains/chain-bridge-hub-westend/Cargo.toml b/bridges/chains/chain-bridge-hub-westend/Cargo.toml
index 61357e6aa6c8..35932371d0a9 100644
--- a/bridges/chains/chain-bridge-hub-westend/Cargo.toml
+++ b/bridges/chains/chain-bridge-hub-westend/Cargo.toml
@@ -18,8 +18,8 @@ codec = { features = ["derive"], workspace = true }
 
 # Bridge Dependencies
 bp-bridge-hub-cumulus = { workspace = true }
-bp-runtime = { workspace = true }
 bp-messages = { workspace = true }
+bp-runtime = { workspace = true }
 bp-xcm-bridge-hub = { workspace = true }
 
 # Substrate Based Dependencies
diff --git a/bridges/modules/beefy/Cargo.toml b/bridges/modules/beefy/Cargo.toml
index cffc62d29082..adbf79e28b5a 100644
--- a/bridges/modules/beefy/Cargo.toml
+++ b/bridges/modules/beefy/Cargo.toml
@@ -31,13 +31,13 @@ sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
 [dev-dependencies]
-sp-consensus-beefy = { workspace = true, default-features = true }
+bp-test-utils = { workspace = true, default-features = true }
 mmr-lib = { workspace = true }
 pallet-beefy-mmr = { workspace = true, default-features = true }
 pallet-mmr = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
+sp-consensus-beefy = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-bp-test-utils = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/modules/grandpa/Cargo.toml b/bridges/modules/grandpa/Cargo.toml
index 6d1419ae5b03..fdca48ac6f07 100644
--- a/bridges/modules/grandpa/Cargo.toml
+++ b/bridges/modules/grandpa/Cargo.toml
@@ -19,8 +19,8 @@ scale-info = { features = ["derive"], workspace = true }
 
 # Bridge Dependencies
 
-bp-runtime = { workspace = true }
 bp-header-chain = { workspace = true }
+bp-runtime = { workspace = true }
 
 # Substrate Dependencies
 
diff --git a/bridges/modules/messages/Cargo.toml b/bridges/modules/messages/Cargo.toml
index 9df318587e38..6248c9e65e16 100644
--- a/bridges/modules/messages/Cargo.toml
+++ b/bridges/modules/messages/Cargo.toml
@@ -33,8 +33,8 @@ bp-runtime = { features = ["test-helpers"], workspace = true }
 bp-test-utils = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-bridge-grandpa = { workspace = true }
-sp-io = { workspace = true }
 sp-core = { workspace = true }
+sp-io = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/modules/relayers/Cargo.toml b/bridges/modules/relayers/Cargo.toml
index 04e7b52ed86c..97ed61a9004e 100644
--- a/bridges/modules/relayers/Cargo.toml
+++ b/bridges/modules/relayers/Cargo.toml
@@ -34,15 +34,15 @@ sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
 [dev-dependencies]
-bp-runtime = { workspace = true }
-pallet-balances = { workspace = true, default-features = true }
-sp-io = { workspace = true }
-sp-runtime = { workspace = true }
 bp-parachains = { workspace = true }
 bp-polkadot-core = { workspace = true }
+bp-runtime = { workspace = true }
 bp-test-utils = { workspace = true }
+pallet-balances = { workspace = true, default-features = true }
 pallet-utility = { workspace = true }
 sp-core = { workspace = true }
+sp-io = { workspace = true }
+sp-runtime = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/modules/xcm-bridge-hub/Cargo.toml b/bridges/modules/xcm-bridge-hub/Cargo.toml
index ef49b3396b5c..b5e365874443 100644
--- a/bridges/modules/xcm-bridge-hub/Cargo.toml
+++ b/bridges/modules/xcm-bridge-hub/Cargo.toml
@@ -34,13 +34,13 @@ xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
 
 [dev-dependencies]
-pallet-balances = { workspace = true }
-sp-io = { workspace = true }
-bp-runtime = { workspace = true }
 bp-header-chain = { workspace = true }
-pallet-xcm-bridge-hub-router = { workspace = true }
+bp-runtime = { workspace = true }
 bp-xcm-bridge-hub-router = { workspace = true }
+pallet-balances = { workspace = true }
+pallet-xcm-bridge-hub-router = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
+sp-io = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/beefy/Cargo.toml b/bridges/primitives/beefy/Cargo.toml
index 404acaff30af..b32cf1e407eb 100644
--- a/bridges/primitives/beefy/Cargo.toml
+++ b/bridges/primitives/beefy/Cargo.toml
@@ -23,10 +23,10 @@ bp-runtime = { workspace = true }
 # Substrate Dependencies
 
 binary-merkle-tree = { workspace = true }
-sp-consensus-beefy = { workspace = true }
 frame-support = { workspace = true }
 pallet-beefy-mmr = { workspace = true }
 pallet-mmr = { workspace = true }
+sp-consensus-beefy = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
diff --git a/bridges/primitives/header-chain/Cargo.toml b/bridges/primitives/header-chain/Cargo.toml
index 081bda479495..b17dcb2f7491 100644
--- a/bridges/primitives/header-chain/Cargo.toml
+++ b/bridges/primitives/header-chain/Cargo.toml
@@ -23,8 +23,8 @@ bp-runtime = { workspace = true }
 # Substrate Dependencies
 
 frame-support = { workspace = true }
-sp-core = { features = ["serde"], workspace = true }
 sp-consensus-grandpa = { features = ["serde"], workspace = true }
+sp-core = { features = ["serde"], workspace = true }
 sp-runtime = { features = ["serde"], workspace = true }
 sp-std = { workspace = true }
 
diff --git a/bridges/primitives/messages/Cargo.toml b/bridges/primitives/messages/Cargo.toml
index 87c8cbe88180..dd1bd083371f 100644
--- a/bridges/primitives/messages/Cargo.toml
+++ b/bridges/primitives/messages/Cargo.toml
@@ -16,19 +16,19 @@ scale-info = { features = ["bit-vec", "derive"], workspace = true }
 serde = { features = ["alloc", "derive"], workspace = true }
 
 # Bridge dependencies
-bp-runtime = { workspace = true }
 bp-header-chain = { workspace = true }
+bp-runtime = { workspace = true }
 
 # Substrate Dependencies
 frame-support = { workspace = true }
 sp-core = { workspace = true }
-sp-std = { workspace = true }
 sp-io = { workspace = true }
+sp-std = { workspace = true }
 
 [dev-dependencies]
+bp-runtime = { workspace = true }
 hex = { workspace = true, default-features = true }
 hex-literal = { workspace = true, default-features = true }
-bp-runtime = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/relayers/Cargo.toml b/bridges/primitives/relayers/Cargo.toml
index 34be38bed4ac..9219bae1e131 100644
--- a/bridges/primitives/relayers/Cargo.toml
+++ b/bridges/primitives/relayers/Cargo.toml
@@ -21,8 +21,8 @@ bp-parachains = { workspace = true }
 bp-runtime = { workspace = true }
 
 # Substrate Dependencies
-frame-system = { workspace = true }
 frame-support = { workspace = true }
+frame-system = { workspace = true }
 pallet-utility = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
diff --git a/bridges/primitives/xcm-bridge-hub-router/Cargo.toml b/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
index ba0c51152bd2..b8a21ec35024 100644
--- a/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
+++ b/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
@@ -15,8 +15,8 @@ codec = { features = ["bit-vec", "derive"], workspace = true }
 scale-info = { features = ["bit-vec", "derive"], workspace = true }
 
 # Substrate Dependencies
-sp-runtime = { workspace = true }
 sp-core = { workspace = true }
+sp-runtime = { workspace = true }
 
 # Polkadot Dependencies
 xcm = { workspace = true }
diff --git a/bridges/primitives/xcm-bridge-hub/Cargo.toml b/bridges/primitives/xcm-bridge-hub/Cargo.toml
index 79201a8756f9..800e2a3da3a3 100644
--- a/bridges/primitives/xcm-bridge-hub/Cargo.toml
+++ b/bridges/primitives/xcm-bridge-hub/Cargo.toml
@@ -20,10 +20,10 @@ bp-messages = { workspace = true }
 bp-runtime = { workspace = true }
 
 # Substrate Dependencies
-sp-std = { workspace = true }
-sp-io = { workspace = true }
-sp-core = { workspace = true }
 frame-support = { workspace = true }
+sp-core = { workspace = true }
+sp-io = { workspace = true }
+sp-std = { workspace = true }
 
 # Polkadot Dependencies
 xcm = { workspace = true }
diff --git a/bridges/relays/client-substrate/Cargo.toml b/bridges/relays/client-substrate/Cargo.toml
index 6065c23773e3..6a59688b2d8c 100644
--- a/bridges/relays/client-substrate/Cargo.toml
+++ b/bridges/relays/client-substrate/Cargo.toml
@@ -18,16 +18,16 @@ futures = { workspace = true }
 jsonrpsee = { features = ["macros", "ws-client"], workspace = true }
 log = { workspace = true }
 num-traits = { workspace = true, default-features = true }
+quick_cache = { workspace = true }
 rand = { workspace = true, default-features = true }
-serde_json = { workspace = true }
 scale-info = { features = [
 	"derive",
 ], workspace = true, default-features = true }
+serde_json = { workspace = true }
+thiserror = { workspace = true }
 tokio = { features = [
 	"rt-multi-thread",
 ], workspace = true, default-features = true }
-thiserror = { workspace = true }
-quick_cache = { workspace = true }
 
 # Bridge dependencies
 
diff --git a/bridges/relays/lib-substrate-relay/Cargo.toml b/bridges/relays/lib-substrate-relay/Cargo.toml
index b0f93e5b5485..b418a2a3abb8 100644
--- a/bridges/relays/lib-substrate-relay/Cargo.toml
+++ b/bridges/relays/lib-substrate-relay/Cargo.toml
@@ -32,29 +32,29 @@ bp-relayers = { workspace = true, default-features = true }
 
 equivocation-detector = { workspace = true }
 finality-relay = { workspace = true }
-parachains-relay = { workspace = true }
-relay-utils = { workspace = true }
 messages-relay = { workspace = true }
+parachains-relay = { workspace = true }
 relay-substrate-client = { workspace = true }
+relay-utils = { workspace = true }
 
 pallet-bridge-grandpa = { workspace = true, default-features = true }
 pallet-bridge-messages = { workspace = true, default-features = true }
 pallet-bridge-parachains = { workspace = true, default-features = true }
 
-bp-runtime = { workspace = true, default-features = true }
 bp-messages = { workspace = true, default-features = true }
+bp-runtime = { workspace = true, default-features = true }
 
 # Substrate Dependencies
 frame-support = { workspace = true, default-features = true }
 frame-system = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
 pallet-grandpa = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
 sp-consensus-grandpa = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-trie = { workspace = true }
 
 [dev-dependencies]
-scale-info = { features = ["derive"], workspace = true }
 pallet-transaction-payment = { workspace = true, default-features = true }
 relay-substrate-client = { features = ["test-helpers"], workspace = true }
+scale-info = { features = ["derive"], workspace = true }
diff --git a/bridges/relays/utils/Cargo.toml b/bridges/relays/utils/Cargo.toml
index 4c25566607dc..8592ca780eaa 100644
--- a/bridges/relays/utils/Cargo.toml
+++ b/bridges/relays/utils/Cargo.toml
@@ -16,18 +16,18 @@ async-std = { workspace = true }
 async-trait = { workspace = true }
 backoff = { workspace = true }
 console = { workspace = true }
-isahc = { workspace = true }
-sp-tracing = { workspace = true, default-features = true }
 futures = { workspace = true }
+isahc = { workspace = true }
 jsonpath_lib = { workspace = true }
 log = { workspace = true }
 num-traits = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 sysinfo = { workspace = true }
+thiserror = { workspace = true }
 time = { features = ["formatting", "local-offset", "std"], workspace = true }
 tokio = { features = ["rt"], workspace = true, default-features = true }
-thiserror = { workspace = true }
 
 # Bridge dependencies
 
@@ -35,5 +35,5 @@ bp-runtime = { workspace = true, default-features = true }
 
 # Substrate dependencies
 
-sp-runtime = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
diff --git a/bridges/snowbridge/pallets/ethereum-client/Cargo.toml b/bridges/snowbridge/pallets/ethereum-client/Cargo.toml
index 262d9a7f380d..ebd8a1c6ed11 100644
--- a/bridges/snowbridge/pallets/ethereum-client/Cargo.toml
+++ b/bridges/snowbridge/pallets/ethereum-client/Cargo.toml
@@ -15,37 +15,37 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { optional = true, workspace = true, default-features = true }
-serde_json = { optional = true, workspace = true, default-features = true }
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 hex-literal = { optional = true, workspace = true, default-features = true }
 log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, workspace = true, default-features = true }
+serde_json = { optional = true, workspace = true, default-features = true }
 
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 sp-core = { workspace = true }
-sp-std = { workspace = true }
-sp-runtime = { workspace = true }
 sp-io = { optional = true, workspace = true }
+sp-runtime = { workspace = true }
+sp-std = { workspace = true }
 
+pallet-timestamp = { optional = true, workspace = true }
+snowbridge-beacon-primitives = { workspace = true }
 snowbridge-core = { workspace = true }
 snowbridge-ethereum = { workspace = true }
 snowbridge-pallet-ethereum-client-fixtures = { optional = true, workspace = true }
-snowbridge-beacon-primitives = { workspace = true }
 static_assertions = { workspace = true }
-pallet-timestamp = { optional = true, workspace = true }
 
 [dev-dependencies]
-rand = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
 hex-literal = { workspace = true, default-features = true }
 pallet-timestamp = { workspace = true, default-features = true }
+rand = { workspace = true, default-features = true }
+serde = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 snowbridge-pallet-ethereum-client-fixtures = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-serde = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml b/bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml
index 87f0cf9a5513..74bfe580ec36 100644
--- a/bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml
+++ b/bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml
@@ -16,10 +16,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 hex-literal = { workspace = true, default-features = true }
+snowbridge-beacon-primitives = { workspace = true }
+snowbridge-core = { workspace = true }
 sp-core = { workspace = true }
 sp-std = { workspace = true }
-snowbridge-core = { workspace = true }
-snowbridge-beacon-primitives = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/snowbridge/pallets/inbound-queue/Cargo.toml b/bridges/snowbridge/pallets/inbound-queue/Cargo.toml
index c0789940a9e8..5d4e8ad67662 100644
--- a/bridges/snowbridge/pallets/inbound-queue/Cargo.toml
+++ b/bridges/snowbridge/pallets/inbound-queue/Cargo.toml
@@ -15,35 +15,35 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { optional = true, workspace = true, default-features = true }
+alloy-core = { workspace = true, features = ["sol-types"] }
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 hex-literal = { optional = true, workspace = true, default-features = true }
 log = { workspace = true }
-alloy-core = { workspace = true, features = ["sol-types"] }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, workspace = true, default-features = true }
 
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-balances = { workspace = true }
 sp-core = { workspace = true }
-sp-std = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
+sp-std = { workspace = true }
 
 xcm = { workspace = true }
 xcm-executor = { workspace = true }
 
-snowbridge-core = { workspace = true }
-snowbridge-router-primitives = { workspace = true }
 snowbridge-beacon-primitives = { workspace = true }
+snowbridge-core = { workspace = true }
 snowbridge-pallet-inbound-queue-fixtures = { optional = true, workspace = true }
+snowbridge-router-primitives = { workspace = true }
 
 [dev-dependencies]
 frame-benchmarking = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-snowbridge-pallet-ethereum-client = { workspace = true, default-features = true }
 hex-literal = { workspace = true, default-features = true }
+snowbridge-pallet-ethereum-client = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/snowbridge/pallets/inbound-queue/fixtures/Cargo.toml b/bridges/snowbridge/pallets/inbound-queue/fixtures/Cargo.toml
index 6162a17728b6..c698dbbf1003 100644
--- a/bridges/snowbridge/pallets/inbound-queue/fixtures/Cargo.toml
+++ b/bridges/snowbridge/pallets/inbound-queue/fixtures/Cargo.toml
@@ -16,10 +16,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 hex-literal = { workspace = true, default-features = true }
+snowbridge-beacon-primitives = { workspace = true }
+snowbridge-core = { workspace = true }
 sp-core = { workspace = true }
 sp-std = { workspace = true }
-snowbridge-core = { workspace = true }
-snowbridge-beacon-primitives = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/snowbridge/pallets/outbound-queue/Cargo.toml b/bridges/snowbridge/pallets/outbound-queue/Cargo.toml
index 78546e258daa..f4910e6e6457 100644
--- a/bridges/snowbridge/pallets/outbound-queue/Cargo.toml
+++ b/bridges/snowbridge/pallets/outbound-queue/Cargo.toml
@@ -15,24 +15,24 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { features = ["alloc", "derive"], workspace = true }
 codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["alloc", "derive"], workspace = true }
 
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
-sp-std = { workspace = true }
-sp-runtime = { workspace = true }
 sp-io = { workspace = true }
-sp-arithmetic = { workspace = true }
+sp-runtime = { workspace = true }
+sp-std = { workspace = true }
 
 bridge-hub-common = { workspace = true }
 
+ethabi = { workspace = true }
 snowbridge-core = { features = ["serde"], workspace = true }
 snowbridge-outbound-queue-merkle-tree = { workspace = true }
-ethabi = { workspace = true }
 
 [dev-dependencies]
 pallet-message-queue = { workspace = true }
diff --git a/bridges/snowbridge/pallets/outbound-queue/merkle-tree/Cargo.toml b/bridges/snowbridge/pallets/outbound-queue/merkle-tree/Cargo.toml
index 16241428df80..2a0616b4f954 100644
--- a/bridges/snowbridge/pallets/outbound-queue/merkle-tree/Cargo.toml
+++ b/bridges/snowbridge/pallets/outbound-queue/merkle-tree/Cargo.toml
@@ -22,9 +22,9 @@ sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
-hex-literal = { workspace = true, default-features = true }
-hex = { workspace = true, default-features = true }
 array-bytes = { workspace = true, default-features = true }
+hex = { workspace = true, default-features = true }
+hex-literal = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 
diff --git a/bridges/snowbridge/pallets/outbound-queue/runtime-api/Cargo.toml b/bridges/snowbridge/pallets/outbound-queue/runtime-api/Cargo.toml
index d35bdde5a81e..18f7dde22c93 100644
--- a/bridges/snowbridge/pallets/outbound-queue/runtime-api/Cargo.toml
+++ b/bridges/snowbridge/pallets/outbound-queue/runtime-api/Cargo.toml
@@ -16,11 +16,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-sp-std = { workspace = true }
-sp-api = { workspace = true }
 frame-support = { workspace = true }
-snowbridge-outbound-queue-merkle-tree = { workspace = true }
 snowbridge-core = { workspace = true }
+snowbridge-outbound-queue-merkle-tree = { workspace = true }
+sp-api = { workspace = true }
+sp-std = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/snowbridge/pallets/system/Cargo.toml b/bridges/snowbridge/pallets/system/Cargo.toml
index d8e124d73d14..3544925956b4 100644
--- a/bridges/snowbridge/pallets/system/Cargo.toml
+++ b/bridges/snowbridge/pallets/system/Cargo.toml
@@ -18,16 +18,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 
 sp-core = { workspace = true }
-sp-std = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
+sp-std = { workspace = true }
 
 xcm = { workspace = true }
 xcm-executor = { workspace = true }
@@ -38,10 +38,10 @@ snowbridge-core = { workspace = true }
 hex = { workspace = true, default-features = true }
 hex-literal = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 pallet-message-queue = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 snowbridge-pallet-outbound-queue = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/snowbridge/pallets/system/runtime-api/Cargo.toml b/bridges/snowbridge/pallets/system/runtime-api/Cargo.toml
index 7c524dd2edad..fc377b460d33 100644
--- a/bridges/snowbridge/pallets/system/runtime-api/Cargo.toml
+++ b/bridges/snowbridge/pallets/system/runtime-api/Cargo.toml
@@ -18,10 +18,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-sp-std = { workspace = true }
+snowbridge-core = { workspace = true }
 sp-api = { workspace = true }
+sp-std = { workspace = true }
 xcm = { workspace = true }
-snowbridge-core = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/snowbridge/primitives/beacon/Cargo.toml b/bridges/snowbridge/primitives/beacon/Cargo.toml
index 9ced99fbf3fd..bf5d6838f7bb 100644
--- a/bridges/snowbridge/primitives/beacon/Cargo.toml
+++ b/bridges/snowbridge/primitives/beacon/Cargo.toml
@@ -12,24 +12,24 @@ categories = ["cryptography::cryptocurrencies"]
 workspace = true
 
 [dependencies]
-serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
-hex = { workspace = true }
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
+hex = { workspace = true }
 rlp = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
 
 frame-support = { workspace = true }
-sp-runtime = { workspace = true }
 sp-core = { workspace = true }
-sp-std = { workspace = true }
 sp-io = { workspace = true }
+sp-runtime = { workspace = true }
+sp-std = { workspace = true }
 
+byte-slice-cast = { workspace = true }
 ssz_rs = { workspace = true }
 ssz_rs_derive = { workspace = true }
-byte-slice-cast = { workspace = true }
 
-snowbridge-ethereum = { workspace = true }
 milagro-bls = { workspace = true }
+snowbridge-ethereum = { workspace = true }
 
 [dev-dependencies]
 hex-literal = { workspace = true, default-features = true }
diff --git a/bridges/snowbridge/primitives/core/Cargo.toml b/bridges/snowbridge/primitives/core/Cargo.toml
index af002a5a965c..514579400aca 100644
--- a/bridges/snowbridge/primitives/core/Cargo.toml
+++ b/bridges/snowbridge/primitives/core/Cargo.toml
@@ -12,10 +12,10 @@ categories = ["cryptography::cryptocurrencies"]
 workspace = true
 
 [dependencies]
-serde = { optional = true, features = ["alloc", "derive"], workspace = true }
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 hex-literal = { workspace = true, default-features = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, features = ["alloc", "derive"], workspace = true }
 
 polkadot-parachain-primitives = { workspace = true }
 xcm = { workspace = true }
@@ -23,11 +23,11 @@ xcm-builder = { workspace = true }
 
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+sp-arithmetic = { workspace = true }
+sp-core = { workspace = true }
+sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
-sp-io = { workspace = true }
-sp-core = { workspace = true }
-sp-arithmetic = { workspace = true }
 
 snowbridge-beacon-primitives = { workspace = true }
 
diff --git a/bridges/snowbridge/primitives/ethereum/Cargo.toml b/bridges/snowbridge/primitives/ethereum/Cargo.toml
index 764ce90b8139..44ea2d0d222b 100644
--- a/bridges/snowbridge/primitives/ethereum/Cargo.toml
+++ b/bridges/snowbridge/primitives/ethereum/Cargo.toml
@@ -12,26 +12,26 @@ categories = ["cryptography::cryptocurrencies"]
 workspace = true
 
 [dependencies]
-serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
-serde-big-array = { optional = true, features = ["const-generics"], workspace = true }
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 ethbloom = { workspace = true }
 ethereum-types = { features = ["codec", "rlp", "serialize"], workspace = true }
 hex-literal = { workspace = true }
 parity-bytes = { workspace = true }
 rlp = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
+serde-big-array = { optional = true, features = ["const-generics"], workspace = true }
 
 sp-io = { workspace = true }
-sp-std = { workspace = true }
 sp-runtime = { workspace = true }
+sp-std = { workspace = true }
 
 ethabi = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen-test = { workspace = true }
 rand = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
+wasm-bindgen-test = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/snowbridge/primitives/router/Cargo.toml b/bridges/snowbridge/primitives/router/Cargo.toml
index 1f7f489c6b18..e44cca077ef3 100644
--- a/bridges/snowbridge/primitives/router/Cargo.toml
+++ b/bridges/snowbridge/primitives/router/Cargo.toml
@@ -13,8 +13,8 @@ workspace = true
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 
 frame-support = { workspace = true }
 sp-core = { workspace = true }
diff --git a/bridges/snowbridge/runtime/runtime-common/Cargo.toml b/bridges/snowbridge/runtime/runtime-common/Cargo.toml
index 514a4c186696..23cd0adf1226 100644
--- a/bridges/snowbridge/runtime/runtime-common/Cargo.toml
+++ b/bridges/snowbridge/runtime/runtime-common/Cargo.toml
@@ -12,11 +12,11 @@ categories = ["cryptography::cryptocurrencies"]
 workspace = true
 
 [dependencies]
-log = { workspace = true }
 codec = { workspace = true }
 frame-support = { workspace = true }
-sp-std = { workspace = true }
+log = { workspace = true }
 sp-arithmetic = { workspace = true }
+sp-std = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
diff --git a/bridges/snowbridge/runtime/test-common/Cargo.toml b/bridges/snowbridge/runtime/test-common/Cargo.toml
index cc1ed1288ca0..184a0ff2329f 100644
--- a/bridges/snowbridge/runtime/test-common/Cargo.toml
+++ b/bridges/snowbridge/runtime/test-common/Cargo.toml
@@ -19,8 +19,8 @@ codec = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-session = { workspace = true }
 pallet-message-queue = { workspace = true }
+pallet-session = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-utility = { workspace = true }
 sp-core = { workspace = true }
diff --git a/cumulus/README.md b/cumulus/README.md
index 7e145ad7b4ab..0c47df999022 100644
--- a/cumulus/README.md
+++ b/cumulus/README.md
@@ -60,7 +60,7 @@ polkadot-parachain \
 ```
 
 #### External Relay Chain Node
-An external relay chain node is connected via WebsSocket RPC by using the `--relay-chain-rpc-urls` command line
+An external relay chain node is connected via WebSocket RPC by using the `--relay-chain-rpc-urls` command line
 argument. This option accepts one or more space-separated WebSocket URLs to a full relay chain node. By default, only
 the first URL will be used, with the rest as a backup in case the connection to the first node is lost.
 
diff --git a/cumulus/bin/pov-validator/Cargo.toml b/cumulus/bin/pov-validator/Cargo.toml
index 9be92960ad77..d7af29a6bcb2 100644
--- a/cumulus/bin/pov-validator/Cargo.toml
+++ b/cumulus/bin/pov-validator/Cargo.toml
@@ -9,18 +9,18 @@ homepage.workspace = true
 description = "A tool for validating PoVs locally"
 
 [dependencies]
-codec.workspace = true
+anyhow.workspace = true
 clap = { workspace = true, features = ["derive"] }
-sc-executor.workspace = true
-sp-io.workspace = true
-sp-core.workspace = true
-sp-maybe-compressed-blob.workspace = true
+codec.workspace = true
 polkadot-node-primitives.workspace = true
 polkadot-parachain-primitives.workspace = true
 polkadot-primitives.workspace = true
-anyhow.workspace = true
-tracing.workspace = true
+sc-executor.workspace = true
+sp-core.workspace = true
+sp-io.workspace = true
+sp-maybe-compressed-blob.workspace = true
 tracing-subscriber.workspace = true
+tracing.workspace = true
 
 [lints]
 workspace = true
diff --git a/cumulus/client/cli/Cargo.toml b/cumulus/client/cli/Cargo.toml
index 198f9428f1dd..bdc0236e368f 100644
--- a/cumulus/client/cli/Cargo.toml
+++ b/cumulus/client/cli/Cargo.toml
@@ -17,10 +17,10 @@ codec = { workspace = true, default-features = true }
 url = { workspace = true }
 
 # Substrate
+sc-chain-spec = { workspace = true, default-features = true }
 sc-cli = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
-sc-chain-spec = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-blockchain = { workspace = true, default-features = true }
diff --git a/cumulus/client/collator/Cargo.toml b/cumulus/client/collator/Cargo.toml
index 83a3f2661e7a..ff591c2d6e3a 100644
--- a/cumulus/client/collator/Cargo.toml
+++ b/cumulus/client/collator/Cargo.toml
@@ -12,15 +12,15 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-parking_lot = { workspace = true, default-features = true }
 codec = { features = ["derive"], workspace = true, default-features = true }
 futures = { workspace = true }
+parking_lot = { workspace = true, default-features = true }
 tracing = { workspace = true, default-features = true }
 
 # Substrate
 sc-client-api = { workspace = true, default-features = true }
-sp-consensus = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 
@@ -48,5 +48,5 @@ polkadot-node-subsystem-test-helpers = { workspace = true }
 
 # Cumulus
 cumulus-test-client = { workspace = true }
-cumulus-test-runtime = { workspace = true }
 cumulus-test-relay-sproof-builder = { workspace = true, default-features = true }
+cumulus-test-runtime = { workspace = true }
diff --git a/cumulus/client/consensus/aura/Cargo.toml b/cumulus/client/consensus/aura/Cargo.toml
index 33f24e30ccfb..702230938645 100644
--- a/cumulus/client/consensus/aura/Cargo.toml
+++ b/cumulus/client/consensus/aura/Cargo.toml
@@ -16,18 +16,19 @@ async-trait = { workspace = true }
 codec = { features = ["derive"], workspace = true, default-features = true }
 futures = { workspace = true }
 parking_lot = { workspace = true }
-tracing = { workspace = true, default-features = true }
 schnellru = { workspace = true }
 tokio = { workspace = true, features = ["macros"] }
+tracing = { workspace = true, default-features = true }
 
 # Substrate
+prometheus-endpoint = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-consensus-aura = { workspace = true, default-features = true }
 sc-consensus-babe = { workspace = true, default-features = true }
 sc-consensus-slots = { workspace = true, default-features = true }
-sc-utils = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
+sc-utils = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-application-crypto = { workspace = true, default-features = true }
 sp-block-builder = { workspace = true, default-features = true }
@@ -35,29 +36,28 @@ sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-consensus-aura = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
-sp-trie = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-timestamp = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
-prometheus-endpoint = { workspace = true, default-features = true }
+sp-timestamp = { workspace = true, default-features = true }
+sp-trie = { workspace = true, default-features = true }
 
 # Cumulus
+cumulus-client-collator = { workspace = true, default-features = true }
 cumulus-client-consensus-common = { workspace = true, default-features = true }
-cumulus-relay-chain-interface = { workspace = true, default-features = true }
 cumulus-client-consensus-proposer = { workspace = true, default-features = true }
 cumulus-client-parachain-inherent = { workspace = true, default-features = true }
 cumulus-primitives-aura = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true, default-features = true }
-cumulus-client-collator = { workspace = true, default-features = true }
+cumulus-relay-chain-interface = { workspace = true, default-features = true }
 
 # Polkadot
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
 [features]
 # Allows collator to use full PoV size for block building
diff --git a/cumulus/client/consensus/aura/src/collators/slot_based/block_builder_task.rs b/cumulus/client/consensus/aura/src/collators/slot_based/block_builder_task.rs
index 425151230704..41751f1db530 100644
--- a/cumulus/client/consensus/aura/src/collators/slot_based/block_builder_task.rs
+++ b/cumulus/client/consensus/aura/src/collators/slot_based/block_builder_task.rs
@@ -23,30 +23,32 @@ use cumulus_primitives_aura::AuraUnincludedSegmentApi;
 use cumulus_primitives_core::{GetCoreSelectorApi, PersistedValidationData};
 use cumulus_relay_chain_interface::RelayChainInterface;
 
-use polkadot_primitives::{
-	vstaging::{ClaimQueueOffset, CoreSelector, DEFAULT_CLAIM_QUEUE_OFFSET},
-	BlockId, CoreIndex, Hash as RelayHash, Header as RelayHeader, Id as ParaId,
-	OccupiedCoreAssumption,
-};
+use polkadot_primitives::Id as ParaId;
 
 use futures::prelude::*;
 use sc_client_api::{backend::AuxStore, BlockBackend, BlockOf, UsageProvider};
 use sc_consensus::BlockImport;
-use sp_api::{ApiExt, ProvideRuntimeApi};
+use sp_api::ProvideRuntimeApi;
 use sp_application_crypto::AppPublic;
 use sp_blockchain::HeaderBackend;
 use sp_consensus_aura::{AuraApi, Slot};
-use sp_core::{crypto::Pair, U256};
+use sp_core::crypto::Pair;
 use sp_inherents::CreateInherentDataProviders;
 use sp_keystore::KeystorePtr;
-use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Member, One};
+use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Member};
 use sp_timestamp::Timestamp;
-use std::{collections::BTreeSet, sync::Arc, time::Duration};
+use std::{sync::Arc, time::Duration};
 
 use super::CollatorMessage;
 use crate::{
 	collator::{self as collator_util},
-	collators::{check_validation_code_or_log, cores_scheduled_for_para},
+	collators::{
+		check_validation_code_or_log,
+		slot_based::{
+			core_selector,
+			relay_chain_data_cache::{RelayChainData, RelayChainDataCache},
+		},
+	},
 	LOG_TARGET,
 };
 
@@ -218,7 +220,7 @@ where
 			collator_util::Collator::<Block, P, _, _, _, _, _>::new(params)
 		};
 
-		let mut relay_chain_fetcher = RelayChainCachingFetcher::new(relay_client.clone(), para_id);
+		let mut relay_chain_data_cache = RelayChainDataCache::new(relay_client.clone(), para_id);
 
 		loop {
 			// We wait here until the next slot arrives.
@@ -242,7 +244,7 @@ where
 
 			// Retrieve the core selector.
 			let (core_selector, claim_queue_offset) =
-				match core_selector(&*para_client, &parent).await {
+				match core_selector(&*para_client, parent.hash, *parent.header.number()) {
 					Ok(core_selector) => core_selector,
 					Err(err) => {
 						tracing::trace!(
@@ -259,7 +261,7 @@ where
 				max_pov_size,
 				scheduled_cores,
 				claimed_cores,
-			}) = relay_chain_fetcher
+			}) = relay_chain_data_cache
 				.get_mut_relay_chain_data(relay_parent, claim_queue_offset)
 				.await
 			else {
@@ -419,119 +421,3 @@ where
 		}
 	}
 }
-
-/// Contains relay chain data necessary for parachain block building.
-#[derive(Clone)]
-struct RelayChainData {
-	/// Current relay chain parent header.
-	pub relay_parent_header: RelayHeader,
-	/// The cores on which the para is scheduled at the configured claim queue offset.
-	pub scheduled_cores: Vec<CoreIndex>,
-	/// Maximum configured PoV size on the relay chain.
-	pub max_pov_size: u32,
-	/// The claimed cores at a relay parent.
-	pub claimed_cores: BTreeSet<CoreIndex>,
-}
-
-/// Simple helper to fetch relay chain data and cache it based on the current relay chain best block
-/// hash.
-struct RelayChainCachingFetcher<RI> {
-	relay_client: RI,
-	para_id: ParaId,
-	last_data: Option<(RelayHash, RelayChainData)>,
-}
-
-impl<RI> RelayChainCachingFetcher<RI>
-where
-	RI: RelayChainInterface + Clone + 'static,
-{
-	pub fn new(relay_client: RI, para_id: ParaId) -> Self {
-		Self { relay_client, para_id, last_data: None }
-	}
-
-	/// Fetch required [`RelayChainData`] from the relay chain.
-	/// If this data has been fetched in the past for the incoming hash, it will reuse
-	/// cached data.
-	pub async fn get_mut_relay_chain_data(
-		&mut self,
-		relay_parent: RelayHash,
-		claim_queue_offset: ClaimQueueOffset,
-	) -> Result<&mut RelayChainData, ()> {
-		match &self.last_data {
-			Some((last_seen_hash, _)) if *last_seen_hash == relay_parent => {
-				tracing::trace!(target: crate::LOG_TARGET, %relay_parent, "Using cached data for relay parent.");
-				Ok(&mut self.last_data.as_mut().expect("last_data is Some").1)
-			},
-			_ => {
-				tracing::trace!(target: crate::LOG_TARGET, %relay_parent, "Relay chain best block changed, fetching new data from relay chain.");
-				let data = self.update_for_relay_parent(relay_parent, claim_queue_offset).await?;
-				self.last_data = Some((relay_parent, data));
-				Ok(&mut self.last_data.as_mut().expect("last_data was just set above").1)
-			},
-		}
-	}
-
-	/// Fetch fresh data from the relay chain for the given relay parent hash.
-	async fn update_for_relay_parent(
-		&self,
-		relay_parent: RelayHash,
-		claim_queue_offset: ClaimQueueOffset,
-	) -> Result<RelayChainData, ()> {
-		let scheduled_cores = cores_scheduled_for_para(
-			relay_parent,
-			self.para_id,
-			&self.relay_client,
-			claim_queue_offset,
-		)
-		.await;
-
-		let Ok(Some(relay_parent_header)) =
-			self.relay_client.header(BlockId::Hash(relay_parent)).await
-		else {
-			tracing::warn!(target: crate::LOG_TARGET, "Unable to fetch latest relay chain block header.");
-			return Err(())
-		};
-
-		let max_pov_size = match self
-			.relay_client
-			.persisted_validation_data(relay_parent, self.para_id, OccupiedCoreAssumption::Included)
-			.await
-		{
-			Ok(None) => return Err(()),
-			Ok(Some(pvd)) => pvd.max_pov_size,
-			Err(err) => {
-				tracing::error!(target: crate::LOG_TARGET, ?err, "Failed to gather information from relay-client");
-				return Err(())
-			},
-		};
-
-		Ok(RelayChainData {
-			relay_parent_header,
-			scheduled_cores,
-			max_pov_size,
-			claimed_cores: BTreeSet::new(),
-		})
-	}
-}
-
-async fn core_selector<Block: BlockT, Client>(
-	para_client: &Client,
-	parent: &consensus_common::PotentialParent<Block>,
-) -> Result<(CoreSelector, ClaimQueueOffset), sp_api::ApiError>
-where
-	Client: ProvideRuntimeApi<Block> + Send + Sync,
-	Client::Api: GetCoreSelectorApi<Block>,
-{
-	let block_hash = parent.hash;
-	let runtime_api = para_client.runtime_api();
-
-	if runtime_api.has_api::<dyn GetCoreSelectorApi<Block>>(block_hash)? {
-		Ok(runtime_api.core_selector(block_hash)?)
-	} else {
-		let next_block_number: U256 = (*parent.header.number() + One::one()).into();
-
-		// If the runtime API does not support the core selector API, fallback to some default
-		// values.
-		Ok((CoreSelector(next_block_number.byte(0)), ClaimQueueOffset(DEFAULT_CLAIM_QUEUE_OFFSET)))
-	}
-}
diff --git a/cumulus/client/consensus/aura/src/collators/slot_based/mod.rs b/cumulus/client/consensus/aura/src/collators/slot_based/mod.rs
index 09afa18e6fbb..ab78b31fbd80 100644
--- a/cumulus/client/consensus/aura/src/collators/slot_based/mod.rs
+++ b/cumulus/client/consensus/aura/src/collators/slot_based/mod.rs
@@ -35,23 +35,24 @@ use cumulus_client_collator::service::ServiceInterface as CollatorServiceInterfa
 use cumulus_client_consensus_common::{self as consensus_common, ParachainBlockImportMarker};
 use cumulus_client_consensus_proposer::ProposerInterface;
 use cumulus_primitives_aura::AuraUnincludedSegmentApi;
-use cumulus_primitives_core::GetCoreSelectorApi;
+use cumulus_primitives_core::{ClaimQueueOffset, CoreSelector, GetCoreSelectorApi};
 use cumulus_relay_chain_interface::RelayChainInterface;
 use futures::FutureExt;
 use polkadot_primitives::{
-	CollatorPair, CoreIndex, Hash as RelayHash, Id as ParaId, ValidationCodeHash,
+	vstaging::DEFAULT_CLAIM_QUEUE_OFFSET, CollatorPair, CoreIndex, Hash as RelayHash, Id as ParaId,
+	ValidationCodeHash,
 };
 use sc_client_api::{backend::AuxStore, BlockBackend, BlockOf, UsageProvider};
 use sc_consensus::BlockImport;
 use sc_utils::mpsc::tracing_unbounded;
-use sp_api::ProvideRuntimeApi;
+use sp_api::{ApiExt, ProvideRuntimeApi};
 use sp_application_crypto::AppPublic;
 use sp_blockchain::HeaderBackend;
 use sp_consensus_aura::AuraApi;
-use sp_core::{crypto::Pair, traits::SpawnNamed};
+use sp_core::{crypto::Pair, traits::SpawnNamed, U256};
 use sp_inherents::CreateInherentDataProviders;
 use sp_keystore::KeystorePtr;
-use sp_runtime::traits::{Block as BlockT, Member};
+use sp_runtime::traits::{Block as BlockT, Member, NumberFor, One};
 use std::{sync::Arc, time::Duration};
 
 pub use block_import::{SlotBasedBlockImport, SlotBasedBlockImportHandle};
@@ -59,6 +60,7 @@ pub use block_import::{SlotBasedBlockImport, SlotBasedBlockImportHandle};
 mod block_builder_task;
 mod block_import;
 mod collation_task;
+mod relay_chain_data_cache;
 
 /// Parameters for [`run`].
 pub struct Params<Block, BI, CIDP, Client, Backend, RClient, CHP, Proposer, CS, Spawner> {
@@ -204,3 +206,26 @@ struct CollatorMessage<Block: BlockT> {
 	/// Core index that this block should be submitted on
 	pub core_index: CoreIndex,
 }
+
+/// Fetch the `CoreSelector` and `ClaimQueueOffset` for `parent_hash`.
+fn core_selector<Block: BlockT, Client>(
+	para_client: &Client,
+	parent_hash: Block::Hash,
+	parent_number: NumberFor<Block>,
+) -> Result<(CoreSelector, ClaimQueueOffset), sp_api::ApiError>
+where
+	Client: ProvideRuntimeApi<Block> + Send + Sync,
+	Client::Api: GetCoreSelectorApi<Block>,
+{
+	let runtime_api = para_client.runtime_api();
+
+	if runtime_api.has_api::<dyn GetCoreSelectorApi<Block>>(parent_hash)? {
+		Ok(runtime_api.core_selector(parent_hash)?)
+	} else {
+		let next_block_number: U256 = (parent_number + One::one()).into();
+
+		// If the runtime API does not support the core selector API, fallback to some default
+		// values.
+		Ok((CoreSelector(next_block_number.byte(0)), ClaimQueueOffset(DEFAULT_CLAIM_QUEUE_OFFSET)))
+	}
+}
diff --git a/cumulus/client/consensus/aura/src/collators/slot_based/relay_chain_data_cache.rs b/cumulus/client/consensus/aura/src/collators/slot_based/relay_chain_data_cache.rs
new file mode 100644
index 000000000000..be30ec2f747d
--- /dev/null
+++ b/cumulus/client/consensus/aura/src/collators/slot_based/relay_chain_data_cache.rs
@@ -0,0 +1,127 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Cumulus is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Utility for caching [`RelayChainData`] for different relay blocks.
+
+use crate::collators::cores_scheduled_for_para;
+use cumulus_primitives_core::ClaimQueueOffset;
+use cumulus_relay_chain_interface::RelayChainInterface;
+use polkadot_primitives::{
+	CoreIndex, Hash as RelayHash, Header as RelayHeader, Id as ParaId, OccupiedCoreAssumption,
+};
+use sp_runtime::generic::BlockId;
+use std::collections::BTreeSet;
+
+/// Contains relay chain data necessary for parachain block building.
+#[derive(Clone)]
+pub struct RelayChainData {
+	/// Current relay chain parent header.
+	pub relay_parent_header: RelayHeader,
+	/// The cores on which the para is scheduled at the configured claim queue offset.
+	pub scheduled_cores: Vec<CoreIndex>,
+	/// Maximum configured PoV size on the relay chain.
+	pub max_pov_size: u32,
+	/// The claimed cores at a relay parent.
+	pub claimed_cores: BTreeSet<CoreIndex>,
+}
+
+/// Simple helper to fetch relay chain data and cache it based on the current relay chain best block
+/// hash.
+pub struct RelayChainDataCache<RI> {
+	relay_client: RI,
+	para_id: ParaId,
+	cached_data: schnellru::LruMap<RelayHash, RelayChainData>,
+}
+
+impl<RI> RelayChainDataCache<RI>
+where
+	RI: RelayChainInterface + Clone + 'static,
+{
+	pub fn new(relay_client: RI, para_id: ParaId) -> Self {
+		Self {
+			relay_client,
+			para_id,
+			// 50 cached relay chain blocks should be more than enough.
+			cached_data: schnellru::LruMap::new(schnellru::ByLength::new(50)),
+		}
+	}
+
+	/// Fetch required [`RelayChainData`] from the relay chain.
+	/// If this data has been fetched in the past for the incoming hash, it will reuse
+	/// cached data.
+	pub async fn get_mut_relay_chain_data(
+		&mut self,
+		relay_parent: RelayHash,
+		claim_queue_offset: ClaimQueueOffset,
+	) -> Result<&mut RelayChainData, ()> {
+		let insert_data = if self.cached_data.peek(&relay_parent).is_some() {
+			tracing::trace!(target: crate::LOG_TARGET, %relay_parent, "Using cached data for relay parent.");
+			None
+		} else {
+			tracing::trace!(target: crate::LOG_TARGET, %relay_parent, "Relay chain best block changed, fetching new data from relay chain.");
+			Some(self.update_for_relay_parent(relay_parent, claim_queue_offset).await?)
+		};
+
+		Ok(self
+			.cached_data
+			.get_or_insert(relay_parent, || {
+				insert_data.expect("`insert_data` exists if not cached yet; qed")
+			})
+			.expect("There is space for at least one element; qed"))
+	}
+
+	/// Fetch fresh data from the relay chain for the given relay parent hash.
+	async fn update_for_relay_parent(
+		&self,
+		relay_parent: RelayHash,
+		claim_queue_offset: ClaimQueueOffset,
+	) -> Result<RelayChainData, ()> {
+		let scheduled_cores = cores_scheduled_for_para(
+			relay_parent,
+			self.para_id,
+			&self.relay_client,
+			claim_queue_offset,
+		)
+		.await;
+
+		let Ok(Some(relay_parent_header)) =
+			self.relay_client.header(BlockId::Hash(relay_parent)).await
+		else {
+			tracing::warn!(target: crate::LOG_TARGET, "Unable to fetch latest relay chain block header.");
+			return Err(())
+		};
+
+		let max_pov_size = match self
+			.relay_client
+			.persisted_validation_data(relay_parent, self.para_id, OccupiedCoreAssumption::Included)
+			.await
+		{
+			Ok(None) => return Err(()),
+			Ok(Some(pvd)) => pvd.max_pov_size,
+			Err(err) => {
+				tracing::error!(target: crate::LOG_TARGET, ?err, "Failed to gather information from relay-client");
+				return Err(())
+			},
+		};
+
+		Ok(RelayChainData {
+			relay_parent_header,
+			scheduled_cores,
+			max_pov_size,
+			claimed_cores: BTreeSet::new(),
+		})
+	}
+}
diff --git a/cumulus/client/consensus/common/Cargo.toml b/cumulus/client/consensus/common/Cargo.toml
index 0f532a2101c4..5bc5160601e7 100644
--- a/cumulus/client/consensus/common/Cargo.toml
+++ b/cumulus/client/consensus/common/Cargo.toml
@@ -20,6 +20,7 @@ log = { workspace = true, default-features = true }
 tracing = { workspace = true, default-features = true }
 
 # Substrate
+prometheus-endpoint = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-consensus-babe = { workspace = true, default-features = true }
@@ -31,15 +32,14 @@ sp-runtime = { workspace = true, default-features = true }
 sp-timestamp = { workspace = true, default-features = true }
 sp-trie = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
-prometheus-endpoint = { workspace = true, default-features = true }
 
 # Polkadot
 polkadot-primitives = { workspace = true, default-features = true }
 
 # Cumulus
+cumulus-client-pov-recovery = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true, default-features = true }
 cumulus-relay-chain-interface = { workspace = true, default-features = true }
-cumulus-client-pov-recovery = { workspace = true, default-features = true }
 schnellru = { workspace = true }
 
 [dev-dependencies]
diff --git a/cumulus/client/consensus/relay-chain/Cargo.toml b/cumulus/client/consensus/relay-chain/Cargo.toml
index 7f0f4333c961..fdc343dc65de 100644
--- a/cumulus/client/consensus/relay-chain/Cargo.toml
+++ b/cumulus/client/consensus/relay-chain/Cargo.toml
@@ -18,6 +18,7 @@ parking_lot = { workspace = true, default-features = true }
 tracing = { workspace = true, default-features = true }
 
 # Substrate
+prometheus-endpoint = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-block-builder = { workspace = true, default-features = true }
@@ -26,7 +27,6 @@ sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-prometheus-endpoint = { workspace = true, default-features = true }
 
 # Cumulus
 cumulus-client-consensus-common = { workspace = true, default-features = true }
diff --git a/cumulus/client/network/Cargo.toml b/cumulus/client/network/Cargo.toml
index b78df8d73eae..11025f8f62e6 100644
--- a/cumulus/client/network/Cargo.toml
+++ b/cumulus/client/network/Cargo.toml
@@ -21,28 +21,28 @@ tracing = { workspace = true, default-features = true }
 
 # Substrate
 sc-client-api = { workspace = true, default-features = true }
+sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
-sp-api = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
 
 # Polkadot
 polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
-polkadot-node-subsystem = { workspace = true, default-features = true }
 
 # Cumulus
 cumulus-relay-chain-interface = { workspace = true, default-features = true }
 
 [dev-dependencies]
 portpicker = { workspace = true }
+rstest = { workspace = true }
 tokio = { features = ["macros"], workspace = true, default-features = true }
 url = { workspace = true }
-rstest = { workspace = true }
 
 # Substrate
 sc-cli = { workspace = true, default-features = true }
diff --git a/cumulus/client/parachain-inherent/src/mock.rs b/cumulus/client/parachain-inherent/src/mock.rs
index 950cba2aaa7d..e08aca932564 100644
--- a/cumulus/client/parachain-inherent/src/mock.rs
+++ b/cumulus/client/parachain-inherent/src/mock.rs
@@ -17,17 +17,17 @@
 use crate::{ParachainInherentData, INHERENT_IDENTIFIER};
 use codec::Decode;
 use cumulus_primitives_core::{
-	relay_chain, InboundDownwardMessage, InboundHrmpMessage, ParaId, PersistedValidationData,
+	relay_chain, relay_chain::UpgradeGoAhead, InboundDownwardMessage, InboundHrmpMessage, ParaId,
+	PersistedValidationData,
 };
 use cumulus_primitives_parachain_inherent::MessageQueueChain;
+use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
 use sc_client_api::{Backend, StorageProvider};
 use sp_crypto_hashing::twox_128;
 use sp_inherents::{InherentData, InherentDataProvider};
 use sp_runtime::traits::Block;
 use std::collections::BTreeMap;
 
-use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
-
 /// Relay chain slot duration, in milliseconds.
 pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
 
@@ -68,10 +68,12 @@ pub struct MockValidationDataInherentDataProvider<R = ()> {
 	pub xcm_config: MockXcmConfig,
 	/// Inbound downward XCM messages to be injected into the block.
 	pub raw_downward_messages: Vec<Vec<u8>>,
-	// Inbound Horizontal messages sorted by channel.
+	/// Inbound Horizontal messages sorted by channel.
 	pub raw_horizontal_messages: Vec<(ParaId, Vec<u8>)>,
-	// Additional key-value pairs that should be injected.
+	/// Additional key-value pairs that should be injected.
 	pub additional_key_values: Option<Vec<(Vec<u8>, Vec<u8>)>>,
+	/// Whether upgrade go ahead should be set.
+	pub upgrade_go_ahead: Option<UpgradeGoAhead>,
 }
 
 /// Something that can generate randomness.
@@ -176,6 +178,7 @@ impl<R: Send + Sync + GenerateRandomness<u64>> InherentDataProvider
 		sproof_builder.current_slot =
 			((relay_parent_number / RELAY_CHAIN_SLOT_DURATION_MILLIS) as u64).into();
 
+		sproof_builder.upgrade_go_ahead = self.upgrade_go_ahead;
 		// Process the downward messages and set up the correct head
 		let mut downward_messages = Vec::new();
 		let mut dmq_mqc = MessageQueueChain::new(self.xcm_config.starting_dmq_mqc_head);
diff --git a/cumulus/client/pov-recovery/Cargo.toml b/cumulus/client/pov-recovery/Cargo.toml
index 762837e0bb11..7e7da7244a86 100644
--- a/cumulus/client/pov-recovery/Cargo.toml
+++ b/cumulus/client/pov-recovery/Cargo.toml
@@ -21,10 +21,10 @@ tracing = { workspace = true, default-features = true }
 # Substrate
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
+sp-api = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-maybe-compressed-blob = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-api = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
 
 # Polkadot
@@ -34,19 +34,19 @@ polkadot-overseer = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
 
 # Cumulus
+async-trait = { workspace = true }
 cumulus-primitives-core = { workspace = true, default-features = true }
 cumulus-relay-chain-interface = { workspace = true, default-features = true }
-async-trait = { workspace = true }
 
 [dev-dependencies]
-rstest = { workspace = true }
-tokio = { features = ["macros"], workspace = true, default-features = true }
-portpicker = { workspace = true }
-sp-blockchain = { workspace = true, default-features = true }
+assert_matches = { workspace = true }
 cumulus-test-client = { workspace = true }
+portpicker = { workspace = true }
+rstest = { workspace = true }
 sc-utils = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
-assert_matches = { workspace = true }
+tokio = { features = ["macros"], workspace = true, default-features = true }
 
 # Cumulus
 cumulus-test-service = { workspace = true }
diff --git a/cumulus/client/relay-chain-inprocess-interface/Cargo.toml b/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
index 9e6e8da929bb..2a590bbca562 100644
--- a/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
+++ b/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
@@ -19,9 +19,9 @@ futures-timer = { workspace = true }
 # Substrate
 sc-cli = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
+sc-sysinfo = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
 sc-tracing = { workspace = true, default-features = true }
-sc-sysinfo = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
@@ -42,9 +42,9 @@ cumulus-relay-chain-interface = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 
 # Polkadot
+metered = { features = ["futures_channel"], workspace = true }
 polkadot-primitives = { workspace = true, default-features = true }
 polkadot-test-client = { workspace = true }
-metered = { features = ["futures_channel"], workspace = true }
 
 # Cumulus
 cumulus-test-service = { workspace = true }
diff --git a/cumulus/client/relay-chain-interface/Cargo.toml b/cumulus/client/relay-chain-interface/Cargo.toml
index 2b9e72bbeca6..659d3b0f5b27 100644
--- a/cumulus/client/relay-chain-interface/Cargo.toml
+++ b/cumulus/client/relay-chain-interface/Cargo.toml
@@ -16,14 +16,14 @@ polkadot-overseer = { workspace = true, default-features = true }
 
 cumulus-primitives-core = { workspace = true, default-features = true }
 
+sc-client-api = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
 sp-version = { workspace = true }
 
-futures = { workspace = true }
 async-trait = { workspace = true }
-thiserror = { workspace = true }
-jsonrpsee-core = { workspace = true }
 codec = { workspace = true, default-features = true }
+futures = { workspace = true }
+jsonrpsee-core = { workspace = true }
+thiserror = { workspace = true }
diff --git a/cumulus/client/relay-chain-minimal-node/Cargo.toml b/cumulus/client/relay-chain-minimal-node/Cargo.toml
index 0fad188bb1ab..5b1e30cea9ba 100644
--- a/cumulus/client/relay-chain-minimal-node/Cargo.toml
+++ b/cumulus/client/relay-chain-minimal-node/Cargo.toml
@@ -13,37 +13,37 @@ workspace = true
 
 [dependencies]
 # polkadot deps
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-core-primitives = { workspace = true, default-features = true }
-polkadot-overseer = { workspace = true, default-features = true }
-polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
+polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-overseer = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
 polkadot-network-bridge = { workspace = true, default-features = true }
 polkadot-service = { workspace = true, default-features = true }
 
 # substrate deps
+prometheus-endpoint = { workspace = true, default-features = true }
 sc-authority-discovery = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-prometheus-endpoint = { workspace = true, default-features = true }
 sc-tracing = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
-sp-consensus-babe = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
+sp-consensus-babe = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-blockchain = { workspace = true, default-features = true }
 tokio = { features = ["macros"], workspace = true, default-features = true }
 
 # cumulus deps
+cumulus-primitives-core = { workspace = true, default-features = true }
 cumulus-relay-chain-interface = { workspace = true, default-features = true }
 cumulus-relay-chain-rpc-interface = { workspace = true, default-features = true }
-cumulus-primitives-core = { workspace = true, default-features = true }
 
 array-bytes = { workspace = true, default-features = true }
-tracing = { workspace = true, default-features = true }
 async-trait = { workspace = true }
 futures = { workspace = true }
+tracing = { workspace = true, default-features = true }
diff --git a/cumulus/client/relay-chain-rpc-interface/Cargo.toml b/cumulus/client/relay-chain-rpc-interface/Cargo.toml
index 162f5ad0e9e8..50b438e34237 100644
--- a/cumulus/client/relay-chain-rpc-interface/Cargo.toml
+++ b/cumulus/client/relay-chain-rpc-interface/Cargo.toml
@@ -20,36 +20,36 @@ polkadot-overseer = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true, default-features = true }
 cumulus-relay-chain-interface = { workspace = true, default-features = true }
 
+prometheus-endpoint = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
+sc-rpc-api = { workspace = true, default-features = true }
+sc-service = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-consensus-babe = { workspace = true, default-features = true }
 sp-authority-discovery = { workspace = true, default-features = true }
+sp-consensus-babe = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
 sp-storage = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-sc-rpc-api = { workspace = true, default-features = true }
-sc-service = { workspace = true, default-features = true }
-prometheus-endpoint = { workspace = true, default-features = true }
 
 tokio = { features = ["sync"], workspace = true, default-features = true }
 tokio-util = { features = ["compat"], workspace = true }
 
+async-trait = { workspace = true }
+codec = { workspace = true, default-features = true }
+either = { workspace = true, default-features = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
-codec = { workspace = true, default-features = true }
 jsonrpsee = { features = ["ws-client"], workspace = true }
-tracing = { workspace = true, default-features = true }
-async-trait = { workspace = true }
-url = { workspace = true }
-serde_json = { workspace = true, default-features = true }
-serde = { workspace = true, default-features = true }
+pin-project = { workspace = true }
+prometheus = { workspace = true }
+rand = { workspace = true, default-features = true }
 schnellru = { workspace = true }
+serde = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 smoldot = { default_features = false, features = ["std"], workspace = true }
 smoldot-light = { default_features = false, features = ["std"], workspace = true }
-either = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-rand = { workspace = true, default-features = true }
-pin-project = { workspace = true }
-prometheus = { workspace = true }
+tracing = { workspace = true, default-features = true }
+url = { workspace = true }
diff --git a/cumulus/client/service/Cargo.toml b/cumulus/client/service/Cargo.toml
index 193283648f19..c88386b985a4 100644
--- a/cumulus/client/service/Cargo.toml
+++ b/cumulus/client/service/Cargo.toml
@@ -18,22 +18,22 @@ futures-timer = { workspace = true }
 # Substrate
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
-sc-transaction-pool = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
+sc-network-sync = { workspace = true, default-features = true }
+sc-network-transactions = { workspace = true, default-features = true }
 sc-rpc = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
 sc-sysinfo = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
-sc-network = { workspace = true, default-features = true }
-sc-network-sync = { workspace = true, default-features = true }
+sc-transaction-pool = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
-sc-network-transactions = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-transaction-pool = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
 
 # Polkadot
 polkadot-primitives = { workspace = true, default-features = true }
@@ -42,10 +42,10 @@ polkadot-primitives = { workspace = true, default-features = true }
 cumulus-client-cli = { workspace = true, default-features = true }
 cumulus-client-collator = { workspace = true, default-features = true }
 cumulus-client-consensus-common = { workspace = true, default-features = true }
-cumulus-client-pov-recovery = { workspace = true, default-features = true }
 cumulus-client-network = { workspace = true, default-features = true }
+cumulus-client-pov-recovery = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true, default-features = true }
 cumulus-primitives-proof-size-hostfunction = { workspace = true, default-features = true }
-cumulus-relay-chain-interface = { workspace = true, default-features = true }
 cumulus-relay-chain-inprocess-interface = { workspace = true, default-features = true }
+cumulus-relay-chain-interface = { workspace = true, default-features = true }
 cumulus-relay-chain-minimal-node = { workspace = true, default-features = true }
diff --git a/cumulus/pallets/collator-selection/Cargo.toml b/cumulus/pallets/collator-selection/Cargo.toml
index 8d67db3daf8b..651cceebbc6e 100644
--- a/cumulus/pallets/collator-selection/Cargo.toml
+++ b/cumulus/pallets/collator-selection/Cargo.toml
@@ -16,29 +16,29 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-log = { workspace = true }
 codec = { features = ["derive"], workspace = true }
+log = { workspace = true }
 rand = { features = ["std_rng"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
-sp-runtime = { workspace = true }
-sp-staking = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-session = { workspace = true }
+sp-runtime = { workspace = true }
+sp-staking = { workspace = true }
 
 frame-benchmarking = { optional = true, workspace = true }
 
 [dev-dependencies]
+pallet-aura = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
+sp-consensus-aura = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
-sp-consensus-aura = { workspace = true, default-features = true }
-pallet-aura = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/pallets/dmp-queue/Cargo.toml b/cumulus/pallets/dmp-queue/Cargo.toml
index ae85a108fe72..4f5bbc97bfc2 100644
--- a/cumulus/pallets/dmp-queue/Cargo.toml
+++ b/cumulus/pallets/dmp-queue/Cargo.toml
@@ -21,8 +21,8 @@ scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-sp-runtime = { workspace = true }
 sp-io = { workspace = true }
+sp-runtime = { workspace = true }
 
 # Polkadot
 xcm = { workspace = true }
diff --git a/cumulus/pallets/parachain-system/Cargo.toml b/cumulus/pallets/parachain-system/Cargo.toml
index c911f8531da2..6b6bc4fbcefe 100644
--- a/cumulus/pallets/parachain-system/Cargo.toml
+++ b/cumulus/pallets/parachain-system/Cargo.toml
@@ -17,8 +17,8 @@ codec = { features = ["derive"], workspace = true }
 environmental = { workspace = true }
 impl-trait-for-tuples = { workspace = true }
 log = { workspace = true }
-trie-db = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
+trie-db = { workspace = true }
 
 # Substrate
 frame-benchmarking = { optional = true, workspace = true }
@@ -49,18 +49,18 @@ cumulus-primitives-proof-size-hostfunction = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
+futures = { workspace = true }
 hex-literal = { workspace = true, default-features = true }
-trie-standardmap = { workspace = true }
 rand = { workspace = true, default-features = true }
-futures = { workspace = true }
+trie-standardmap = { workspace = true }
 
 # Substrate
 sc-client-api = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
+sp-consensus-slots = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
-sp-consensus-slots = { workspace = true, default-features = true }
 
 # Cumulus
 cumulus-test-client = { workspace = true }
diff --git a/cumulus/pallets/parachain-system/proc-macro/Cargo.toml b/cumulus/pallets/parachain-system/proc-macro/Cargo.toml
index 629818f9c4cc..d4485a400cb8 100644
--- a/cumulus/pallets/parachain-system/proc-macro/Cargo.toml
+++ b/cumulus/pallets/parachain-system/proc-macro/Cargo.toml
@@ -15,10 +15,10 @@ workspace = true
 proc-macro = true
 
 [dependencies]
-syn = { workspace = true }
+proc-macro-crate = { workspace = true }
 proc-macro2 = { workspace = true }
 quote = { workspace = true }
-proc-macro-crate = { workspace = true }
+syn = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/pallets/session-benchmarking/Cargo.toml b/cumulus/pallets/session-benchmarking/Cargo.toml
index 5af94434e0af..6d77e567c9b6 100644
--- a/cumulus/pallets/session-benchmarking/Cargo.toml
+++ b/cumulus/pallets/session-benchmarking/Cargo.toml
@@ -17,11 +17,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-sp-runtime = { workspace = true }
+frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
 pallet-session = { workspace = true }
+sp-runtime = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/pallets/xcm/Cargo.toml b/cumulus/pallets/xcm/Cargo.toml
index ff9be866d48f..25938763c956 100644
--- a/cumulus/pallets/xcm/Cargo.toml
+++ b/cumulus/pallets/xcm/Cargo.toml
@@ -15,10 +15,10 @@ workspace = true
 codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
-sp-io = { workspace = true }
-sp-runtime = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+sp-io = { workspace = true }
+sp-runtime = { workspace = true }
 
 xcm = { workspace = true }
 
diff --git a/cumulus/pallets/xcmp-queue/Cargo.toml b/cumulus/pallets/xcmp-queue/Cargo.toml
index 432be3027e05..43dfae8927d2 100644
--- a/cumulus/pallets/xcmp-queue/Cargo.toml
+++ b/cumulus/pallets/xcmp-queue/Cargo.toml
@@ -19,24 +19,24 @@ scale-info = { features = ["derive"], workspace = true }
 # Substrate
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-sp-io = { workspace = true }
+pallet-message-queue = { workspace = true }
 sp-core = { workspace = true }
+sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-pallet-message-queue = { workspace = true }
 
 # Polkadot
 polkadot-runtime-common = { workspace = true }
 polkadot-runtime-parachains = { workspace = true }
 xcm = { workspace = true }
-xcm-executor = { workspace = true }
 xcm-builder = { workspace = true }
+xcm-executor = { workspace = true }
 
 # Cumulus
 cumulus-primitives-core = { workspace = true }
 
 # Optional import for benchmarking
-frame-benchmarking = { optional = true, workspace = true }
 bounded-collections = { workspace = true }
+frame-benchmarking = { optional = true, workspace = true }
 
 # Bridges
 bp-xcm-bridge-hub-router = { optional = true, workspace = true }
@@ -44,9 +44,9 @@ bp-xcm-bridge-hub-router = { optional = true, workspace = true }
 [dev-dependencies]
 
 # Substrate
-sp-core = { workspace = true, default-features = true }
-pallet-balances = { workspace = true, default-features = true }
 frame-support = { features = ["experimental"], workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 
 # Cumulus
 cumulus-pallet-parachain-system = { workspace = true, default-features = true }
diff --git a/cumulus/parachains/chain-specs/asset-hub-kusama.json b/cumulus/parachains/chain-specs/asset-hub-kusama.json
index 58b8ac019227..ae4409e4f44f 100644
--- a/cumulus/parachains/chain-specs/asset-hub-kusama.json
+++ b/cumulus/parachains/chain-specs/asset-hub-kusama.json
@@ -28,7 +28,8 @@
     "/dns/mine14.rotko.net/tcp/35524/wss/p2p/12D3KooWJUFnjR2PNbsJhudwPVaWCoZy1acPGKjM2cSuGj345BBu",
     "/dns/asset-hub-kusama.bootnodes.polkadotters.com/tcp/30511/p2p/12D3KooWDpk7wVH7RgjErEvbvAZ2kY5VeaAwRJP5ojmn1e8b8UbU",
     "/dns/asset-hub-kusama.bootnodes.polkadotters.com/tcp/30513/wss/p2p/12D3KooWDpk7wVH7RgjErEvbvAZ2kY5VeaAwRJP5ojmn1e8b8UbU",
-    "/dns/boot-kusama-assethub.luckyfriday.io/tcp/443/wss/p2p/12D3KooWSwaeFs6FNgpgh54fdoxSDAA4nJNaPE3PAcse2GRrG7b3"
+    "/dns/boot-kusama-assethub.luckyfriday.io/tcp/443/wss/p2p/12D3KooWSwaeFs6FNgpgh54fdoxSDAA4nJNaPE3PAcse2GRrG7b3",
+    "/dns/asset-hub-kusama-01.bootnode.stkd.io/tcp/30633/wss/p2p/12D3KooWNCg821LyWDVrAJ2mG6ScDeeBFuDPiJtLYc9jCGNCyMoq"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
diff --git a/cumulus/parachains/chain-specs/asset-hub-polkadot.json b/cumulus/parachains/chain-specs/asset-hub-polkadot.json
index 3e46501b0078..62efb924c171 100644
--- a/cumulus/parachains/chain-specs/asset-hub-polkadot.json
+++ b/cumulus/parachains/chain-specs/asset-hub-polkadot.json
@@ -28,7 +28,8 @@
     "/dns/mint14.rotko.net/tcp/35514/wss/p2p/12D3KooWKkzLjYF6M5eEs7nYiqEtRqY8SGVouoCwo3nCWsRnThDW",
     "/dns/asset-hub-polkadot.bootnodes.polkadotters.com/tcp/30508/p2p/12D3KooWKbfY9a9oywxMJKiALmt7yhrdQkjXMtvxhhDDN23vG93R",
     "/dns/asset-hub-polkadot.bootnodes.polkadotters.com/tcp/30510/wss/p2p/12D3KooWKbfY9a9oywxMJKiALmt7yhrdQkjXMtvxhhDDN23vG93R",
-    "/dns/boot-polkadot-assethub.luckyfriday.io/tcp/443/wss/p2p/12D3KooWDR9M7CjV1xdjCRbRwkFn1E7sjMaL4oYxGyDWxuLrFc2J"
+    "/dns/boot-polkadot-assethub.luckyfriday.io/tcp/443/wss/p2p/12D3KooWDR9M7CjV1xdjCRbRwkFn1E7sjMaL4oYxGyDWxuLrFc2J",
+    "/dns/asset-hub-polkadot-01.bootnode.stkd.io/tcp/30633/wss/p2p/12D3KooWJUhizuk3crSvpyKLGycHBtnP93rwjksVueveU6x6k6RY"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
diff --git a/cumulus/parachains/chain-specs/asset-hub-westend.json b/cumulus/parachains/chain-specs/asset-hub-westend.json
index 42717974a0b3..67a208c2787b 100644
--- a/cumulus/parachains/chain-specs/asset-hub-westend.json
+++ b/cumulus/parachains/chain-specs/asset-hub-westend.json
@@ -29,7 +29,8 @@
     "/dns/wmint14.rotko.net/tcp/34534/ws/p2p/12D3KooWE4UDXqgtTcMCyUQ8S4uvaT8VMzzTBA6NWmKuYwTacWuN",
     "/dns/wmint14.rotko.net/tcp/35534/wss/p2p/12D3KooWE4UDXqgtTcMCyUQ8S4uvaT8VMzzTBA6NWmKuYwTacWuN",
     "/dns/asset-hub-westend.bootnodes.polkadotters.com/tcp/30514/p2p/12D3KooWNFYysCqmojxqjjaTfD2VkWBNngfyUKWjcR4WFixfHNTk",
-    "/dns/asset-hub-westend.bootnodes.polkadotters.com/tcp/30516/wss/p2p/12D3KooWNFYysCqmojxqjjaTfD2VkWBNngfyUKWjcR4WFixfHNTk"
+    "/dns/asset-hub-westend.bootnodes.polkadotters.com/tcp/30516/wss/p2p/12D3KooWNFYysCqmojxqjjaTfD2VkWBNngfyUKWjcR4WFixfHNTk",
+    "/dns/asset-hub-westend-01.bootnode.stkd.io/tcp/30633/wss/p2p/12D3KooWDUPyF2q8b6fVFEuwxBbRV3coAy1kzuCPU3D9TRiLnUfE"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
diff --git a/cumulus/parachains/chain-specs/bridge-hub-kusama.json b/cumulus/parachains/chain-specs/bridge-hub-kusama.json
index 36558b325bbf..83910965584f 100644
--- a/cumulus/parachains/chain-specs/bridge-hub-kusama.json
+++ b/cumulus/parachains/chain-specs/bridge-hub-kusama.json
@@ -28,7 +28,8 @@
     "/dns/kbr13.rotko.net/tcp/35553/wss/p2p/12D3KooWAmBp54mUEYtvsk2kxNEsDbAvdUMcaghxKXgUQxmPEQ66",
     "/dns/bridge-hub-kusama.bootnodes.polkadotters.com/tcp/30520/p2p/12D3KooWH3pucezRRS5esoYyzZsUkKWcPSByQxEvmM819QL1HPLV",
     "/dns/bridge-hub-kusama.bootnodes.polkadotters.com/tcp/30522/wss/p2p/12D3KooWH3pucezRRS5esoYyzZsUkKWcPSByQxEvmM819QL1HPLV",
-    "/dns/boot-kusama-bridgehub.luckyfriday.io/tcp/443/wss/p2p/12D3KooWQybw6AFmAvrFfwUQnNxUpS12RovapD6oorh2mAJr4xyd"
+    "/dns/boot-kusama-bridgehub.luckyfriday.io/tcp/443/wss/p2p/12D3KooWQybw6AFmAvrFfwUQnNxUpS12RovapD6oorh2mAJr4xyd",
+    "/dns/bridge-hub-kusama-01.bootnode.stkd.io/tcp/30633/wss/p2p/12D3KooWBE1ZhrYqMC3ECFK6qbufS9kgKuF57XpvvZU6LKsPUSnF"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
diff --git a/cumulus/parachains/chain-specs/bridge-hub-polkadot.json b/cumulus/parachains/chain-specs/bridge-hub-polkadot.json
index eb22e09035f3..30585efaf4f1 100644
--- a/cumulus/parachains/chain-specs/bridge-hub-polkadot.json
+++ b/cumulus/parachains/chain-specs/bridge-hub-polkadot.json
@@ -28,7 +28,8 @@
     "/dns/bridge-hub-polkadot.bootnodes.polkadotters.com/tcp/30519/wss/p2p/12D3KooWLUNE3LHPDa1WrrZaYT7ArK66CLM1bPv7kKz74UcLnQRB",
     "/dns/boot-polkadot-bridgehub.luckyfriday.io/tcp/443/wss/p2p/12D3KooWKf3mBXHjLbwtPqv1BdbQuwbFNcQQYxASS7iQ25264AXH",
     "/dns/bridge-hub-polkadot.bootnode.amforc.com/tcp/29999/wss/p2p/12D3KooWGT5E56rAHfT5dY1pMLTrpAgV72yfDtD1Y5tPCHaTsifp",
-    "/dns/bridge-hub-polkadot.bootnode.amforc.com/tcp/30010/p2p/12D3KooWGT5E56rAHfT5dY1pMLTrpAgV72yfDtD1Y5tPCHaTsifp"
+    "/dns/bridge-hub-polkadot.bootnode.amforc.com/tcp/30010/p2p/12D3KooWGT5E56rAHfT5dY1pMLTrpAgV72yfDtD1Y5tPCHaTsifp",
+    "/dns/bridge-hub-polkadot-01.bootnode.stkd.io/tcp/30633/wss/p2p/12D3KooWSBpo6fYU8CUr4fwA14CKSDUSj5jSgZzQDBNL1B8Dnmaw"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
diff --git a/cumulus/parachains/chain-specs/bridge-hub-westend.json b/cumulus/parachains/chain-specs/bridge-hub-westend.json
index 40c7c7460c23..05d679a3e23f 100644
--- a/cumulus/parachains/chain-specs/bridge-hub-westend.json
+++ b/cumulus/parachains/chain-specs/bridge-hub-westend.json
@@ -29,7 +29,8 @@
     "/dns/bridge-hub-westend.bootnodes.polkadotters.com/tcp/30523/p2p/12D3KooWPkwgJofp4GeeRwNgXqkp2aFwdLkCWv3qodpBJLwK43Jj",
     "/dns/bridge-hub-westend.bootnodes.polkadotters.com/tcp/30525/wss/p2p/12D3KooWPkwgJofp4GeeRwNgXqkp2aFwdLkCWv3qodpBJLwK43Jj",
     "/dns/bridge-hub-westend.bootnode.amforc.com/tcp/29999/wss/p2p/12D3KooWDSWod2gMtHxunXot538oEMw9p42pnPrpRELdsfYyT8R6",
-    "/dns/bridge-hub-westend.bootnode.amforc.com/tcp/30007/p2p/12D3KooWDSWod2gMtHxunXot538oEMw9p42pnPrpRELdsfYyT8R6"
+    "/dns/bridge-hub-westend.bootnode.amforc.com/tcp/30007/p2p/12D3KooWDSWod2gMtHxunXot538oEMw9p42pnPrpRELdsfYyT8R6",
+    "/dns/bridge-hub-westend-01.bootnode.stkd.io/tcp/30633/wss/p2p/12D3KooWJEfDZxrEKehoPbW2Mfg6rypttMXCMgMiybmapKqcByc1"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
diff --git a/cumulus/parachains/chain-specs/collectives-polkadot.json b/cumulus/parachains/chain-specs/collectives-polkadot.json
index 5ccccbec9053..458530baf336 100644
--- a/cumulus/parachains/chain-specs/collectives-polkadot.json
+++ b/cumulus/parachains/chain-specs/collectives-polkadot.json
@@ -27,7 +27,8 @@
     "/dns/pch16.rotko.net/tcp/35576/wss/p2p/12D3KooWKrm3XmuGzJH17Wcn4HRDGsEjLZGDgN77q3ZhwnnQP7y1",
     "/dns/collectives-polkadot.bootnodes.polkadotters.com/tcp/30526/p2p/12D3KooWNohUjvJtGKUa8Vhy8C1ZBB5N8JATB6e7rdLVCioeb3ff",
     "/dns/collectives-polkadot.bootnodes.polkadotters.com/tcp/30528/wss/p2p/12D3KooWNohUjvJtGKUa8Vhy8C1ZBB5N8JATB6e7rdLVCioeb3ff",
-    "/dns/boot-polkadot-collectives.luckyfriday.io/tcp/443/wss/p2p/12D3KooWCzifnPooTt4kvTnXT7FTKTymVL7xn7DURQLsS2AKpf6w"
+    "/dns/boot-polkadot-collectives.luckyfriday.io/tcp/443/wss/p2p/12D3KooWCzifnPooTt4kvTnXT7FTKTymVL7xn7DURQLsS2AKpf6w",
+    "/dns/collectives-polkadot-01.bootnode.stkd.io/tcp/30633/wss/p2p/12D3KooWNscpobBzjPEdjbbjjKRYh9j1whYJvagRJwb9UH68zCPC"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
diff --git a/cumulus/parachains/chain-specs/collectives-westend.json b/cumulus/parachains/chain-specs/collectives-westend.json
index f583eddcef1f..aa0204df1a06 100644
--- a/cumulus/parachains/chain-specs/collectives-westend.json
+++ b/cumulus/parachains/chain-specs/collectives-westend.json
@@ -29,7 +29,8 @@
     "/dns/wch13.rotko.net/tcp/34593/ws/p2p/12D3KooWPG85zhuSRoyptjLkFD4iJFistjiBmc15JgQ96B4fdXYr",
     "/dns/wch13.rotko.net/tcp/35593/wss/p2p/12D3KooWPG85zhuSRoyptjLkFD4iJFistjiBmc15JgQ96B4fdXYr",
     "/dns/collectives-westend.bootnodes.polkadotters.com/tcp/30529/p2p/12D3KooWAFkXNSBfyPduZVgfS7pj5NuVpbU8Ee5gHeF8wvos7Yqn",
-    "/dns/collectives-westend.bootnodes.polkadotters.com/tcp/30531/wss/p2p/12D3KooWAFkXNSBfyPduZVgfS7pj5NuVpbU8Ee5gHeF8wvos7Yqn"
+    "/dns/collectives-westend.bootnodes.polkadotters.com/tcp/30531/wss/p2p/12D3KooWAFkXNSBfyPduZVgfS7pj5NuVpbU8Ee5gHeF8wvos7Yqn",
+    "/dns/collectives-westend-01.bootnode.stkd.io/tcp/30633/wss/p2p/12D3KooWFH7UZnWESzuRSgrLvNSfALjtpr9PmG7QGyRNCizWEHcd"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
diff --git a/cumulus/parachains/chain-specs/coretime-kusama.json b/cumulus/parachains/chain-specs/coretime-kusama.json
index 3e4ffae403bd..8352588a1e4b 100644
--- a/cumulus/parachains/chain-specs/coretime-kusama.json
+++ b/cumulus/parachains/chain-specs/coretime-kusama.json
@@ -26,7 +26,8 @@
     "/dns/coretime-kusama-bootnode.radiumblock.com/tcp/30333/p2p/12D3KooWFzW9AgxNfkVNCepVByS7URDCRDAA5p3XzBLVptqZvWoL",
     "/dns/coretime-kusama-bootnode.radiumblock.com/tcp/30336/wss/p2p/12D3KooWFzW9AgxNfkVNCepVByS7URDCRDAA5p3XzBLVptqZvWoL",
     "/dns/coretime-kusama.bootnode.amforc.com/tcp/29999/wss/p2p/12D3KooWPrgxrrumrANp6Bp2SMEwMQHPHDbPzA1HbcrakZrbFi5P",
-    "/dns/coretime-kusama.bootnode.amforc.com/tcp/30013/p2p/12D3KooWPrgxrrumrANp6Bp2SMEwMQHPHDbPzA1HbcrakZrbFi5P"
+    "/dns/coretime-kusama.bootnode.amforc.com/tcp/30013/p2p/12D3KooWPrgxrrumrANp6Bp2SMEwMQHPHDbPzA1HbcrakZrbFi5P",
+    "/dns/coretime-kusama-01.bootnode.stkd.io/tcp/30633/wss/p2p/12D3KooWMPc6jEjzFLRCK7QgbcNh3gvxCzGvDKhU4F66QWf2kZmq"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
diff --git a/cumulus/parachains/chain-specs/coretime-polkadot.json b/cumulus/parachains/chain-specs/coretime-polkadot.json
index e4f947d2afc9..7c12ee155b41 100644
--- a/cumulus/parachains/chain-specs/coretime-polkadot.json
+++ b/cumulus/parachains/chain-specs/coretime-polkadot.json
@@ -12,7 +12,8 @@
     "/dns/coretime-polkadot-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWGpmytHjdthrkKgkXDZyKm9ABtJ2PtGk9NStJDG4pChy9",
     "/dns/coretime-polkadot-boot-ng.dwellir.com/tcp/30361/p2p/12D3KooWGpmytHjdthrkKgkXDZyKm9ABtJ2PtGk9NStJDG4pChy9",
     "/dns/coretime-polkadot-bootnode.radiumblock.com/tcp/30333/p2p/12D3KooWFsQphSqvqjVyKcEdR1D7LPcXHqjmy6ASuJrTr5isk9JU",
-    "/dns/coretime-polkadot-bootnode.radiumblock.com/tcp/30336/wss/p2p/12D3KooWFsQphSqvqjVyKcEdR1D7LPcXHqjmy6ASuJrTr5isk9JU"
+    "/dns/coretime-polkadot-bootnode.radiumblock.com/tcp/30336/wss/p2p/12D3KooWFsQphSqvqjVyKcEdR1D7LPcXHqjmy6ASuJrTr5isk9JU",
+    "/dns/coretime-polkadot-01.bootnode.stkd.io/tcp/30633/wss/p2p/12D3KooWFG9WQQTf3MX3YQypZjJtoJM5zCQgJcqYdxxTStsbhZGU"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
diff --git a/cumulus/parachains/chain-specs/coretime-westend.json b/cumulus/parachains/chain-specs/coretime-westend.json
index 42f67526c29a..de6923bd7669 100644
--- a/cumulus/parachains/chain-specs/coretime-westend.json
+++ b/cumulus/parachains/chain-specs/coretime-westend.json
@@ -30,7 +30,8 @@
     "/dns/coretime-westend.bootnodes.polkadotters.com/tcp/30358/wss/p2p/12D3KooWDc9T2vQ8rHvX7hAt9eLWktD9Q89NDTcLm5STkuNbzUGf",
     "/dns/coretime-westend.bootnodes.polkadotters.com/tcp/30356/p2p/12D3KooWDc9T2vQ8rHvX7hAt9eLWktD9Q89NDTcLm5STkuNbzUGf",
     "/dns/coretime-westend.bootnode.amforc.com/tcp/29999/wss/p2p/12D3KooWG9a9H9An96E3kgXL1sirHta117iuacJXnJRaUywkMiSd",
-    "/dns/coretime-westend.bootnode.amforc.com/tcp/30013/p2p/12D3KooWG9a9H9An96E3kgXL1sirHta117iuacJXnJRaUywkMiSd"
+    "/dns/coretime-westend.bootnode.amforc.com/tcp/30013/p2p/12D3KooWG9a9H9An96E3kgXL1sirHta117iuacJXnJRaUywkMiSd",
+    "/dns/coretime-westend-01.bootnode.stkd.io/tcp/30633/wss/p2p/12D3KooWCFNzjaiq45ZpW2qStmQdG5w7ZHrmi3RWUeG8cV2pPc2Y"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
diff --git a/cumulus/parachains/chain-specs/people-kusama.json b/cumulus/parachains/chain-specs/people-kusama.json
index 300b9fcfb183..701e6e7dc1ec 100644
--- a/cumulus/parachains/chain-specs/people-kusama.json
+++ b/cumulus/parachains/chain-specs/people-kusama.json
@@ -28,7 +28,8 @@
     "/dns/ibp-boot-kusama-people.luckyfriday.io/tcp/30342/p2p/12D3KooWM4bRafMH2StfBEQtyj5cMWfGLYbuikCZmvKv9m1MQVPn",
     "/dns/ibp-boot-kusama-people.luckyfriday.io/tcp/443/wss/p2p/12D3KooWM4bRafMH2StfBEQtyj5cMWfGLYbuikCZmvKv9m1MQVPn",
     "/dns4/people-kusama.boot.stake.plus/tcp/30332/wss/p2p/12D3KooWRuKr3ogzXwD8zE2CTWenGdy8vSfViAjYMwGiwvFCsz8n",
-    "/dns/people-kusama.boot.stake.plus/tcp/31332/wss/p2p/12D3KooWFkDKdFxBJFyj9zumuJ4Mmctec2GqdYHcKYq8MTVe8dxf"
+    "/dns/people-kusama.boot.stake.plus/tcp/31332/wss/p2p/12D3KooWFkDKdFxBJFyj9zumuJ4Mmctec2GqdYHcKYq8MTVe8dxf",
+    "/dns/people-kusama-01.bootnode.stkd.io/tcp/30633/wss/p2p/12D3KooWN32MmhPgZN8e1Dmc8DzEUKsfC2hga3Lqekko4VWvrbhq"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
diff --git a/cumulus/parachains/chain-specs/people-polkadot.json b/cumulus/parachains/chain-specs/people-polkadot.json
index 083c0fbf44a4..ff8d57b9284d 100644
--- a/cumulus/parachains/chain-specs/people-polkadot.json
+++ b/cumulus/parachains/chain-specs/people-polkadot.json
@@ -8,7 +8,8 @@
     "/dns/polkadot-people-connect-0.polkadot.io/tcp/443/wss/p2p/12D3KooWP7BoJ7nAF9QnsreN8Eft1yHNUhvhxFiQyKFEUePi9mu3",
     "/dns/polkadot-people-connect-1.polkadot.io/tcp/443/wss/p2p/12D3KooWSSfWY3fTGJvGkuNUNBSNVCdLLNJnwkZSNQt7GCRYXu4o",
     "/dns/people-polkadot-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWKMYu1L28TkDf1ooMW8D8PHcztLnjV3bausH9eiVTRUYN",
-    "/dns/people-polkadot-boot-ng.dwellir.com/tcp/30346/p2p/12D3KooWKMYu1L28TkDf1ooMW8D8PHcztLnjV3bausH9eiVTRUYN"
+    "/dns/people-polkadot-boot-ng.dwellir.com/tcp/30346/p2p/12D3KooWKMYu1L28TkDf1ooMW8D8PHcztLnjV3bausH9eiVTRUYN",
+    "/dns/people-polkadot-01.bootnode.stkd.io/tcp/30633/wss/p2p/12D3KooWDf2aLDKHQyLkDzdEGs6exNzWWw62s2EK9g1wrujJzRZt"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
diff --git a/cumulus/parachains/chain-specs/people-westend.json b/cumulus/parachains/chain-specs/people-westend.json
index ac24b2e64359..e52d7b299e1d 100644
--- a/cumulus/parachains/chain-specs/people-westend.json
+++ b/cumulus/parachains/chain-specs/people-westend.json
@@ -28,7 +28,8 @@
     "/dns/wppl16.rotko.net/tcp/33766/p2p/12D3KooWHwUXBUo2WRMUBwPLC2ttVbnEk1KvDyESYAeKcNoCn7WS",
     "/dns/wppl16.rotko.net/tcp/35766/wss/p2p/12D3KooWHwUXBUo2WRMUBwPLC2ttVbnEk1KvDyESYAeKcNoCn7WS",
     "/dns/people-westend-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWBdCpCabhgBpLn67LWcXE2JJCCTMhuJHrfDNiTiCCr3KX",
-    "/dns/people-westend-boot-ng.dwellir.com/tcp/30355/p2p/12D3KooWBdCpCabhgBpLn67LWcXE2JJCCTMhuJHrfDNiTiCCr3KX"
+    "/dns/people-westend-boot-ng.dwellir.com/tcp/30355/p2p/12D3KooWBdCpCabhgBpLn67LWcXE2JJCCTMhuJHrfDNiTiCCr3KX",
+    "/dns/people-westend-01.bootnode.stkd.io/tcp/30633/wss/p2p/12D3KooWJzL4R3kq9Ms88gsV6bS9zGT8DHySdqwau5SHNqTzToNM"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
diff --git a/cumulus/parachains/common/Cargo.toml b/cumulus/parachains/common/Cargo.toml
index ae4d7fc1d115..6c52c3201c71 100644
--- a/cumulus/parachains/common/Cargo.toml
+++ b/cumulus/parachains/common/Cargo.toml
@@ -39,9 +39,9 @@ xcm = { workspace = true }
 xcm-executor = { workspace = true }
 
 # Cumulus
-pallet-collator-selection = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 cumulus-primitives-utility = { workspace = true }
+pallet-collator-selection = { workspace = true }
 parachain-info = { workspace = true }
 
 [dev-dependencies]
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/Cargo.toml
index 25796e7d64b4..a164a8197f72 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/Cargo.toml
@@ -13,15 +13,15 @@ workspace = true
 [dependencies]
 
 # Substrate
+frame-support = { workspace = true }
 sp-core = { workspace = true }
 sp-keyring = { workspace = true }
-frame-support = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
+asset-hub-rococo-runtime = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
-asset-hub-rococo-runtime = { workspace = true, default-features = true }
+parachains-common = { workspace = true, default-features = true }
 rococo-emulated-chain = { workspace = true }
 testnet-parachains-constants = { features = ["rococo"], workspace = true, default-features = true }
 
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/Cargo.toml
index 8e423ebbf9c2..c67b94d0db73 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/Cargo.toml
@@ -13,17 +13,17 @@ workspace = true
 [dependencies]
 
 # Substrate
+frame-support = { workspace = true }
 sp-core = { workspace = true }
 sp-keyring = { workspace = true }
-frame-support = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
+asset-hub-westend-runtime = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
-asset-hub-westend-runtime = { workspace = true }
-westend-emulated-chain = { workspace = true, default-features = true }
+parachains-common = { workspace = true, default-features = true }
 testnet-parachains-constants = { features = ["westend"], workspace = true, default-features = true }
+westend-emulated-chain = { workspace = true, default-features = true }
 
 # Polkadot
 xcm = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml
index 231265085eda..8b16d8ac27ae 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml
@@ -13,9 +13,9 @@ workspace = true
 [dependencies]
 
 # Substrate
+frame-support = { workspace = true }
 sp-core = { workspace = true }
 sp-keyring = { workspace = true }
-frame-support = { workspace = true }
 
 # Polkadot Dependencies
 xcm = { workspace = true }
@@ -24,8 +24,8 @@ xcm = { workspace = true }
 bp-messages = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
-emulated-integration-tests-common = { workspace = true }
-bridge-hub-rococo-runtime = { workspace = true, default-features = true }
 bridge-hub-common = { workspace = true }
+bridge-hub-rococo-runtime = { workspace = true, default-features = true }
+emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 testnet-parachains-constants = { features = ["rococo"], workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/Cargo.toml
index 8292e132809c..292b5bd3e434 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/Cargo.toml
@@ -13,9 +13,9 @@ workspace = true
 [dependencies]
 
 # Substrate
+frame-support = { workspace = true }
 sp-core = { workspace = true }
 sp-keyring = { workspace = true }
-frame-support = { workspace = true }
 
 # Polkadot Dependencies
 xcm = { workspace = true }
@@ -24,8 +24,8 @@ xcm = { workspace = true }
 bp-messages = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
-emulated-integration-tests-common = { workspace = true }
-bridge-hub-westend-runtime = { workspace = true, default-features = true }
 bridge-hub-common = { workspace = true }
+bridge-hub-westend-runtime = { workspace = true, default-features = true }
+emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 testnet-parachains-constants = { features = ["westend"], workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/collectives/collectives-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/collectives/collectives-westend/Cargo.toml
index 87dfd73ab05b..55e3ad6743ed 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/collectives/collectives-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/collectives/collectives-westend/Cargo.toml
@@ -13,12 +13,12 @@ workspace = true
 [dependencies]
 
 # Substrate
-sp-core = { workspace = true }
 frame-support = { workspace = true }
+sp-core = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
+collectives-westend-runtime = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
-collectives-westend-runtime = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 testnet-parachains-constants = { features = ["westend"], workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/coretime/coretime-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/coretime/coretime-rococo/Cargo.toml
index 94d43c5eee2f..8f12dc675199 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/coretime/coretime-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/coretime/coretime-rococo/Cargo.toml
@@ -13,12 +13,12 @@ workspace = true
 [dependencies]
 
 # Substrate
-sp-core = { workspace = true }
 frame-support = { workspace = true }
+sp-core = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
-cumulus-primitives-core = { workspace = true }
 coretime-rococo-runtime = { workspace = true, default-features = true }
+cumulus-primitives-core = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 testnet-parachains-constants = { features = ["rococo"], workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/coretime/coretime-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/coretime/coretime-westend/Cargo.toml
index 2640c27d016b..fad1000ac66c 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/coretime/coretime-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/coretime/coretime-westend/Cargo.toml
@@ -13,12 +13,12 @@ workspace = true
 [dependencies]
 
 # Substrate
-sp-core = { workspace = true }
 frame-support = { workspace = true }
+sp-core = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
-cumulus-primitives-core = { workspace = true }
 coretime-westend-runtime = { workspace = true, default-features = true }
+cumulus-primitives-core = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 testnet-parachains-constants = { features = ["westend"], workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/people/people-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/people/people-rococo/Cargo.toml
index 1549d6a2ab6b..c98e8629e31d 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/people/people-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/people/people-rococo/Cargo.toml
@@ -10,12 +10,12 @@ publish = false
 [dependencies]
 
 # Substrate
-sp-core = { workspace = true }
 frame-support = { workspace = true }
+sp-core = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 people-rococo-runtime = { workspace = true }
 testnet-parachains-constants = { features = ["rococo"], workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/people/people-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/people/people-westend/Cargo.toml
index 9c5ac0bca9de..598ba5488f85 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/people/people-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/people/people-westend/Cargo.toml
@@ -10,12 +10,12 @@ publish = false
 [dependencies]
 
 # Substrate
-sp-core = { workspace = true }
 frame-support = { workspace = true }
+sp-core = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 people-westend-runtime = { workspace = true }
 testnet-parachains-constants = { features = ["westend"], workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml
index 743cd7dc54a2..7e92e3bf9448 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml
@@ -13,15 +13,15 @@ workspace = true
 [dependencies]
 
 # Substrate
+frame-support = { workspace = true }
 sp-core = { workspace = true }
 sp-keyring = { workspace = true }
-frame-support = { workspace = true }
 
 # Polkadot
 xcm = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 penpal-runtime = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/relays/rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/relays/rococo/Cargo.toml
index 6db1263df8c7..ccf3854e67d8 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/relays/rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/relays/rococo/Cargo.toml
@@ -13,18 +13,18 @@ workspace = true
 [dependencies]
 
 # Substrate
-sp-core = { workspace = true }
-sp-keyring = { workspace = true }
+sc-consensus-grandpa = { workspace = true }
 sp-authority-discovery = { workspace = true }
 sp-consensus-babe = { workspace = true }
 sp-consensus-beefy = { workspace = true, default-features = true }
-sc-consensus-grandpa = { workspace = true }
+sp-core = { workspace = true }
+sp-keyring = { workspace = true }
 
 # Polkadot
 polkadot-primitives = { workspace = true }
-rococo-runtime-constants = { workspace = true }
 rococo-runtime = { workspace = true }
+rococo-runtime-constants = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/relays/westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/relays/westend/Cargo.toml
index de285d9885a2..9b980d7d39cc 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/relays/westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/relays/westend/Cargo.toml
@@ -13,21 +13,21 @@ workspace = true
 [dependencies]
 
 # Substrate
-sp-core = { workspace = true }
-sp-runtime = { workspace = true }
+pallet-staking = { workspace = true }
+sc-consensus-grandpa = { workspace = true }
 sp-authority-discovery = { workspace = true }
 sp-consensus-babe = { workspace = true }
 sp-consensus-beefy = { workspace = true, default-features = true }
-sc-consensus-grandpa = { workspace = true }
-pallet-staking = { workspace = true }
+sp-core = { workspace = true }
+sp-runtime = { workspace = true }
 
 # Polkadot
 polkadot-primitives = { workspace = true }
-westend-runtime-constants = { workspace = true }
 westend-runtime = { workspace = true }
+westend-runtime-constants = { workspace = true }
 xcm = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/common/Cargo.toml b/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
index 8282d12d317f..e921deb9c628 100644
--- a/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
@@ -16,36 +16,36 @@ codec = { workspace = true }
 paste = { workspace = true, default-features = true }
 
 # Substrate
-sp-consensus-beefy = { workspace = true, default-features = true }
-sc-consensus-grandpa = { workspace = true, default-features = true }
-sp-authority-discovery = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
 frame-support = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-consensus-babe = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
 pallet-assets = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
 pallet-message-queue = { workspace = true, default-features = true }
+sc-consensus-grandpa = { workspace = true, default-features = true }
+sp-authority-discovery = { workspace = true, default-features = true }
+sp-consensus-babe = { workspace = true, default-features = true }
+sp-consensus-beefy = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 
 # Polkadot
-polkadot-primitives = { workspace = true, default-features = true }
+pallet-xcm = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 polkadot-runtime-parachains = { workspace = true, default-features = true }
 xcm = { workspace = true, default-features = true }
-pallet-xcm = { workspace = true, default-features = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
+asset-test-utils = { workspace = true, default-features = true }
+cumulus-pallet-parachain-system = { workspace = true, default-features = true }
+cumulus-pallet-xcmp-queue = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true, default-features = true }
+parachains-common = { workspace = true, default-features = true }
 xcm-emulator = { workspace = true, default-features = true }
-cumulus-pallet-xcmp-queue = { workspace = true, default-features = true }
-cumulus-pallet-parachain-system = { workspace = true, default-features = true }
-asset-test-utils = { workspace = true, default-features = true }
 
 # Bridges
 bp-messages = { workspace = true, default-features = true }
 bp-xcm-bridge-hub = { workspace = true, default-features = true }
+bridge-runtime-common = { workspace = true, default-features = true }
 pallet-bridge-messages = { workspace = true, default-features = true }
 pallet-xcm-bridge-hub = { workspace = true, default-features = true }
-bridge-runtime-common = { workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/networks/rococo-system/Cargo.toml b/cumulus/parachains/integration-tests/emulated/networks/rococo-system/Cargo.toml
index 864f3c6edd7e..2f8889e48162 100644
--- a/cumulus/parachains/integration-tests/emulated/networks/rococo-system/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/networks/rococo-system/Cargo.toml
@@ -12,10 +12,10 @@ workspace = true
 
 [dependencies]
 # Cumulus
-emulated-integration-tests-common = { workspace = true }
-rococo-emulated-chain = { workspace = true }
 asset-hub-rococo-emulated-chain = { workspace = true }
 bridge-hub-rococo-emulated-chain = { workspace = true }
-people-rococo-emulated-chain = { workspace = true }
-penpal-emulated-chain = { workspace = true }
 coretime-rococo-emulated-chain = { workspace = true }
+emulated-integration-tests-common = { workspace = true }
+penpal-emulated-chain = { workspace = true }
+people-rococo-emulated-chain = { workspace = true }
+rococo-emulated-chain = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system/Cargo.toml b/cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system/Cargo.toml
index cd0cb272b7f5..1b789b21c7df 100644
--- a/cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system/Cargo.toml
@@ -12,11 +12,11 @@ workspace = true
 
 [dependencies]
 # Cumulus
-emulated-integration-tests-common = { workspace = true }
-rococo-emulated-chain = { workspace = true }
-westend-emulated-chain = { workspace = true, default-features = true }
 asset-hub-rococo-emulated-chain = { workspace = true }
 asset-hub-westend-emulated-chain = { workspace = true }
 bridge-hub-rococo-emulated-chain = { workspace = true }
 bridge-hub-westend-emulated-chain = { workspace = true }
+emulated-integration-tests-common = { workspace = true }
 penpal-emulated-chain = { workspace = true }
+rococo-emulated-chain = { workspace = true }
+westend-emulated-chain = { workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/networks/westend-system/Cargo.toml b/cumulus/parachains/integration-tests/emulated/networks/westend-system/Cargo.toml
index cec2e3733b2a..50e75a6bdd74 100644
--- a/cumulus/parachains/integration-tests/emulated/networks/westend-system/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/networks/westend-system/Cargo.toml
@@ -12,11 +12,11 @@ workspace = true
 
 [dependencies]
 # Cumulus
-emulated-integration-tests-common = { workspace = true }
-westend-emulated-chain = { workspace = true }
 asset-hub-westend-emulated-chain = { workspace = true }
 bridge-hub-westend-emulated-chain = { workspace = true }
 collectives-westend-emulated-chain = { workspace = true }
+coretime-westend-emulated-chain = { workspace = true }
+emulated-integration-tests-common = { workspace = true }
 penpal-emulated-chain = { workspace = true }
 people-westend-emulated-chain = { workspace = true }
-coretime-westend-emulated-chain = { workspace = true }
+westend-emulated-chain = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/Cargo.toml
index 3d40db6b03ab..9e8b8f2a52d7 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/Cargo.toml
@@ -11,31 +11,31 @@ publish = false
 workspace = true
 
 [dependencies]
-codec = { workspace = true }
 assert_matches = { workspace = true }
+codec = { workspace = true }
 
 # Substrate
-sp-runtime = { workspace = true }
-sp-core = { workspace = true }
 frame-support = { workspace = true }
-pallet-balances = { workspace = true }
-pallet-assets = { workspace = true }
 pallet-asset-conversion = { workspace = true }
+pallet-assets = { workspace = true }
+pallet-balances = { workspace = true }
 pallet-message-queue = { workspace = true }
 pallet-treasury = { workspace = true }
 pallet-utility = { workspace = true }
+sp-core = { workspace = true }
+sp-runtime = { workspace = true }
 
 # Polkadot
-xcm = { workspace = true }
 pallet-xcm = { workspace = true }
-xcm-executor = { workspace = true }
-xcm-runtime-apis = { workspace = true, default-features = true }
 polkadot-runtime-common = { workspace = true, default-features = true }
 rococo-runtime-constants = { workspace = true, default-features = true }
+xcm = { workspace = true }
+xcm-executor = { workspace = true }
+xcm-runtime-apis = { workspace = true, default-features = true }
 
 # Cumulus
 asset-test-utils = { workspace = true, default-features = true }
 cumulus-pallet-parachain-system = { workspace = true }
-parachains-common = { workspace = true, default-features = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 rococo-system-emulated-network = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/Cargo.toml
index 7117124b1d1f..5cd00c239e60 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/Cargo.toml
@@ -11,36 +11,36 @@ publish = false
 workspace = true
 
 [dependencies]
-codec = { workspace = true }
 assert_matches = { workspace = true }
+codec = { workspace = true }
 
 # Substrate
-sp-runtime = { workspace = true }
-sp-core = { workspace = true }
 frame-metadata-hash-extension = { workspace = true, default-features = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-pallet-balances = { workspace = true }
-pallet-assets = { workspace = true }
 pallet-asset-conversion = { workspace = true }
-pallet-treasury = { workspace = true }
+pallet-asset-tx-payment = { workspace = true }
+pallet-assets = { workspace = true }
+pallet-balances = { workspace = true }
 pallet-message-queue = { workspace = true }
 pallet-transaction-payment = { workspace = true }
-pallet-asset-tx-payment = { workspace = true }
+pallet-treasury = { workspace = true }
+sp-core = { workspace = true }
+sp-runtime = { workspace = true }
 
 # Polkadot
+pallet-xcm = { workspace = true }
 polkadot-runtime-common = { workspace = true, default-features = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
-pallet-xcm = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 # Cumulus
-assets-common = { workspace = true }
-parachains-common = { workspace = true, default-features = true }
 asset-test-utils = { workspace = true, default-features = true }
-cumulus-pallet-xcmp-queue = { workspace = true }
+assets-common = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
+cumulus-pallet-xcmp-queue = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 westend-system-emulated-network = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml
index 9f6fe78a33ee..7bb7277df45c 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml
@@ -12,21 +12,21 @@ workspace = true
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 hex-literal = { workspace = true, default-features = true }
+scale-info = { features = ["derive"], workspace = true }
 
 # Substrate
-sp-core = { workspace = true }
 frame-support = { workspace = true }
-pallet-assets = { workspace = true }
 pallet-asset-conversion = { workspace = true }
+pallet-assets = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-message-queue = { workspace = true, default-features = true }
+sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 
 # Polkadot
-xcm = { workspace = true }
 pallet-xcm = { workspace = true }
+xcm = { workspace = true }
 xcm-executor = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
@@ -44,7 +44,7 @@ testnet-parachains-constants = { features = ["rococo", "westend"], workspace = t
 
 # Snowbridge
 snowbridge-core = { workspace = true }
-snowbridge-router-primitives = { workspace = true }
-snowbridge-pallet-system = { workspace = true }
-snowbridge-pallet-outbound-queue = { workspace = true }
 snowbridge-pallet-inbound-queue-fixtures = { workspace = true, default-features = true }
+snowbridge-pallet-outbound-queue = { workspace = true }
+snowbridge-pallet-system = { workspace = true }
+snowbridge-router-primitives = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/Cargo.toml
index b87f25ac0f01..dc3bbb269d70 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/Cargo.toml
@@ -11,23 +11,23 @@ publish = false
 workspace = true
 
 [dependencies]
-hex-literal = { workspace = true, default-features = true }
 codec = { workspace = true }
+hex-literal = { workspace = true, default-features = true }
 log = { workspace = true }
 scale-info = { workspace = true }
 
 # Substrate
 frame-support = { workspace = true }
-pallet-assets = { workspace = true }
 pallet-asset-conversion = { workspace = true }
+pallet-assets = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-message-queue = { workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 
 # Polkadot
-xcm = { workspace = true }
 pallet-xcm = { workspace = true }
+xcm = { workspace = true }
 xcm-executor = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
@@ -36,18 +36,18 @@ pallet-bridge-messages = { workspace = true }
 pallet-xcm-bridge-hub = { workspace = true }
 
 # Cumulus
+asset-hub-westend-runtime = { workspace = true }
+bridge-hub-westend-runtime = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
 parachains-common = { workspace = true, default-features = true }
 rococo-westend-system-emulated-network = { workspace = true }
 testnet-parachains-constants = { features = ["rococo", "westend"], workspace = true, default-features = true }
-asset-hub-westend-runtime = { workspace = true }
-bridge-hub-westend-runtime = { workspace = true }
 
 # Snowbridge
 snowbridge-core = { workspace = true }
-snowbridge-router-primitives = { workspace = true }
-snowbridge-pallet-system = { workspace = true }
-snowbridge-pallet-outbound-queue = { workspace = true }
 snowbridge-pallet-inbound-queue = { workspace = true }
 snowbridge-pallet-inbound-queue-fixtures = { workspace = true }
+snowbridge-pallet-outbound-queue = { workspace = true }
+snowbridge-pallet-system = { workspace = true }
+snowbridge-router-primitives = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/tests/collectives/collectives-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/collectives/collectives-westend/Cargo.toml
index c4d281b75a77..1d4e93d40da4 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/collectives/collectives-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/collectives/collectives-westend/Cargo.toml
@@ -11,31 +11,31 @@ publish = false
 workspace = true
 
 [dependencies]
-codec = { workspace = true }
 assert_matches = { workspace = true }
+codec = { workspace = true }
 
 # Substrate
-sp-runtime = { workspace = true }
 frame-support = { workspace = true }
-pallet-balances = { workspace = true }
 pallet-asset-rate = { workspace = true }
 pallet-assets = { workspace = true }
-pallet-treasury = { workspace = true }
+pallet-balances = { workspace = true }
 pallet-message-queue = { workspace = true }
+pallet-treasury = { workspace = true }
 pallet-utility = { workspace = true }
 pallet-whitelist = { workspace = true }
+sp-runtime = { workspace = true }
 
 # Polkadot
+pallet-xcm = { workspace = true }
 polkadot-runtime-common = { workspace = true, default-features = true }
+westend-runtime-constants = { workspace = true, default-features = true }
 xcm = { workspace = true }
 xcm-executor = { workspace = true }
-pallet-xcm = { workspace = true }
-westend-runtime-constants = { workspace = true, default-features = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
-testnet-parachains-constants = { features = ["westend"], workspace = true, default-features = true }
-cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
+cumulus-pallet-xcmp-queue = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
+testnet-parachains-constants = { features = ["westend"], workspace = true, default-features = true }
 westend-system-emulated-network = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-rococo/Cargo.toml
index 28d9da0993ff..61397b1b8d40 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-rococo/Cargo.toml
@@ -13,8 +13,8 @@ publish = false
 frame-support = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-broker = { workspace = true, default-features = true }
-pallet-message-queue = { workspace = true }
 pallet-identity = { workspace = true }
+pallet-message-queue = { workspace = true }
 sp-runtime = { workspace = true }
 
 # Polkadot
diff --git a/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-westend/Cargo.toml
index d57e7926b0ec..9f0eadf13650 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-westend/Cargo.toml
@@ -13,8 +13,8 @@ publish = false
 frame-support = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-broker = { workspace = true, default-features = true }
-pallet-message-queue = { workspace = true }
 pallet-identity = { workspace = true }
+pallet-message-queue = { workspace = true }
 sp-runtime = { workspace = true }
 
 # Polkadot
diff --git a/cumulus/parachains/integration-tests/emulated/tests/people/people-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/people/people-rococo/Cargo.toml
index 011be93ecac7..8b12897ef018 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/people/people-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/people/people-rococo/Cargo.toml
@@ -13,8 +13,8 @@ codec = { workspace = true }
 # Substrate
 frame-support = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-message-queue = { workspace = true }
 pallet-identity = { workspace = true }
+pallet-message-queue = { workspace = true }
 sp-runtime = { workspace = true }
 
 # Polkadot
diff --git a/cumulus/parachains/integration-tests/emulated/tests/people/people-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/people/people-westend/Cargo.toml
index 53acd038cdf5..e069c1f61783 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/people/people-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/people/people-westend/Cargo.toml
@@ -13,15 +13,15 @@ codec = { workspace = true }
 # Substrate
 frame-support = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-message-queue = { workspace = true }
 pallet-identity = { workspace = true }
+pallet-message-queue = { workspace = true }
 pallet-xcm = { workspace = true }
 sp-runtime = { workspace = true }
 
 # Polkadot
 polkadot-runtime-common = { workspace = true, default-features = true }
-westend-runtime-constants = { workspace = true, default-features = true }
 westend-runtime = { workspace = true }
+westend-runtime-constants = { workspace = true, default-features = true }
 xcm = { workspace = true }
 xcm-executor = { workspace = true }
 
diff --git a/cumulus/parachains/pallets/ping/Cargo.toml b/cumulus/parachains/pallets/ping/Cargo.toml
index ceb38f39fd80..248b5d7202fa 100644
--- a/cumulus/parachains/pallets/ping/Cargo.toml
+++ b/cumulus/parachains/pallets/ping/Cargo.toml
@@ -15,14 +15,14 @@ workspace = true
 codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
-sp-runtime = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+sp-runtime = { workspace = true }
 
 xcm = { workspace = true }
 
-cumulus-primitives-core = { workspace = true }
 cumulus-pallet-xcm = { workspace = true }
+cumulus-primitives-core = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml
index 81ebc7e09494..c954ddb7b8c7 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml
@@ -27,10 +27,10 @@ frame-system = { workspace = true }
 frame-system-benchmarking = { optional = true, workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
 frame-try-runtime = { optional = true, workspace = true }
+pallet-asset-conversion = { workspace = true }
+pallet-asset-conversion-ops = { workspace = true }
 pallet-asset-conversion-tx-payment = { workspace = true }
 pallet-assets = { workspace = true }
-pallet-asset-conversion-ops = { workspace = true }
-pallet-asset-conversion = { workspace = true }
 pallet-assets-freezer = { workspace = true }
 pallet-aura = { workspace = true }
 pallet-authorship = { workspace = true }
@@ -51,9 +51,9 @@ sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
-sp-keyring = { workspace = true }
-sp-inherents = { workspace = true }
 sp-genesis-builder = { workspace = true }
+sp-inherents = { workspace = true }
+sp-keyring = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
@@ -65,17 +65,18 @@ sp-weights = { workspace = true }
 primitive-types = { features = ["codec", "num-traits", "scale-info"], workspace = true }
 
 # Polkadot
-rococo-runtime-constants = { workspace = true }
 pallet-xcm = { workspace = true }
 pallet-xcm-benchmarks = { optional = true, workspace = true }
 polkadot-parachain-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
+rococo-runtime-constants = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 # Cumulus
+assets-common = { workspace = true }
 cumulus-pallet-aura-ext = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-session-benchmarking = { workspace = true }
@@ -83,20 +84,19 @@ cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { features = ["bridging"], workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+cumulus-primitives-utility = { workspace = true }
 pallet-collator-selection = { workspace = true }
 parachain-info = { workspace = true }
 parachains-common = { workspace = true }
 testnet-parachains-constants = { features = ["rococo"], workspace = true }
-assets-common = { workspace = true }
 
 # Bridges
-pallet-xcm-bridge-hub-router = { workspace = true }
 bp-asset-hub-rococo = { workspace = true }
 bp-asset-hub-westend = { workspace = true }
 bp-bridge-hub-rococo = { workspace = true }
 bp-bridge-hub-westend = { workspace = true }
+pallet-xcm-bridge-hub-router = { workspace = true }
 snowbridge-router-primitives = { workspace = true }
 
 [dev-dependencies]
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
index 7e1fb247ad3c..dd1535826152 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
@@ -124,7 +124,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: alloc::borrow::Cow::Borrowed("statemine"),
 	impl_name: alloc::borrow::Cow::Borrowed("statemine"),
 	authoring_version: 1,
-	spec_version: 1_016_002,
+	spec_version: 1_017_001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 16,
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm.rs
index 51b6543bae82..8506125d4133 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm.rs
@@ -17,25 +17,27 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-02-20, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-12-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-bn-ce5rx-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `55b2c3410882`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // target/production/polkadot-parachain
 // benchmark
 // pallet
-// --steps=50
-// --repeat=20
 // --extrinsic=*
+// --chain=asset-hub-rococo-dev
+// --pallet=pallet_xcm
+// --header=/__w/polkadot-sdk/polkadot-sdk/cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights
 // --wasm-execution=compiled
+// --steps=50
+// --repeat=20
 // --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
-// --pallet=pallet_xcm
-// --chain=asset-hub-rococo-dev
-// --header=./cumulus/file_header.txt
-// --output=./cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/
+// --no-storage-info
+// --no-min-squares
+// --no-median-slopes
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -64,14 +66,16 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 22_136_000 picoseconds.
-		Weight::from_parts(22_518_000, 0)
+		// Minimum execution time: 28_401_000 picoseconds.
+		Weight::from_parts(29_326_000, 0)
 			.saturating_add(Weight::from_parts(0, 3610))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
@@ -90,18 +94,20 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 92_277_000 picoseconds.
-		Weight::from_parts(94_843_000, 0)
+		// Minimum execution time: 109_686_000 picoseconds.
+		Weight::from_parts(114_057_000, 0)
 			.saturating_add(Weight::from_parts(0, 3610))
-			.saturating_add(T::DbWeight::get().reads(8))
+			.saturating_add(T::DbWeight::get().reads(9))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `XcmpQueue::DeliveryFeeFactor` (r:1 w:0)
-	/// Proof: `XcmpQueue::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Proof: `XcmpQueue::DeliveryFeeFactor` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -111,25 +117,29 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Storage: `ParachainSystem::RelevantMessagingState` (r:1 w:0)
 	/// Proof: `ParachainSystem::RelevantMessagingState` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
-	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: Some(1282), added: 1777, mode: `MaxEncodedLen`)
 	/// Storage: `XcmpQueue::OutboundXcmpMessages` (r:0 w:1)
-	/// Proof: `XcmpQueue::OutboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Proof: `XcmpQueue::OutboundXcmpMessages` (`max_values`: None, `max_size`: Some(105506), added: 107981, mode: `MaxEncodedLen`)
 	fn reserve_transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `400`
 		//  Estimated: `6196`
-		// Minimum execution time: 120_110_000 picoseconds.
-		Weight::from_parts(122_968_000, 0)
+		// Minimum execution time: 137_693_000 picoseconds.
+		Weight::from_parts(142_244_000, 0)
 			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Assets::Asset` (r:1 w:1)
 	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
 	/// Storage: `Assets::Account` (r:2 w:2)
 	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
+	/// Storage: `AssetsFreezer::FrozenBalances` (r:1 w:0)
+	/// Proof: `AssetsFreezer::FrozenBalances` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
@@ -146,23 +156,24 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `496`
+		//  Measured:  `537`
 		//  Estimated: `6208`
-		// Minimum execution time: 143_116_000 picoseconds.
-		Weight::from_parts(147_355_000, 0)
+		// Minimum execution time: 178_291_000 picoseconds.
+		Weight::from_parts(185_648_000, 0)
 			.saturating_add(Weight::from_parts(0, 6208))
-			.saturating_add(T::DbWeight::get().reads(12))
+			.saturating_add(T::DbWeight::get().reads(14))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
-	/// Storage: `Benchmark::Override` (r:0 w:0)
-	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn execute() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
-		Weight::from_parts(18_446_744_073_709_551_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
+		//  Measured:  `103`
+		//  Estimated: `1588`
+		// Minimum execution time: 14_014_000 picoseconds.
+		Weight::from_parts(14_522_000, 0)
+			.saturating_add(Weight::from_parts(0, 1588))
+			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:0 w:1)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -170,8 +181,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_517_000 picoseconds.
-		Weight::from_parts(6_756_000, 0)
+		// Minimum execution time: 7_195_000 picoseconds.
+		Weight::from_parts(7_440_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -181,8 +192,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_894_000 picoseconds.
-		Weight::from_parts(2_024_000, 0)
+		// Minimum execution time: 2_278_000 picoseconds.
+		Weight::from_parts(2_488_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -208,8 +219,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 27_314_000 picoseconds.
-		Weight::from_parts(28_787_000, 0)
+		// Minimum execution time: 35_095_000 picoseconds.
+		Weight::from_parts(36_347_000, 0)
 			.saturating_add(Weight::from_parts(0, 3610))
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(5))
@@ -234,8 +245,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `363`
 		//  Estimated: `3828`
-		// Minimum execution time: 29_840_000 picoseconds.
-		Weight::from_parts(30_589_000, 0)
+		// Minimum execution time: 38_106_000 picoseconds.
+		Weight::from_parts(38_959_000, 0)
 			.saturating_add(Weight::from_parts(0, 3828))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -246,45 +257,45 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_893_000 picoseconds.
-		Weight::from_parts(2_017_000, 0)
+		// Minimum execution time: 2_307_000 picoseconds.
+		Weight::from_parts(2_478_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:5 w:2)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:6 w:2)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `159`
-		//  Estimated: `13524`
-		// Minimum execution time: 19_211_000 picoseconds.
-		Weight::from_parts(19_552_000, 0)
-			.saturating_add(Weight::from_parts(0, 13524))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15999`
+		// Minimum execution time: 25_238_000 picoseconds.
+		Weight::from_parts(25_910_000, 0)
+			.saturating_add(Weight::from_parts(0, 15999))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `163`
-		//  Estimated: `13528`
-		// Minimum execution time: 19_177_000 picoseconds.
-		Weight::from_parts(19_704_000, 0)
-			.saturating_add(Weight::from_parts(0, 13528))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `16003`
+		// Minimum execution time: 25_626_000 picoseconds.
+		Weight::from_parts(26_147_000, 0)
+			.saturating_add(Weight::from_parts(0, 16003))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:7 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `173`
-		//  Estimated: `16013`
-		// Minimum execution time: 20_449_000 picoseconds.
-		Weight::from_parts(21_075_000, 0)
-			.saturating_add(Weight::from_parts(0, 16013))
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Estimated: `18488`
+		// Minimum execution time: 28_528_000 picoseconds.
+		Weight::from_parts(28_882_000, 0)
+			.saturating_add(Weight::from_parts(0, 18488))
+			.saturating_add(T::DbWeight::get().reads(7))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -304,36 +315,36 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `212`
 		//  Estimated: `6152`
-		// Minimum execution time: 26_578_000 picoseconds.
-		Weight::from_parts(27_545_000, 0)
+		// Minimum execution time: 33_042_000 picoseconds.
+		Weight::from_parts(34_444_000, 0)
 			.saturating_add(Weight::from_parts(0, 6152))
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `206`
-		//  Estimated: `11096`
-		// Minimum execution time: 11_646_000 picoseconds.
-		Weight::from_parts(11_944_000, 0)
-			.saturating_add(Weight::from_parts(0, 11096))
-			.saturating_add(T::DbWeight::get().reads(4))
+		//  Measured:  `176`
+		//  Estimated: `13541`
+		// Minimum execution time: 18_218_000 picoseconds.
+		Weight::from_parts(18_622_000, 0)
+			.saturating_add(Weight::from_parts(0, 13541))
+			.saturating_add(T::DbWeight::get().reads(5))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `170`
-		//  Estimated: `13535`
-		// Minimum execution time: 19_301_000 picoseconds.
-		Weight::from_parts(19_664_000, 0)
-			.saturating_add(Weight::from_parts(0, 13535))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `16010`
+		// Minimum execution time: 25_838_000 picoseconds.
+		Weight::from_parts(26_276_000, 0)
+			.saturating_add(Weight::from_parts(0, 16010))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -350,11 +361,11 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `212`
-		//  Estimated: `13577`
-		// Minimum execution time: 35_715_000 picoseconds.
-		Weight::from_parts(36_915_000, 0)
-			.saturating_add(Weight::from_parts(0, 13577))
-			.saturating_add(T::DbWeight::get().reads(11))
+		//  Estimated: `16052`
+		// Minimum execution time: 46_196_000 picoseconds.
+		Weight::from_parts(47_859_000, 0)
+			.saturating_add(Weight::from_parts(0, 16052))
+			.saturating_add(T::DbWeight::get().reads(12))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
@@ -365,8 +376,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `103`
 		//  Estimated: `1588`
-		// Minimum execution time: 4_871_000 picoseconds.
-		Weight::from_parts(5_066_000, 0)
+		// Minimum execution time: 7_068_000 picoseconds.
+		Weight::from_parts(7_442_000, 0)
 			.saturating_add(Weight::from_parts(0, 1588))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -377,22 +388,24 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `7740`
 		//  Estimated: `11205`
-		// Minimum execution time: 25_150_000 picoseconds.
-		Weight::from_parts(26_119_000, 0)
+		// Minimum execution time: 31_497_000 picoseconds.
+		Weight::from_parts(31_975_000, 0)
 			.saturating_add(Weight::from_parts(0, 11205))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1)
 	/// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn claim_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `160`
 		//  Estimated: `3625`
-		// Minimum execution time: 38_248_000 picoseconds.
-		Weight::from_parts(39_122_000, 0)
+		// Minimum execution time: 44_534_000 picoseconds.
+		Weight::from_parts(46_175_000, 0)
 			.saturating_add(Weight::from_parts(0, 3625))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 }
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
index 7dd2a4ab4b51..7c31745d8f6e 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
@@ -27,10 +27,10 @@ frame-system = { workspace = true }
 frame-system-benchmarking = { optional = true, workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
 frame-try-runtime = { optional = true, workspace = true }
+pallet-asset-conversion = { workspace = true }
 pallet-asset-conversion-ops = { workspace = true }
 pallet-asset-conversion-tx-payment = { workspace = true }
 pallet-assets = { workspace = true }
-pallet-asset-conversion = { workspace = true }
 pallet-assets-freezer = { workspace = true }
 pallet-aura = { workspace = true }
 pallet-authorship = { workspace = true }
@@ -40,21 +40,21 @@ pallet-nft-fractionalization = { workspace = true }
 pallet-nfts = { workspace = true }
 pallet-nfts-runtime-api = { workspace = true }
 pallet-proxy = { workspace = true }
+pallet-revive = { workspace = true }
 pallet-session = { workspace = true }
 pallet-state-trie-migration = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-uniques = { workspace = true }
-pallet-revive = { workspace = true }
 pallet-utility = { workspace = true }
 sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
-sp-keyring = { workspace = true }
 sp-genesis-builder = { workspace = true }
 sp-inherents = { workspace = true }
+sp-keyring = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
@@ -77,28 +77,28 @@ xcm-executor = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 # Cumulus
+assets-common = { workspace = true }
 cumulus-pallet-aura-ext = { workspace = true }
-pallet-message-queue = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-session-benchmarking = { workspace = true }
 cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { features = ["bridging"], workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+cumulus-primitives-utility = { workspace = true }
 pallet-collator-selection = { workspace = true }
+pallet-message-queue = { workspace = true }
 parachain-info = { workspace = true }
 parachains-common = { workspace = true }
 testnet-parachains-constants = { features = ["westend"], workspace = true }
-assets-common = { workspace = true }
 
 # Bridges
-pallet-xcm-bridge-hub-router = { workspace = true }
 bp-asset-hub-rococo = { workspace = true }
 bp-asset-hub-westend = { workspace = true }
 bp-bridge-hub-rococo = { workspace = true }
 bp-bridge-hub-westend = { workspace = true }
+pallet-xcm-bridge-hub-router = { workspace = true }
 snowbridge-router-primitives = { workspace = true }
 
 [dev-dependencies]
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
index ffd54ce4c8ac..707d1c52f743 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -125,7 +125,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: alloc::borrow::Cow::Borrowed("westmint"),
 	impl_name: alloc::borrow::Cow::Borrowed("westmint"),
 	authoring_version: 1,
-	spec_version: 1_017_002,
+	spec_version: 1_017_003,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 16,
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_xcm.rs
index be3d7661ab3c..93409463d4e5 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_xcm.rs
@@ -17,25 +17,27 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-04-01, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-12-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-f3xfxtob-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `c0a5c14955e4`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-westend-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // target/production/polkadot-parachain
 // benchmark
 // pallet
-// --steps=50
-// --repeat=20
 // --extrinsic=*
+// --chain=asset-hub-westend-dev
+// --pallet=pallet_xcm
+// --header=/__w/polkadot-sdk/polkadot-sdk/cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights
 // --wasm-execution=compiled
+// --steps=50
+// --repeat=20
 // --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
-// --pallet=pallet_xcm
-// --chain=asset-hub-westend-dev
-// --header=./cumulus/file_header.txt
-// --output=./cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/
+// --no-storage-info
+// --no-min-squares
+// --no-median-slopes
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -64,14 +66,16 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 21_050_000 picoseconds.
-		Weight::from_parts(21_834_000, 0)
+		// Minimum execution time: 28_333_000 picoseconds.
+		Weight::from_parts(29_115_000, 0)
 			.saturating_add(Weight::from_parts(0, 3610))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
@@ -90,18 +94,20 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 92_497_000 picoseconds.
-		Weight::from_parts(95_473_000, 0)
+		// Minimum execution time: 111_150_000 picoseconds.
+		Weight::from_parts(113_250_000, 0)
 			.saturating_add(Weight::from_parts(0, 3610))
-			.saturating_add(T::DbWeight::get().reads(8))
+			.saturating_add(T::DbWeight::get().reads(9))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `XcmpQueue::DeliveryFeeFactor` (r:1 w:0)
-	/// Proof: `XcmpQueue::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Proof: `XcmpQueue::DeliveryFeeFactor` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -111,25 +117,29 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Storage: `ParachainSystem::RelevantMessagingState` (r:1 w:0)
 	/// Proof: `ParachainSystem::RelevantMessagingState` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
-	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: Some(1282), added: 1777, mode: `MaxEncodedLen`)
 	/// Storage: `XcmpQueue::OutboundXcmpMessages` (r:0 w:1)
-	/// Proof: `XcmpQueue::OutboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Proof: `XcmpQueue::OutboundXcmpMessages` (`max_values`: None, `max_size`: Some(105506), added: 107981, mode: `MaxEncodedLen`)
 	fn reserve_transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `367`
+		//  Measured:  `400`
 		//  Estimated: `6196`
-		// Minimum execution time: 120_059_000 picoseconds.
-		Weight::from_parts(122_894_000, 0)
+		// Minimum execution time: 135_730_000 picoseconds.
+		Weight::from_parts(140_479_000, 0)
 			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Assets::Asset` (r:1 w:1)
 	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
 	/// Storage: `Assets::Account` (r:2 w:2)
 	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
+	/// Storage: `AssetsFreezer::FrozenBalances` (r:1 w:0)
+	/// Proof: `AssetsFreezer::FrozenBalances` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
@@ -146,21 +156,24 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `496`
+		//  Measured:  `571`
 		//  Estimated: `6208`
-		// Minimum execution time: 141_977_000 picoseconds.
-		Weight::from_parts(145_981_000, 0)
+		// Minimum execution time: 174_654_000 picoseconds.
+		Weight::from_parts(182_260_000, 0)
 			.saturating_add(Weight::from_parts(0, 6208))
-			.saturating_add(T::DbWeight::get().reads(12))
+			.saturating_add(T::DbWeight::get().reads(14))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn execute() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 7_426_000 picoseconds.
-		Weight::from_parts(7_791_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
+		//  Measured:  `103`
+		//  Estimated: `1588`
+		// Minimum execution time: 12_750_000 picoseconds.
+		Weight::from_parts(13_124_000, 0)
+			.saturating_add(Weight::from_parts(0, 1588))
+			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:0 w:1)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -168,8 +181,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_224_000 picoseconds.
-		Weight::from_parts(6_793_000, 0)
+		// Minimum execution time: 7_083_000 picoseconds.
+		Weight::from_parts(7_353_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -179,8 +192,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_812_000 picoseconds.
-		Weight::from_parts(2_008_000, 0)
+		// Minimum execution time: 2_254_000 picoseconds.
+		Weight::from_parts(2_408_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -206,8 +219,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 26_586_000 picoseconds.
-		Weight::from_parts(27_181_000, 0)
+		// Minimum execution time: 34_983_000 picoseconds.
+		Weight::from_parts(35_949_000, 0)
 			.saturating_add(Weight::from_parts(0, 3610))
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(5))
@@ -232,8 +245,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `363`
 		//  Estimated: `3828`
-		// Minimum execution time: 28_295_000 picoseconds.
-		Weight::from_parts(29_280_000, 0)
+		// Minimum execution time: 38_226_000 picoseconds.
+		Weight::from_parts(39_353_000, 0)
 			.saturating_add(Weight::from_parts(0, 3828))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -244,45 +257,45 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_803_000 picoseconds.
-		Weight::from_parts(1_876_000, 0)
+		// Minimum execution time: 2_254_000 picoseconds.
+		Weight::from_parts(2_432_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:5 w:2)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:6 w:2)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `159`
-		//  Estimated: `13524`
-		// Minimum execution time: 18_946_000 picoseconds.
-		Weight::from_parts(19_456_000, 0)
-			.saturating_add(Weight::from_parts(0, 13524))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15999`
+		// Minimum execution time: 25_561_000 picoseconds.
+		Weight::from_parts(26_274_000, 0)
+			.saturating_add(Weight::from_parts(0, 15999))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `163`
-		//  Estimated: `13528`
-		// Minimum execution time: 19_080_000 picoseconds.
-		Weight::from_parts(19_498_000, 0)
-			.saturating_add(Weight::from_parts(0, 13528))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `16003`
+		// Minimum execution time: 25_950_000 picoseconds.
+		Weight::from_parts(26_532_000, 0)
+			.saturating_add(Weight::from_parts(0, 16003))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:7 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `173`
-		//  Estimated: `16013`
-		// Minimum execution time: 20_637_000 picoseconds.
-		Weight::from_parts(21_388_000, 0)
-			.saturating_add(Weight::from_parts(0, 16013))
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Estimated: `18488`
+		// Minimum execution time: 28_508_000 picoseconds.
+		Weight::from_parts(29_178_000, 0)
+			.saturating_add(Weight::from_parts(0, 18488))
+			.saturating_add(T::DbWeight::get().reads(7))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -302,36 +315,36 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `212`
 		//  Estimated: `6152`
-		// Minimum execution time: 25_701_000 picoseconds.
-		Weight::from_parts(26_269_000, 0)
+		// Minimum execution time: 33_244_000 picoseconds.
+		Weight::from_parts(33_946_000, 0)
 			.saturating_add(Weight::from_parts(0, 6152))
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `206`
-		//  Estimated: `11096`
-		// Minimum execution time: 11_949_000 picoseconds.
-		Weight::from_parts(12_249_000, 0)
-			.saturating_add(Weight::from_parts(0, 11096))
-			.saturating_add(T::DbWeight::get().reads(4))
+		//  Measured:  `176`
+		//  Estimated: `13541`
+		// Minimum execution time: 18_071_000 picoseconds.
+		Weight::from_parts(18_677_000, 0)
+			.saturating_add(Weight::from_parts(0, 13541))
+			.saturating_add(T::DbWeight::get().reads(5))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `170`
-		//  Estimated: `13535`
-		// Minimum execution time: 19_278_000 picoseconds.
-		Weight::from_parts(19_538_000, 0)
-			.saturating_add(Weight::from_parts(0, 13535))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `16010`
+		// Minimum execution time: 25_605_000 picoseconds.
+		Weight::from_parts(26_284_000, 0)
+			.saturating_add(Weight::from_parts(0, 16010))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -348,11 +361,11 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `212`
-		//  Estimated: `13577`
-		// Minimum execution time: 35_098_000 picoseconds.
-		Weight::from_parts(35_871_000, 0)
-			.saturating_add(Weight::from_parts(0, 13577))
-			.saturating_add(T::DbWeight::get().reads(11))
+		//  Estimated: `16052`
+		// Minimum execution time: 46_991_000 picoseconds.
+		Weight::from_parts(47_866_000, 0)
+			.saturating_add(Weight::from_parts(0, 16052))
+			.saturating_add(T::DbWeight::get().reads(12))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
@@ -363,8 +376,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `103`
 		//  Estimated: `1588`
-		// Minimum execution time: 3_862_000 picoseconds.
-		Weight::from_parts(4_082_000, 0)
+		// Minimum execution time: 5_685_000 picoseconds.
+		Weight::from_parts(5_816_000, 0)
 			.saturating_add(Weight::from_parts(0, 1588))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -375,22 +388,24 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `7740`
 		//  Estimated: `11205`
-		// Minimum execution time: 25_423_000 picoseconds.
-		Weight::from_parts(25_872_000, 0)
+		// Minimum execution time: 31_271_000 picoseconds.
+		Weight::from_parts(32_195_000, 0)
 			.saturating_add(Weight::from_parts(0, 11205))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1)
 	/// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn claim_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `160`
 		//  Estimated: `3625`
-		// Minimum execution time: 37_148_000 picoseconds.
-		Weight::from_parts(37_709_000, 0)
+		// Minimum execution time: 43_530_000 picoseconds.
+		Weight::from_parts(44_942_000, 0)
 			.saturating_add(Weight::from_parts(0, 3625))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 }
diff --git a/cumulus/parachains/runtimes/assets/common/Cargo.toml b/cumulus/parachains/runtimes/assets/common/Cargo.toml
index 552afa4daa68..de74f59f43c0 100644
--- a/cumulus/parachains/runtimes/assets/common/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/common/Cargo.toml
@@ -13,16 +13,16 @@ workspace = true
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-log = { workspace = true }
 impl-trait-for-tuples = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 
 # Substrate
 frame-support = { workspace = true }
+pallet-asset-conversion = { workspace = true }
+pallet-assets = { workspace = true }
 sp-api = { workspace = true }
 sp-runtime = { workspace = true }
-pallet-assets = { workspace = true }
-pallet-asset-conversion = { workspace = true }
 
 # Polkadot
 pallet-xcm = { workspace = true }
@@ -31,8 +31,8 @@ xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true }
 cumulus-primitives-core = { workspace = true }
+parachains-common = { workspace = true }
 
 [build-dependencies]
 substrate-wasm-builder = { workspace = true, default-features = true }
diff --git a/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml b/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml
index 393d06f95b15..cad8d10a7da3 100644
--- a/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml
@@ -17,28 +17,28 @@ codec = { features = ["derive", "max-encoded-len"], workspace = true }
 # Substrate
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-pallet-assets = { workspace = true }
 pallet-asset-conversion = { workspace = true }
+pallet-assets = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-timestamp = { workspace = true }
 pallet-session = { workspace = true }
+pallet-timestamp = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
 # Cumulus
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
-pallet-collator-selection = { workspace = true }
-parachains-common = { workspace = true }
 cumulus-primitives-core = { workspace = true }
+pallet-collator-selection = { workspace = true }
 parachain-info = { workspace = true }
+parachains-common = { workspace = true }
 parachains-runtimes-test-utils = { workspace = true }
 
 # Polkadot
+pallet-xcm = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
-pallet-xcm = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 # Bridges
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
index ff50223ef575..3fabea3b02f4 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
@@ -34,9 +34,9 @@ frame-try-runtime = { optional = true, workspace = true }
 pallet-aura = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-session = { workspace = true }
 pallet-message-queue = { workspace = true }
 pallet-multisig = { workspace = true }
+pallet-session = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
@@ -45,10 +45,10 @@ sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
-sp-keyring = { workspace = true }
 sp-genesis-builder = { workspace = true }
 sp-inherents = { workspace = true }
 sp-io = { workspace = true }
+sp-keyring = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
@@ -58,11 +58,11 @@ sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
 
 # Polkadot
-rococo-runtime-constants = { workspace = true }
 pallet-xcm = { workspace = true }
 pallet-xcm-benchmarks = { optional = true, workspace = true }
 polkadot-parachain-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
+rococo-runtime-constants = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
@@ -95,28 +95,28 @@ bp-parachains = { workspace = true }
 bp-polkadot-bulletin = { workspace = true }
 bp-polkadot-core = { workspace = true }
 bp-relayers = { workspace = true }
-bp-runtime = { workspace = true }
 bp-rococo = { workspace = true }
+bp-runtime = { workspace = true }
 bp-westend = { workspace = true }
 bp-xcm-bridge-hub-router = { workspace = true }
+bridge-runtime-common = { workspace = true }
 pallet-bridge-grandpa = { workspace = true }
 pallet-bridge-messages = { workspace = true }
 pallet-bridge-parachains = { workspace = true }
 pallet-bridge-relayers = { workspace = true }
 pallet-xcm-bridge-hub = { workspace = true }
-bridge-runtime-common = { workspace = true }
 
 # Ethereum Bridge (Snowbridge)
 snowbridge-beacon-primitives = { workspace = true }
-snowbridge-pallet-system = { workspace = true }
-snowbridge-system-runtime-api = { workspace = true }
 snowbridge-core = { workspace = true }
+snowbridge-outbound-queue-runtime-api = { workspace = true }
 snowbridge-pallet-ethereum-client = { workspace = true }
 snowbridge-pallet-inbound-queue = { workspace = true }
 snowbridge-pallet-outbound-queue = { workspace = true }
-snowbridge-outbound-queue-runtime-api = { workspace = true }
+snowbridge-pallet-system = { workspace = true }
 snowbridge-router-primitives = { workspace = true }
 snowbridge-runtime-common = { workspace = true }
+snowbridge-system-runtime-api = { workspace = true }
 
 bridge-hub-common = { workspace = true }
 
@@ -124,8 +124,8 @@ bridge-hub-common = { workspace = true }
 bridge-hub-test-utils = { workspace = true, default-features = true }
 bridge-runtime-common = { features = ["integrity-test"], workspace = true, default-features = true }
 pallet-bridge-relayers = { features = ["integrity-test"], workspace = true }
-snowbridge-runtime-test-common = { workspace = true, default-features = true }
 parachains-runtimes-test-utils = { workspace = true, default-features = true }
+snowbridge-runtime-test-common = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
index d87ff9b43fef..492b731610ce 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
@@ -240,7 +240,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: alloc::borrow::Cow::Borrowed("bridge-hub-rococo"),
 	impl_name: alloc::borrow::Cow::Borrowed("bridge-hub-rococo"),
 	authoring_version: 1,
-	spec_version: 1_016_001,
+	spec_version: 1_017_001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 6,
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_xcm.rs
index a732e1a57343..0a085b858251 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_xcm.rs
@@ -17,25 +17,27 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-02-20, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-12-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-bn-ce5rx-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `902e7ad7764b`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // target/production/polkadot-parachain
 // benchmark
 // pallet
-// --steps=50
-// --repeat=20
 // --extrinsic=*
+// --chain=bridge-hub-rococo-dev
+// --pallet=pallet_xcm
+// --header=/__w/polkadot-sdk/polkadot-sdk/cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights
 // --wasm-execution=compiled
+// --steps=50
+// --repeat=20
 // --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
-// --pallet=pallet_xcm
-// --chain=bridge-hub-rococo-dev
-// --header=./cumulus/file_header.txt
-// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
+// --no-storage-info
+// --no-min-squares
+// --no-median-slopes
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -64,14 +66,16 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `38`
 		//  Estimated: `3503`
-		// Minimum execution time: 18_513_000 picoseconds.
-		Weight::from_parts(19_156_000, 0)
+		// Minimum execution time: 25_273_000 picoseconds.
+		Weight::from_parts(25_810_000, 0)
 			.saturating_add(Weight::from_parts(0, 3503))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
@@ -90,10 +94,10 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `70`
 		//  Estimated: `3593`
-		// Minimum execution time: 88_096_000 picoseconds.
-		Weight::from_parts(89_732_000, 0)
+		// Minimum execution time: 112_156_000 picoseconds.
+		Weight::from_parts(115_999_000, 0)
 			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(8))
+			.saturating_add(T::DbWeight::get().reads(9))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: `Benchmark::Override` (r:0 w:0)
@@ -108,6 +112,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
@@ -126,21 +132,22 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `70`
 		//  Estimated: `3593`
-		// Minimum execution time: 88_239_000 picoseconds.
-		Weight::from_parts(89_729_000, 0)
+		// Minimum execution time: 110_987_000 picoseconds.
+		Weight::from_parts(114_735_000, 0)
 			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(8))
+			.saturating_add(T::DbWeight::get().reads(9))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `Benchmark::Override` (r:0 w:0)
-	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn execute() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
-		Weight::from_parts(18_446_744_073_709_551_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
+		//  Measured:  `32`
+		//  Estimated: `1517`
+		// Minimum execution time: 12_068_000 picoseconds.
+		Weight::from_parts(12_565_000, 0)
+			.saturating_add(Weight::from_parts(0, 1517))
+			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:0 w:1)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -148,8 +155,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_955_000 picoseconds.
-		Weight::from_parts(6_266_000, 0)
+		// Minimum execution time: 7_155_000 picoseconds.
+		Weight::from_parts(7_606_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -159,8 +166,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_868_000 picoseconds.
-		Weight::from_parts(1_961_000, 0)
+		// Minimum execution time: 2_325_000 picoseconds.
+		Weight::from_parts(2_442_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -186,8 +193,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `38`
 		//  Estimated: `3503`
-		// Minimum execution time: 24_388_000 picoseconds.
-		Weight::from_parts(25_072_000, 0)
+		// Minimum execution time: 31_747_000 picoseconds.
+		Weight::from_parts(33_122_000, 0)
 			.saturating_add(Weight::from_parts(0, 3503))
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(5))
@@ -212,8 +219,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `255`
 		//  Estimated: `3720`
-		// Minimum execution time: 26_762_000 picoseconds.
-		Weight::from_parts(27_631_000, 0)
+		// Minimum execution time: 36_396_000 picoseconds.
+		Weight::from_parts(37_638_000, 0)
 			.saturating_add(Weight::from_parts(0, 3720))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -224,45 +231,45 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_856_000 picoseconds.
-		Weight::from_parts(2_033_000, 0)
+		// Minimum execution time: 2_470_000 picoseconds.
+		Weight::from_parts(2_594_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:5 w:2)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:6 w:2)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `89`
-		//  Estimated: `13454`
-		// Minimum execution time: 17_718_000 picoseconds.
-		Weight::from_parts(18_208_000, 0)
-			.saturating_add(Weight::from_parts(0, 13454))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15929`
+		// Minimum execution time: 22_530_000 picoseconds.
+		Weight::from_parts(22_987_000, 0)
+			.saturating_add(Weight::from_parts(0, 15929))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `93`
-		//  Estimated: `13458`
-		// Minimum execution time: 17_597_000 picoseconds.
-		Weight::from_parts(18_090_000, 0)
-			.saturating_add(Weight::from_parts(0, 13458))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15933`
+		// Minimum execution time: 23_016_000 picoseconds.
+		Weight::from_parts(23_461_000, 0)
+			.saturating_add(Weight::from_parts(0, 15933))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:7 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
-		//  Estimated: `15946`
-		// Minimum execution time: 19_533_000 picoseconds.
-		Weight::from_parts(20_164_000, 0)
-			.saturating_add(Weight::from_parts(0, 15946))
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Estimated: `18421`
+		// Minimum execution time: 26_216_000 picoseconds.
+		Weight::from_parts(26_832_000, 0)
+			.saturating_add(Weight::from_parts(0, 18421))
+			.saturating_add(T::DbWeight::get().reads(7))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -282,36 +289,36 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `6046`
-		// Minimum execution time: 24_958_000 picoseconds.
-		Weight::from_parts(25_628_000, 0)
+		// Minimum execution time: 31_060_000 picoseconds.
+		Weight::from_parts(32_513_000, 0)
 			.saturating_add(Weight::from_parts(0, 6046))
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `136`
-		//  Estimated: `11026`
-		// Minimum execution time: 12_209_000 picoseconds.
-		Weight::from_parts(12_612_000, 0)
-			.saturating_add(Weight::from_parts(0, 11026))
-			.saturating_add(T::DbWeight::get().reads(4))
+		//  Measured:  `109`
+		//  Estimated: `13474`
+		// Minimum execution time: 17_334_000 picoseconds.
+		Weight::from_parts(17_747_000, 0)
+			.saturating_add(Weight::from_parts(0, 13474))
+			.saturating_add(T::DbWeight::get().reads(5))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `100`
-		//  Estimated: `13465`
-		// Minimum execution time: 17_844_000 picoseconds.
-		Weight::from_parts(18_266_000, 0)
-			.saturating_add(Weight::from_parts(0, 13465))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15940`
+		// Minimum execution time: 22_535_000 picoseconds.
+		Weight::from_parts(23_386_000, 0)
+			.saturating_add(Weight::from_parts(0, 15940))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -328,11 +335,11 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
-		//  Estimated: `13471`
-		// Minimum execution time: 34_131_000 picoseconds.
-		Weight::from_parts(34_766_000, 0)
-			.saturating_add(Weight::from_parts(0, 13471))
-			.saturating_add(T::DbWeight::get().reads(11))
+		//  Estimated: `15946`
+		// Minimum execution time: 43_437_000 picoseconds.
+		Weight::from_parts(44_588_000, 0)
+			.saturating_add(Weight::from_parts(0, 15946))
+			.saturating_add(T::DbWeight::get().reads(12))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
@@ -343,8 +350,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `32`
 		//  Estimated: `1517`
-		// Minimum execution time: 3_525_000 picoseconds.
-		Weight::from_parts(3_724_000, 0)
+		// Minimum execution time: 4_941_000 picoseconds.
+		Weight::from_parts(5_088_000, 0)
 			.saturating_add(Weight::from_parts(0, 1517))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -355,22 +362,24 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `7669`
 		//  Estimated: `11134`
-		// Minimum execution time: 24_975_000 picoseconds.
-		Weight::from_parts(25_517_000, 0)
+		// Minimum execution time: 29_996_000 picoseconds.
+		Weight::from_parts(30_700_000, 0)
 			.saturating_add(Weight::from_parts(0, 11134))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1)
 	/// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn claim_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `90`
 		//  Estimated: `3555`
-		// Minimum execution time: 33_761_000 picoseconds.
-		Weight::from_parts(34_674_000, 0)
+		// Minimum execution time: 41_828_000 picoseconds.
+		Weight::from_parts(43_026_000, 0)
 			.saturating_add(Weight::from_parts(0, 3555))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 }
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml
index efdd0abbb8ee..644aa72d1311 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml
@@ -34,9 +34,9 @@ frame-try-runtime = { optional = true, workspace = true }
 pallet-aura = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-session = { workspace = true }
 pallet-message-queue = { workspace = true }
 pallet-multisig = { workspace = true }
+pallet-session = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
@@ -45,10 +45,10 @@ sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
-sp-keyring = { workspace = true }
 sp-genesis-builder = { workspace = true }
 sp-inherents = { workspace = true }
 sp-io = { workspace = true }
+sp-keyring = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
@@ -58,11 +58,11 @@ sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
 
 # Polkadot
-westend-runtime-constants = { workspace = true }
 pallet-xcm = { workspace = true }
 pallet-xcm-benchmarks = { optional = true, workspace = true }
 polkadot-parachain-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
+westend-runtime-constants = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
@@ -76,8 +76,8 @@ cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { features = ["bridging"], workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+cumulus-primitives-utility = { workspace = true }
 
 pallet-collator-selection = { workspace = true }
 parachain-info = { workspace = true }
@@ -94,37 +94,37 @@ bp-messages = { workspace = true }
 bp-parachains = { workspace = true }
 bp-polkadot-core = { workspace = true }
 bp-relayers = { workspace = true }
-bp-runtime = { workspace = true }
 bp-rococo = { workspace = true }
+bp-runtime = { workspace = true }
 bp-westend = { workspace = true }
 bp-xcm-bridge-hub-router = { workspace = true }
+bridge-hub-common = { workspace = true }
+bridge-runtime-common = { workspace = true }
 pallet-bridge-grandpa = { workspace = true }
 pallet-bridge-messages = { workspace = true }
 pallet-bridge-parachains = { workspace = true }
 pallet-bridge-relayers = { workspace = true }
 pallet-xcm-bridge-hub = { workspace = true }
-bridge-runtime-common = { workspace = true }
-bridge-hub-common = { workspace = true }
 
 # Ethereum Bridge (Snowbridge)
 snowbridge-beacon-primitives = { workspace = true }
-snowbridge-pallet-system = { workspace = true }
-snowbridge-system-runtime-api = { workspace = true }
 snowbridge-core = { workspace = true }
+snowbridge-outbound-queue-runtime-api = { workspace = true }
 snowbridge-pallet-ethereum-client = { workspace = true }
 snowbridge-pallet-inbound-queue = { workspace = true }
 snowbridge-pallet-outbound-queue = { workspace = true }
-snowbridge-outbound-queue-runtime-api = { workspace = true }
+snowbridge-pallet-system = { workspace = true }
 snowbridge-router-primitives = { workspace = true }
 snowbridge-runtime-common = { workspace = true }
+snowbridge-system-runtime-api = { workspace = true }
 
 
 [dev-dependencies]
 bridge-hub-test-utils = { workspace = true, default-features = true }
 bridge-runtime-common = { features = ["integrity-test"], workspace = true, default-features = true }
 pallet-bridge-relayers = { features = ["integrity-test"], workspace = true }
-snowbridge-runtime-test-common = { workspace = true, default-features = true }
 parachains-runtimes-test-utils = { workspace = true, default-features = true }
+snowbridge-runtime-test-common = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs
index ae3dbfa06cba..edf79ea0c315 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs
@@ -226,7 +226,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: alloc::borrow::Cow::Borrowed("bridge-hub-westend"),
 	impl_name: alloc::borrow::Cow::Borrowed("bridge-hub-westend"),
 	authoring_version: 1,
-	spec_version: 1_016_001,
+	spec_version: 1_017_001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 6,
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_xcm.rs
index a78ff2355efa..fdae0c9a1522 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_xcm.rs
@@ -17,25 +17,27 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-02-20, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-12-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-bn-ce5rx-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `27f89d982f9b`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-westend-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // target/production/polkadot-parachain
 // benchmark
 // pallet
-// --steps=50
-// --repeat=20
 // --extrinsic=*
+// --chain=bridge-hub-westend-dev
+// --pallet=pallet_xcm
+// --header=/__w/polkadot-sdk/polkadot-sdk/cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights
 // --wasm-execution=compiled
+// --steps=50
+// --repeat=20
 // --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
-// --pallet=pallet_xcm
-// --chain=bridge-hub-westend-dev
-// --header=./cumulus/file_header.txt
-// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/
+// --no-storage-info
+// --no-min-squares
+// --no-median-slopes
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -64,14 +66,16 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `38`
 		//  Estimated: `3503`
-		// Minimum execution time: 19_527_000 picoseconds.
-		Weight::from_parts(19_839_000, 0)
+		// Minimum execution time: 24_819_000 picoseconds.
+		Weight::from_parts(25_795_000, 0)
 			.saturating_add(Weight::from_parts(0, 3503))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
@@ -90,10 +94,10 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `107`
 		//  Estimated: `3593`
-		// Minimum execution time: 90_938_000 picoseconds.
-		Weight::from_parts(92_822_000, 0)
+		// Minimum execution time: 110_536_000 picoseconds.
+		Weight::from_parts(115_459_000, 0)
 			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(8))
+			.saturating_add(T::DbWeight::get().reads(9))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: `Benchmark::Override` (r:0 w:0)
@@ -108,6 +112,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
@@ -126,21 +132,22 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `107`
 		//  Estimated: `3593`
-		// Minimum execution time: 90_133_000 picoseconds.
-		Weight::from_parts(92_308_000, 0)
+		// Minimum execution time: 109_742_000 picoseconds.
+		Weight::from_parts(114_362_000, 0)
 			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(8))
+			.saturating_add(T::DbWeight::get().reads(9))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `Benchmark::Override` (r:0 w:0)
-	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn execute() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
-		Weight::from_parts(18_446_744_073_709_551_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
+		//  Measured:  `32`
+		//  Estimated: `1517`
+		// Minimum execution time: 12_252_000 picoseconds.
+		Weight::from_parts(12_681_000, 0)
+			.saturating_add(Weight::from_parts(0, 1517))
+			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:0 w:1)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -148,8 +155,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_205_000 picoseconds.
-		Weight::from_parts(6_595_000, 0)
+		// Minimum execution time: 6_988_000 picoseconds.
+		Weight::from_parts(7_161_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -159,8 +166,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_927_000 picoseconds.
-		Weight::from_parts(2_062_000, 0)
+		// Minimum execution time: 2_249_000 picoseconds.
+		Weight::from_parts(2_479_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -186,8 +193,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `38`
 		//  Estimated: `3503`
-		// Minimum execution time: 25_078_000 picoseconds.
-		Weight::from_parts(25_782_000, 0)
+		// Minimum execution time: 31_668_000 picoseconds.
+		Weight::from_parts(32_129_000, 0)
 			.saturating_add(Weight::from_parts(0, 3503))
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(5))
@@ -212,8 +219,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `255`
 		//  Estimated: `3720`
-		// Minimum execution time: 28_188_000 picoseconds.
-		Weight::from_parts(28_826_000, 0)
+		// Minimum execution time: 36_002_000 picoseconds.
+		Weight::from_parts(37_341_000, 0)
 			.saturating_add(Weight::from_parts(0, 3720))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -224,45 +231,45 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_886_000 picoseconds.
-		Weight::from_parts(1_991_000, 0)
+		// Minimum execution time: 2_349_000 picoseconds.
+		Weight::from_parts(2_511_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:5 w:2)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:6 w:2)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `89`
-		//  Estimated: `13454`
-		// Minimum execution time: 17_443_000 picoseconds.
-		Weight::from_parts(17_964_000, 0)
-			.saturating_add(Weight::from_parts(0, 13454))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15929`
+		// Minimum execution time: 22_283_000 picoseconds.
+		Weight::from_parts(22_654_000, 0)
+			.saturating_add(Weight::from_parts(0, 15929))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `93`
-		//  Estimated: `13458`
-		// Minimum execution time: 17_357_000 picoseconds.
-		Weight::from_parts(18_006_000, 0)
-			.saturating_add(Weight::from_parts(0, 13458))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15933`
+		// Minimum execution time: 22_717_000 picoseconds.
+		Weight::from_parts(23_256_000, 0)
+			.saturating_add(Weight::from_parts(0, 15933))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:7 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
-		//  Estimated: `15946`
-		// Minimum execution time: 18_838_000 picoseconds.
-		Weight::from_parts(19_688_000, 0)
-			.saturating_add(Weight::from_parts(0, 15946))
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Estimated: `18421`
+		// Minimum execution time: 25_988_000 picoseconds.
+		Weight::from_parts(26_794_000, 0)
+			.saturating_add(Weight::from_parts(0, 18421))
+			.saturating_add(T::DbWeight::get().reads(7))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -282,36 +289,36 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `6046`
-		// Minimum execution time: 25_517_000 picoseconds.
-		Weight::from_parts(26_131_000, 0)
+		// Minimum execution time: 31_112_000 picoseconds.
+		Weight::from_parts(32_395_000, 0)
 			.saturating_add(Weight::from_parts(0, 6046))
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `136`
-		//  Estimated: `11026`
-		// Minimum execution time: 11_587_000 picoseconds.
-		Weight::from_parts(11_963_000, 0)
-			.saturating_add(Weight::from_parts(0, 11026))
-			.saturating_add(T::DbWeight::get().reads(4))
+		//  Measured:  `109`
+		//  Estimated: `13474`
+		// Minimum execution time: 17_401_000 picoseconds.
+		Weight::from_parts(17_782_000, 0)
+			.saturating_add(Weight::from_parts(0, 13474))
+			.saturating_add(T::DbWeight::get().reads(5))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `100`
-		//  Estimated: `13465`
-		// Minimum execution time: 17_490_000 picoseconds.
-		Weight::from_parts(18_160_000, 0)
-			.saturating_add(Weight::from_parts(0, 13465))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15940`
+		// Minimum execution time: 22_772_000 picoseconds.
+		Weight::from_parts(23_194_000, 0)
+			.saturating_add(Weight::from_parts(0, 15940))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -328,11 +335,11 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
-		//  Estimated: `13471`
-		// Minimum execution time: 34_088_000 picoseconds.
-		Weight::from_parts(34_598_000, 0)
-			.saturating_add(Weight::from_parts(0, 13471))
-			.saturating_add(T::DbWeight::get().reads(11))
+		//  Estimated: `15946`
+		// Minimum execution time: 43_571_000 picoseconds.
+		Weight::from_parts(44_891_000, 0)
+			.saturating_add(Weight::from_parts(0, 15946))
+			.saturating_add(T::DbWeight::get().reads(12))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
@@ -343,8 +350,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `32`
 		//  Estimated: `1517`
-		// Minimum execution time: 3_566_000 picoseconds.
-		Weight::from_parts(3_754_000, 0)
+		// Minimum execution time: 4_896_000 picoseconds.
+		Weight::from_parts(5_112_000, 0)
 			.saturating_add(Weight::from_parts(0, 1517))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -355,22 +362,24 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `7669`
 		//  Estimated: `11134`
-		// Minimum execution time: 25_078_000 picoseconds.
-		Weight::from_parts(25_477_000, 0)
+		// Minimum execution time: 30_117_000 picoseconds.
+		Weight::from_parts(31_027_000, 0)
 			.saturating_add(Weight::from_parts(0, 11134))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1)
 	/// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn claim_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `90`
 		//  Estimated: `3555`
-		// Minimum execution time: 34_661_000 picoseconds.
-		Weight::from_parts(35_411_000, 0)
+		// Minimum execution time: 41_870_000 picoseconds.
+		Weight::from_parts(42_750_000, 0)
 			.saturating_add(Weight::from_parts(0, 3555))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 }
diff --git a/cumulus/parachains/runtimes/bridge-hubs/common/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/common/Cargo.toml
index 9eacb27639a3..2fbb96d75163 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/common/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/common/Cargo.toml
@@ -10,15 +10,15 @@ repository.workspace = true
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
+cumulus-primitives-core = { workspace = true }
 frame-support = { workspace = true }
+pallet-message-queue = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+snowbridge-core = { workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
-cumulus-primitives-core = { workspace = true }
 xcm = { workspace = true }
-pallet-message-queue = { workspace = true }
-snowbridge-core = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml
index 16fef951f328..ace23e71c4d1 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml
@@ -19,14 +19,14 @@ log = { workspace = true }
 # Substrate
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+pallet-balances = { workspace = true }
+pallet-timestamp = { workspace = true }
+pallet-utility = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-keyring = { workspace = true, default-features = true }
 sp-runtime = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
-pallet-balances = { workspace = true }
-pallet-utility = { workspace = true }
-pallet-timestamp = { workspace = true }
 
 # Cumulus
 asset-test-utils = { workspace = true, default-features = true }
@@ -36,10 +36,10 @@ parachains-common = { workspace = true }
 parachains-runtimes-test-utils = { workspace = true }
 
 # Polkadot
+pallet-xcm = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
-pallet-xcm = { workspace = true }
 
 # Bridges
 bp-header-chain = { workspace = true }
@@ -50,12 +50,12 @@ bp-relayers = { workspace = true }
 bp-runtime = { workspace = true }
 bp-test-utils = { workspace = true }
 bp-xcm-bridge-hub = { workspace = true }
+bridge-runtime-common = { workspace = true }
 pallet-bridge-grandpa = { workspace = true }
-pallet-bridge-parachains = { workspace = true }
 pallet-bridge-messages = { features = ["test-helpers"], workspace = true }
+pallet-bridge-parachains = { workspace = true }
 pallet-bridge-relayers = { workspace = true }
 pallet-xcm-bridge-hub = { workspace = true }
-bridge-runtime-common = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/parachains/runtimes/collectives/collectives-westend/Cargo.toml b/cumulus/parachains/runtimes/collectives/collectives-westend/Cargo.toml
index 2e35fe761c04..9c70b65060dd 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-westend/Cargo.toml
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/Cargo.toml
@@ -26,15 +26,19 @@ frame-system = { workspace = true }
 frame-system-benchmarking = { optional = true, workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
 frame-try-runtime = { optional = true, workspace = true }
-pallet-asset-rate = { workspace = true }
 pallet-alliance = { workspace = true }
+pallet-asset-rate = { workspace = true }
 pallet-aura = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-collective = { workspace = true }
+pallet-core-fellowship = { workspace = true }
 pallet-multisig = { workspace = true }
 pallet-preimage = { workspace = true }
 pallet-proxy = { workspace = true }
+pallet-ranked-collective = { workspace = true }
+pallet-referenda = { workspace = true }
+pallet-salary = { workspace = true }
 pallet-scheduler = { workspace = true }
 pallet-session = { workspace = true }
 pallet-state-trie-migration = { workspace = true }
@@ -43,18 +47,14 @@ pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-treasury = { workspace = true }
 pallet-utility = { workspace = true }
-pallet-referenda = { workspace = true }
-pallet-ranked-collective = { workspace = true }
-pallet-core-fellowship = { workspace = true }
-pallet-salary = { workspace = true }
 sp-api = { workspace = true }
 sp-arithmetic = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
-sp-keyring = { workspace = true }
 sp-genesis-builder = { workspace = true }
 sp-inherents = { workspace = true }
+sp-keyring = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
@@ -67,23 +67,23 @@ sp-version = { workspace = true }
 pallet-xcm = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
+westend-runtime-constants = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
-westend-runtime-constants = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 # Cumulus
 cumulus-pallet-aura-ext = { workspace = true }
-pallet-message-queue = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-session-benchmarking = { workspace = true }
 cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+cumulus-primitives-utility = { workspace = true }
+pallet-message-queue = { workspace = true }
 
 pallet-collator-selection = { workspace = true }
 pallet-collective-content = { workspace = true }
@@ -95,8 +95,8 @@ testnet-parachains-constants = { features = ["westend"], workspace = true }
 substrate-wasm-builder = { optional = true, workspace = true, default-features = true }
 
 [dev-dependencies]
-sp-io = { features = ["std"], workspace = true, default-features = true }
 parachains-runtimes-test-utils = { workspace = true, default-features = true }
+sp-io = { features = ["std"], workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs
index f4c62f212e8c..5c2ba2e24c22 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs
@@ -126,7 +126,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: alloc::borrow::Cow::Borrowed("collectives-westend"),
 	impl_name: alloc::borrow::Cow::Borrowed("collectives-westend"),
 	authoring_version: 1,
-	spec_version: 1_016_001,
+	spec_version: 1_017_001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 6,
diff --git a/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_xcm.rs
index 5d427d850046..ccf88873c2cd 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_xcm.rs
@@ -17,25 +17,27 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-02-20, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-12-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-bn-ce5rx-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `47a5bbdc8de3`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("collectives-westend-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // target/production/polkadot-parachain
 // benchmark
 // pallet
-// --steps=50
-// --repeat=20
 // --extrinsic=*
+// --chain=collectives-westend-dev
+// --pallet=pallet_xcm
+// --header=/__w/polkadot-sdk/polkadot-sdk/cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/collectives/collectives-westend/src/weights
 // --wasm-execution=compiled
+// --steps=50
+// --repeat=20
 // --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
-// --pallet=pallet_xcm
-// --chain=collectives-westend-dev
-// --header=./cumulus/file_header.txt
-// --output=./cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/
+// --no-storage-info
+// --no-min-squares
+// --no-median-slopes
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -48,6 +50,8 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_xcm`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
+	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
@@ -62,16 +66,18 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn send() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `145`
-		//  Estimated: `3610`
-		// Minimum execution time: 21_813_000 picoseconds.
-		Weight::from_parts(22_332_000, 0)
-			.saturating_add(Weight::from_parts(0, 3610))
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Measured:  `214`
+		//  Estimated: `3679`
+		// Minimum execution time: 32_779_000 picoseconds.
+		Weight::from_parts(33_417_000, 0)
+			.saturating_add(Weight::from_parts(0, 3679))
+			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
@@ -90,10 +96,10 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `214`
 		//  Estimated: `3679`
-		// Minimum execution time: 93_243_000 picoseconds.
-		Weight::from_parts(95_650_000, 0)
+		// Minimum execution time: 116_031_000 picoseconds.
+		Weight::from_parts(118_863_000, 0)
 			.saturating_add(Weight::from_parts(0, 3679))
-			.saturating_add(T::DbWeight::get().reads(8))
+			.saturating_add(T::DbWeight::get().reads(9))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: `Benchmark::Override` (r:0 w:0)
@@ -108,6 +114,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
@@ -126,21 +134,22 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `214`
 		//  Estimated: `3679`
-		// Minimum execution time: 96_199_000 picoseconds.
-		Weight::from_parts(98_620_000, 0)
+		// Minimum execution time: 116_267_000 picoseconds.
+		Weight::from_parts(119_519_000, 0)
 			.saturating_add(Weight::from_parts(0, 3679))
-			.saturating_add(T::DbWeight::get().reads(8))
+			.saturating_add(T::DbWeight::get().reads(9))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `Benchmark::Override` (r:0 w:0)
-	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn execute() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
-		Weight::from_parts(18_446_744_073_709_551_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
+		//  Measured:  `103`
+		//  Estimated: `1588`
+		// Minimum execution time: 12_718_000 picoseconds.
+		Weight::from_parts(13_572_000, 0)
+			.saturating_add(Weight::from_parts(0, 1588))
+			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:0 w:1)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -148,8 +157,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_442_000 picoseconds.
-		Weight::from_parts(6_682_000, 0)
+		// Minimum execution time: 7_568_000 picoseconds.
+		Weight::from_parts(7_913_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -159,8 +168,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_833_000 picoseconds.
-		Weight::from_parts(1_973_000, 0)
+		// Minimum execution time: 2_225_000 picoseconds.
+		Weight::from_parts(2_473_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -186,8 +195,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 27_318_000 picoseconds.
-		Weight::from_parts(28_224_000, 0)
+		// Minimum execution time: 35_869_000 picoseconds.
+		Weight::from_parts(37_848_000, 0)
 			.saturating_add(Weight::from_parts(0, 3610))
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(5))
@@ -212,8 +221,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `363`
 		//  Estimated: `3828`
-		// Minimum execution time: 29_070_000 picoseconds.
-		Weight::from_parts(30_205_000, 0)
+		// Minimum execution time: 38_649_000 picoseconds.
+		Weight::from_parts(39_842_000, 0)
 			.saturating_add(Weight::from_parts(0, 3828))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -224,45 +233,45 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_904_000 picoseconds.
-		Weight::from_parts(2_033_000, 0)
+		// Minimum execution time: 2_223_000 picoseconds.
+		Weight::from_parts(2_483_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:5 w:2)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:6 w:2)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `159`
-		//  Estimated: `13524`
-		// Minimum execution time: 18_348_000 picoseconds.
-		Weight::from_parts(18_853_000, 0)
-			.saturating_add(Weight::from_parts(0, 13524))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15999`
+		// Minimum execution time: 24_164_000 picoseconds.
+		Weight::from_parts(24_972_000, 0)
+			.saturating_add(Weight::from_parts(0, 15999))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `163`
-		//  Estimated: `13528`
-		// Minimum execution time: 17_964_000 picoseconds.
-		Weight::from_parts(18_548_000, 0)
-			.saturating_add(Weight::from_parts(0, 13528))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `16003`
+		// Minimum execution time: 24_604_000 picoseconds.
+		Weight::from_parts(25_047_000, 0)
+			.saturating_add(Weight::from_parts(0, 16003))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:7 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `173`
-		//  Estimated: `16013`
-		// Minimum execution time: 19_708_000 picoseconds.
-		Weight::from_parts(20_157_000, 0)
-			.saturating_add(Weight::from_parts(0, 16013))
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Estimated: `18488`
+		// Minimum execution time: 28_088_000 picoseconds.
+		Weight::from_parts(28_431_000, 0)
+			.saturating_add(Weight::from_parts(0, 18488))
+			.saturating_add(T::DbWeight::get().reads(7))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -282,36 +291,36 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `212`
 		//  Estimated: `6152`
-		// Minimum execution time: 26_632_000 picoseconds.
-		Weight::from_parts(27_314_000, 0)
+		// Minimum execution time: 33_814_000 picoseconds.
+		Weight::from_parts(34_741_000, 0)
 			.saturating_add(Weight::from_parts(0, 6152))
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `206`
-		//  Estimated: `11096`
-		// Minimum execution time: 11_929_000 picoseconds.
-		Weight::from_parts(12_304_000, 0)
-			.saturating_add(Weight::from_parts(0, 11096))
-			.saturating_add(T::DbWeight::get().reads(4))
+		//  Measured:  `176`
+		//  Estimated: `13541`
+		// Minimum execution time: 18_242_000 picoseconds.
+		Weight::from_parts(18_636_000, 0)
+			.saturating_add(Weight::from_parts(0, 13541))
+			.saturating_add(T::DbWeight::get().reads(5))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `170`
-		//  Estimated: `13535`
-		// Minimum execution time: 18_599_000 picoseconds.
-		Weight::from_parts(19_195_000, 0)
-			.saturating_add(Weight::from_parts(0, 13535))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `16010`
+		// Minimum execution time: 24_249_000 picoseconds.
+		Weight::from_parts(24_768_000, 0)
+			.saturating_add(Weight::from_parts(0, 16010))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -328,11 +337,11 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `212`
-		//  Estimated: `13577`
-		// Minimum execution time: 35_524_000 picoseconds.
-		Weight::from_parts(36_272_000, 0)
-			.saturating_add(Weight::from_parts(0, 13577))
-			.saturating_add(T::DbWeight::get().reads(11))
+		//  Estimated: `16052`
+		// Minimum execution time: 47_602_000 picoseconds.
+		Weight::from_parts(48_378_000, 0)
+			.saturating_add(Weight::from_parts(0, 16052))
+			.saturating_add(T::DbWeight::get().reads(12))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
@@ -343,8 +352,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `103`
 		//  Estimated: `1588`
-		// Minimum execution time: 4_044_000 picoseconds.
-		Weight::from_parts(4_238_000, 0)
+		// Minimum execution time: 5_566_000 picoseconds.
+		Weight::from_parts(5_768_000, 0)
 			.saturating_add(Weight::from_parts(0, 1588))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -355,22 +364,24 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `7740`
 		//  Estimated: `11205`
-		// Minimum execution time: 25_741_000 picoseconds.
-		Weight::from_parts(26_301_000, 0)
+		// Minimum execution time: 30_821_000 picoseconds.
+		Weight::from_parts(31_250_000, 0)
 			.saturating_add(Weight::from_parts(0, 11205))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1)
 	/// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn claim_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `160`
 		//  Estimated: `3625`
-		// Minimum execution time: 35_925_000 picoseconds.
-		Weight::from_parts(36_978_000, 0)
+		// Minimum execution time: 43_463_000 picoseconds.
+		Weight::from_parts(44_960_000, 0)
 			.saturating_add(Weight::from_parts(0, 3625))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 }
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml b/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
index 260c748819ae..cb0655d70cf2 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
@@ -24,37 +24,37 @@ log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
 # Substrate
-sp-api = { workspace = true }
-sp-block-builder = { workspace = true }
-sp-consensus-aura = { workspace = true }
-sp-core = { workspace = true }
-sp-genesis-builder = { workspace = true }
-sp-inherents = { workspace = true }
-sp-offchain = { workspace = true }
-sp-runtime = { workspace = true }
-sp-session = { workspace = true }
-sp-storage = { workspace = true }
-sp-transaction-pool = { workspace = true }
-sp-version = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
-frame-try-runtime = { optional = true, workspace = true }
 frame-executive = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 frame-system-benchmarking = { optional = true, workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
+frame-try-runtime = { optional = true, workspace = true }
 pallet-aura = { workspace = true }
 pallet-authorship = { workspace = true }
-pallet-insecure-randomness-collective-flip = { workspace = true }
 pallet-balances = { workspace = true }
+pallet-contracts = { workspace = true }
+pallet-insecure-randomness-collective-flip = { workspace = true }
 pallet-multisig = { workspace = true }
 pallet-session = { workspace = true }
+pallet-sudo = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-utility = { workspace = true }
-pallet-sudo = { workspace = true }
-pallet-contracts = { workspace = true }
+sp-api = { workspace = true }
+sp-block-builder = { workspace = true }
+sp-consensus-aura = { workspace = true }
+sp-core = { workspace = true }
+sp-genesis-builder = { workspace = true }
+sp-inherents = { workspace = true }
+sp-offchain = { workspace = true }
+sp-runtime = { workspace = true }
+sp-session = { workspace = true }
+sp-storage = { workspace = true }
+sp-transaction-pool = { workspace = true }
+sp-version = { workspace = true }
 
 # Polkadot
 pallet-xcm = { workspace = true }
@@ -68,15 +68,15 @@ xcm-runtime-apis = { workspace = true }
 
 # Cumulus
 cumulus-pallet-aura-ext = { workspace = true }
-pallet-message-queue = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-session-benchmarking = { workspace = true }
 cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+cumulus-primitives-utility = { workspace = true }
+pallet-message-queue = { workspace = true }
 
 pallet-collator-selection = { workspace = true }
 parachain-info = { workspace = true }
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
index 2951662a979b..594c9b26f57e 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
@@ -144,7 +144,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: alloc::borrow::Cow::Borrowed("contracts-rococo"),
 	impl_name: alloc::borrow::Cow::Borrowed("contracts-rococo"),
 	authoring_version: 1,
-	spec_version: 1_016_001,
+	spec_version: 1_017_001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 7,
diff --git a/cumulus/parachains/runtimes/coretime/coretime-rococo/Cargo.toml b/cumulus/parachains/runtimes/coretime/coretime-rococo/Cargo.toml
index aa692c3c7e74..2b5fab329293 100644
--- a/cumulus/parachains/runtimes/coretime/coretime-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/coretime/coretime-rococo/Cargo.toml
@@ -33,8 +33,8 @@ frame-try-runtime = { optional = true, workspace = true }
 pallet-aura = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-message-queue = { workspace = true }
 pallet-broker = { workspace = true }
+pallet-message-queue = { workspace = true }
 pallet-multisig = { workspace = true }
 pallet-proxy = { workspace = true }
 pallet-session = { workspace = true }
@@ -47,8 +47,8 @@ sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
-sp-inherents = { workspace = true }
 sp-genesis-builder = { workspace = true }
+sp-inherents = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
@@ -75,8 +75,8 @@ cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+cumulus-primitives-utility = { workspace = true }
 pallet-collator-selection = { workspace = true }
 parachain-info = { workspace = true }
 parachains-common = { workspace = true }
diff --git a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs
index ae3ad93a9e85..e8f6e6659e13 100644
--- a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs
@@ -150,7 +150,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: alloc::borrow::Cow::Borrowed("coretime-rococo"),
 	impl_name: alloc::borrow::Cow::Borrowed("coretime-rococo"),
 	authoring_version: 1,
-	spec_version: 1_016_001,
+	spec_version: 1_017_001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
diff --git a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/weights/pallet_broker.rs b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/weights/pallet_broker.rs
index 5cb01f62cd26..3e4bbf379c3f 100644
--- a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/weights/pallet_broker.rs
+++ b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/weights/pallet_broker.rs
@@ -555,6 +555,24 @@ impl<T: frame_system::Config> pallet_broker::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `Broker::SaleInfo` (r:1 w:0)
+	/// Proof: `Broker::SaleInfo` (`max_values`: Some(1), `max_size`: Some(57), added: 552, mode: `MaxEncodedLen`)
+	/// Storage: `Broker::Reservations` (r:1 w:1)
+	/// Proof: `Broker::Reservations` (`max_values`: Some(1), `max_size`: Some(12021), added: 12516, mode: `MaxEncodedLen`)
+	/// Storage: `Broker::Status` (r:1 w:0)
+	/// Proof: `Broker::Status` (`max_values`: Some(1), `max_size`: Some(18), added: 513, mode: `MaxEncodedLen`)
+	/// Storage: `Broker::Workplan` (r:0 w:2)
+	/// Proof: `Broker::Workplan` (`max_values`: None, `max_size`: Some(1216), added: 3691, mode: `MaxEncodedLen`)
+	fn force_reserve() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `11125`
+		//  Estimated: `13506`
+		// Minimum execution time: 32_286_000 picoseconds.
+		Weight::from_parts(33_830_000, 0)
+			.saturating_add(Weight::from_parts(0, 13506))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
 	/// Storage: `Broker::Leases` (r:1 w:1)
 	/// Proof: `Broker::Leases` (`max_values`: Some(1), `max_size`: Some(401), added: 896, mode: `MaxEncodedLen`)
 	fn swap_leases() -> Weight {
diff --git a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/weights/pallet_xcm.rs
index 7fb492173dad..b2b8cd6e5349 100644
--- a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/weights/pallet_xcm.rs
@@ -17,25 +17,27 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-05-07, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-12-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-unxyhko3-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `902e7ad7764b`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("coretime-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // target/production/polkadot-parachain
 // benchmark
 // pallet
-// --steps=50
-// --repeat=20
 // --extrinsic=*
+// --chain=coretime-rococo-dev
+// --pallet=pallet_xcm
+// --header=/__w/polkadot-sdk/polkadot-sdk/cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/coretime/coretime-rococo/src/weights
 // --wasm-execution=compiled
+// --steps=50
+// --repeat=20
 // --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
-// --pallet=pallet_xcm
-// --chain=coretime-rococo-dev
-// --header=./cumulus/file_header.txt
-// --output=./cumulus/parachains/runtimes/coretime/coretime-rococo/src/weights/
+// --no-storage-info
+// --no-min-squares
+// --no-median-slopes
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -62,14 +64,16 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `74`
 		//  Estimated: `3539`
-		// Minimum execution time: 19_121_000 picoseconds.
-		Weight::from_parts(19_582_000, 0)
+		// Minimum execution time: 23_660_000 picoseconds.
+		Weight::from_parts(24_537_000, 0)
 			.saturating_add(Weight::from_parts(0, 3539))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -84,18 +88,20 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3571`
-		// Minimum execution time: 61_722_000 picoseconds.
-		Weight::from_parts(63_616_000, 0)
+		// Minimum execution time: 74_005_000 picoseconds.
+		Weight::from_parts(75_355_000, 0)
 			.saturating_add(Weight::from_parts(0, 3571))
-			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Broker::Regions` (r:1 w:1)
 	/// Proof: `Broker::Regions` (`max_values`: None, `max_size`: Some(86), added: 2561, mode: `MaxEncodedLen`)
 	/// Storage: `XcmpQueue::DeliveryFeeFactor` (r:1 w:0)
-	/// Proof: `XcmpQueue::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Proof: `XcmpQueue::DeliveryFeeFactor` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -107,17 +113,17 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Storage: `ParachainSystem::RelevantMessagingState` (r:1 w:0)
 	/// Proof: `ParachainSystem::RelevantMessagingState` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
-	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: Some(1282), added: 1777, mode: `MaxEncodedLen`)
 	/// Storage: `XcmpQueue::OutboundXcmpMessages` (r:0 w:1)
-	/// Proof: `XcmpQueue::OutboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Proof: `XcmpQueue::OutboundXcmpMessages` (`max_values`: None, `max_size`: Some(105506), added: 107981, mode: `MaxEncodedLen`)
 	fn reserve_transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `377`
 		//  Estimated: `3842`
-		// Minimum execution time: 97_823_000 picoseconds.
-		Weight::from_parts(102_022_000, 0)
+		// Minimum execution time: 116_231_000 picoseconds.
+		Weight::from_parts(121_254_000, 0)
 			.saturating_add(Weight::from_parts(0, 3842))
-			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
 	/// Storage: `Benchmark::Override` (r:0 w:0)
@@ -130,13 +136,16 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		Weight::from_parts(18_446_744_073_709_551_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn execute() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 8_397_000 picoseconds.
-		Weight::from_parts(8_773_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
+		//  Measured:  `32`
+		//  Estimated: `1517`
+		// Minimum execution time: 11_498_000 picoseconds.
+		Weight::from_parts(11_867_000, 0)
+			.saturating_add(Weight::from_parts(0, 1517))
+			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:0 w:1)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -144,8 +153,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_806_000 picoseconds.
-		Weight::from_parts(6_106_000, 0)
+		// Minimum execution time: 7_163_000 picoseconds.
+		Weight::from_parts(7_501_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -155,8 +164,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_802_000 picoseconds.
-		Weight::from_parts(1_939_000, 0)
+		// Minimum execution time: 2_188_000 picoseconds.
+		Weight::from_parts(2_356_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -180,8 +189,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `74`
 		//  Estimated: `3539`
-		// Minimum execution time: 24_300_000 picoseconds.
-		Weight::from_parts(25_359_000, 0)
+		// Minimum execution time: 30_503_000 picoseconds.
+		Weight::from_parts(31_361_000, 0)
 			.saturating_add(Weight::from_parts(0, 3539))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(5))
@@ -204,8 +213,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `292`
 		//  Estimated: `3757`
-		// Minimum execution time: 27_579_000 picoseconds.
-		Weight::from_parts(28_414_000, 0)
+		// Minimum execution time: 35_562_000 picoseconds.
+		Weight::from_parts(36_710_000, 0)
 			.saturating_add(Weight::from_parts(0, 3757))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -216,45 +225,45 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_762_000 picoseconds.
-		Weight::from_parts(1_884_000, 0)
+		// Minimum execution time: 2_223_000 picoseconds.
+		Weight::from_parts(2_432_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:5 w:2)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:6 w:2)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `89`
-		//  Estimated: `13454`
-		// Minimum execution time: 16_512_000 picoseconds.
-		Weight::from_parts(16_818_000, 0)
-			.saturating_add(Weight::from_parts(0, 13454))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15929`
+		// Minimum execution time: 21_863_000 picoseconds.
+		Weight::from_parts(22_213_000, 0)
+			.saturating_add(Weight::from_parts(0, 15929))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `93`
-		//  Estimated: `13458`
-		// Minimum execution time: 16_368_000 picoseconds.
-		Weight::from_parts(16_887_000, 0)
-			.saturating_add(Weight::from_parts(0, 13458))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15933`
+		// Minimum execution time: 22_044_000 picoseconds.
+		Weight::from_parts(22_548_000, 0)
+			.saturating_add(Weight::from_parts(0, 15933))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:7 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
-		//  Estimated: `15946`
-		// Minimum execution time: 17_661_000 picoseconds.
-		Weight::from_parts(17_963_000, 0)
-			.saturating_add(Weight::from_parts(0, 15946))
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Estimated: `18421`
+		// Minimum execution time: 24_336_000 picoseconds.
+		Weight::from_parts(25_075_000, 0)
+			.saturating_add(Weight::from_parts(0, 18421))
+			.saturating_add(T::DbWeight::get().reads(7))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -272,36 +281,36 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `6082`
-		// Minimum execution time: 24_498_000 picoseconds.
-		Weight::from_parts(25_339_000, 0)
+		// Minimum execution time: 30_160_000 picoseconds.
+		Weight::from_parts(30_807_000, 0)
 			.saturating_add(Weight::from_parts(0, 6082))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `136`
-		//  Estimated: `11026`
-		// Minimum execution time: 10_675_000 picoseconds.
-		Weight::from_parts(11_106_000, 0)
-			.saturating_add(Weight::from_parts(0, 11026))
-			.saturating_add(T::DbWeight::get().reads(4))
+		//  Measured:  `109`
+		//  Estimated: `13474`
+		// Minimum execution time: 16_129_000 picoseconds.
+		Weight::from_parts(16_686_000, 0)
+			.saturating_add(Weight::from_parts(0, 13474))
+			.saturating_add(T::DbWeight::get().reads(5))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `100`
-		//  Estimated: `13465`
-		// Minimum execution time: 16_520_000 picoseconds.
-		Weight::from_parts(16_915_000, 0)
-			.saturating_add(Weight::from_parts(0, 13465))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15940`
+		// Minimum execution time: 21_844_000 picoseconds.
+		Weight::from_parts(22_452_000, 0)
+			.saturating_add(Weight::from_parts(0, 15940))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -316,11 +325,11 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
-		//  Estimated: `13507`
-		// Minimum execution time: 32_851_000 picoseconds.
-		Weight::from_parts(33_772_000, 0)
-			.saturating_add(Weight::from_parts(0, 13507))
-			.saturating_add(T::DbWeight::get().reads(10))
+		//  Estimated: `15982`
+		// Minimum execution time: 42_336_000 picoseconds.
+		Weight::from_parts(43_502_000, 0)
+			.saturating_add(Weight::from_parts(0, 15982))
+			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
@@ -331,8 +340,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `32`
 		//  Estimated: `1517`
-		// Minimum execution time: 3_373_000 picoseconds.
-		Weight::from_parts(3_534_000, 0)
+		// Minimum execution time: 4_682_000 picoseconds.
+		Weight::from_parts(4_902_000, 0)
 			.saturating_add(Weight::from_parts(0, 1517))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -343,22 +352,24 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `7669`
 		//  Estimated: `11134`
-		// Minimum execution time: 26_027_000 picoseconds.
-		Weight::from_parts(26_467_000, 0)
+		// Minimum execution time: 27_848_000 picoseconds.
+		Weight::from_parts(28_267_000, 0)
 			.saturating_add(Weight::from_parts(0, 11134))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1)
 	/// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn claim_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `90`
 		//  Estimated: `3555`
-		// Minimum execution time: 35_692_000 picoseconds.
-		Weight::from_parts(36_136_000, 0)
+		// Minimum execution time: 41_653_000 picoseconds.
+		Weight::from_parts(42_316_000, 0)
 			.saturating_add(Weight::from_parts(0, 3555))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 }
diff --git a/cumulus/parachains/runtimes/coretime/coretime-westend/Cargo.toml b/cumulus/parachains/runtimes/coretime/coretime-westend/Cargo.toml
index 226e1c817bb8..03df782bc266 100644
--- a/cumulus/parachains/runtimes/coretime/coretime-westend/Cargo.toml
+++ b/cumulus/parachains/runtimes/coretime/coretime-westend/Cargo.toml
@@ -33,8 +33,8 @@ frame-try-runtime = { optional = true, workspace = true }
 pallet-aura = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-message-queue = { workspace = true }
 pallet-broker = { workspace = true }
+pallet-message-queue = { workspace = true }
 pallet-multisig = { workspace = true }
 pallet-proxy = { workspace = true }
 pallet-session = { workspace = true }
@@ -46,8 +46,8 @@ sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
-sp-inherents = { workspace = true }
 sp-genesis-builder = { workspace = true }
+sp-inherents = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
@@ -74,8 +74,8 @@ cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+cumulus-primitives-utility = { workspace = true }
 
 pallet-collator-selection = { workspace = true }
 parachain-info = { workspace = true }
diff --git a/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs b/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs
index 67f7ad7afc6b..ce965f0ad1ba 100644
--- a/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs
@@ -150,7 +150,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: alloc::borrow::Cow::Borrowed("coretime-westend"),
 	impl_name: alloc::borrow::Cow::Borrowed("coretime-westend"),
 	authoring_version: 1,
-	spec_version: 1_016_001,
+	spec_version: 1_017_001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
diff --git a/cumulus/parachains/runtimes/coretime/coretime-westend/src/weights/pallet_broker.rs b/cumulus/parachains/runtimes/coretime/coretime-westend/src/weights/pallet_broker.rs
index ad71691b2174..a0eee2d99efa 100644
--- a/cumulus/parachains/runtimes/coretime/coretime-westend/src/weights/pallet_broker.rs
+++ b/cumulus/parachains/runtimes/coretime/coretime-westend/src/weights/pallet_broker.rs
@@ -553,6 +553,24 @@ impl<T: frame_system::Config> pallet_broker::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `Broker::SaleInfo` (r:1 w:0)
+	/// Proof: `Broker::SaleInfo` (`max_values`: Some(1), `max_size`: Some(57), added: 552, mode: `MaxEncodedLen`)
+	/// Storage: `Broker::Reservations` (r:1 w:1)
+	/// Proof: `Broker::Reservations` (`max_values`: Some(1), `max_size`: Some(12021), added: 12516, mode: `MaxEncodedLen`)
+	/// Storage: `Broker::Status` (r:1 w:0)
+	/// Proof: `Broker::Status` (`max_values`: Some(1), `max_size`: Some(18), added: 513, mode: `MaxEncodedLen`)
+	/// Storage: `Broker::Workplan` (r:0 w:2)
+	/// Proof: `Broker::Workplan` (`max_values`: None, `max_size`: Some(1216), added: 3691, mode: `MaxEncodedLen`)
+	fn force_reserve() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `11125`
+		//  Estimated: `13506`
+		// Minimum execution time: 31_464_000 picoseconds.
+		Weight::from_parts(32_798_000, 0)
+			.saturating_add(Weight::from_parts(0, 13506))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
 	/// Storage: `Broker::Leases` (r:1 w:1)
 	/// Proof: `Broker::Leases` (`max_values`: Some(1), `max_size`: Some(81), added: 576, mode: `MaxEncodedLen`)
 	fn swap_leases() -> Weight {
diff --git a/cumulus/parachains/runtimes/coretime/coretime-westend/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/coretime/coretime-westend/src/weights/pallet_xcm.rs
index fa588e982f09..7659b8a1ac7e 100644
--- a/cumulus/parachains/runtimes/coretime/coretime-westend/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/coretime/coretime-westend/src/weights/pallet_xcm.rs
@@ -17,25 +17,27 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-05-07, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-12-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-unxyhko3-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `eded932c29e2`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("coretime-westend-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // target/production/polkadot-parachain
 // benchmark
 // pallet
-// --steps=50
-// --repeat=20
 // --extrinsic=*
+// --chain=coretime-westend-dev
+// --pallet=pallet_xcm
+// --header=/__w/polkadot-sdk/polkadot-sdk/cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/coretime/coretime-westend/src/weights
 // --wasm-execution=compiled
+// --steps=50
+// --repeat=20
 // --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
-// --pallet=pallet_xcm
-// --chain=coretime-westend-dev
-// --header=./cumulus/file_header.txt
-// --output=./cumulus/parachains/runtimes/coretime/coretime-westend/src/weights/
+// --no-storage-info
+// --no-min-squares
+// --no-median-slopes
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -62,14 +64,16 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `74`
 		//  Estimated: `3539`
-		// Minimum execution time: 18_707_000 picoseconds.
-		Weight::from_parts(19_391_000, 0)
+		// Minimum execution time: 23_956_000 picoseconds.
+		Weight::from_parts(24_860_000, 0)
 			.saturating_add(Weight::from_parts(0, 3539))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -84,18 +88,20 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3571`
-		// Minimum execution time: 61_874_000 picoseconds.
-		Weight::from_parts(63_862_000, 0)
+		// Minimum execution time: 74_020_000 picoseconds.
+		Weight::from_parts(76_288_000, 0)
 			.saturating_add(Weight::from_parts(0, 3571))
-			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Broker::Regions` (r:1 w:1)
 	/// Proof: `Broker::Regions` (`max_values`: None, `max_size`: Some(86), added: 2561, mode: `MaxEncodedLen`)
 	/// Storage: `XcmpQueue::DeliveryFeeFactor` (r:1 w:0)
-	/// Proof: `XcmpQueue::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Proof: `XcmpQueue::DeliveryFeeFactor` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -107,17 +113,17 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Storage: `ParachainSystem::RelevantMessagingState` (r:1 w:0)
 	/// Proof: `ParachainSystem::RelevantMessagingState` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
-	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: Some(1282), added: 1777, mode: `MaxEncodedLen`)
 	/// Storage: `XcmpQueue::OutboundXcmpMessages` (r:0 w:1)
-	/// Proof: `XcmpQueue::OutboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Proof: `XcmpQueue::OutboundXcmpMessages` (`max_values`: None, `max_size`: Some(105506), added: 107981, mode: `MaxEncodedLen`)
 	fn reserve_transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `377`
 		//  Estimated: `3842`
-		// Minimum execution time: 98_657_000 picoseconds.
-		Weight::from_parts(101_260_000, 0)
+		// Minimum execution time: 118_691_000 picoseconds.
+		Weight::from_parts(128_472_000, 0)
 			.saturating_add(Weight::from_parts(0, 3842))
-			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
 	/// Storage: `Benchmark::Override` (r:0 w:0)
@@ -130,13 +136,16 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		Weight::from_parts(18_446_744_073_709_551_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn execute() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 8_455_000 picoseconds.
-		Weight::from_parts(8_842_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
+		//  Measured:  `32`
+		//  Estimated: `1517`
+		// Minimum execution time: 11_608_000 picoseconds.
+		Weight::from_parts(12_117_000, 0)
+			.saturating_add(Weight::from_parts(0, 1517))
+			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:0 w:1)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -144,8 +153,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_850_000 picoseconds.
-		Weight::from_parts(6_044_000, 0)
+		// Minimum execution time: 7_574_000 picoseconds.
+		Weight::from_parts(8_305_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -155,8 +164,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_754_000 picoseconds.
-		Weight::from_parts(1_832_000, 0)
+		// Minimum execution time: 2_438_000 picoseconds.
+		Weight::from_parts(2_663_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -180,8 +189,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `74`
 		//  Estimated: `3539`
-		// Minimum execution time: 24_886_000 picoseconds.
-		Weight::from_parts(25_403_000, 0)
+		// Minimum execution time: 31_482_000 picoseconds.
+		Weight::from_parts(33_926_000, 0)
 			.saturating_add(Weight::from_parts(0, 3539))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(5))
@@ -204,8 +213,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `292`
 		//  Estimated: `3757`
-		// Minimum execution time: 28_114_000 picoseconds.
-		Weight::from_parts(28_414_000, 0)
+		// Minimum execution time: 35_869_000 picoseconds.
+		Weight::from_parts(37_030_000, 0)
 			.saturating_add(Weight::from_parts(0, 3757))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -216,45 +225,45 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_713_000 picoseconds.
-		Weight::from_parts(1_810_000, 0)
+		// Minimum execution time: 2_385_000 picoseconds.
+		Weight::from_parts(2_588_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:5 w:2)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:6 w:2)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `89`
-		//  Estimated: `13454`
-		// Minimum execution time: 15_910_000 picoseconds.
-		Weight::from_parts(16_256_000, 0)
-			.saturating_add(Weight::from_parts(0, 13454))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15929`
+		// Minimum execution time: 21_919_000 picoseconds.
+		Weight::from_parts(22_926_000, 0)
+			.saturating_add(Weight::from_parts(0, 15929))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `93`
-		//  Estimated: `13458`
-		// Minimum execution time: 15_801_000 picoseconds.
-		Weight::from_parts(16_298_000, 0)
-			.saturating_add(Weight::from_parts(0, 13458))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15933`
+		// Minimum execution time: 22_588_000 picoseconds.
+		Weight::from_parts(23_144_000, 0)
+			.saturating_add(Weight::from_parts(0, 15933))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:7 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
-		//  Estimated: `15946`
-		// Minimum execution time: 17_976_000 picoseconds.
-		Weight::from_parts(18_390_000, 0)
-			.saturating_add(Weight::from_parts(0, 15946))
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Estimated: `18421`
+		// Minimum execution time: 25_527_000 picoseconds.
+		Weight::from_parts(26_002_000, 0)
+			.saturating_add(Weight::from_parts(0, 18421))
+			.saturating_add(T::DbWeight::get().reads(7))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -272,36 +281,36 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `6082`
-		// Minimum execution time: 24_723_000 picoseconds.
-		Weight::from_parts(25_531_000, 0)
+		// Minimum execution time: 30_751_000 picoseconds.
+		Weight::from_parts(31_977_000, 0)
 			.saturating_add(Weight::from_parts(0, 6082))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `136`
-		//  Estimated: `11026`
-		// Minimum execution time: 10_954_000 picoseconds.
-		Weight::from_parts(11_199_000, 0)
-			.saturating_add(Weight::from_parts(0, 11026))
-			.saturating_add(T::DbWeight::get().reads(4))
+		//  Measured:  `109`
+		//  Estimated: `13474`
+		// Minimum execution time: 16_496_000 picoseconds.
+		Weight::from_parts(16_800_000, 0)
+			.saturating_add(Weight::from_parts(0, 13474))
+			.saturating_add(T::DbWeight::get().reads(5))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `100`
-		//  Estimated: `13465`
-		// Minimum execution time: 16_561_000 picoseconds.
-		Weight::from_parts(16_908_000, 0)
-			.saturating_add(Weight::from_parts(0, 13465))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15940`
+		// Minimum execution time: 22_667_000 picoseconds.
+		Weight::from_parts(23_049_000, 0)
+			.saturating_add(Weight::from_parts(0, 15940))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -316,11 +325,11 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
-		//  Estimated: `13507`
-		// Minimum execution time: 33_279_000 picoseconds.
-		Weight::from_parts(33_869_000, 0)
-			.saturating_add(Weight::from_parts(0, 13507))
-			.saturating_add(T::DbWeight::get().reads(10))
+		//  Estimated: `15982`
+		// Minimum execution time: 43_208_000 picoseconds.
+		Weight::from_parts(44_012_000, 0)
+			.saturating_add(Weight::from_parts(0, 15982))
+			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
@@ -331,8 +340,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `32`
 		//  Estimated: `1517`
-		// Minimum execution time: 3_405_000 picoseconds.
-		Weight::from_parts(3_489_000, 0)
+		// Minimum execution time: 4_726_000 picoseconds.
+		Weight::from_parts(4_989_000, 0)
 			.saturating_add(Weight::from_parts(0, 1517))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -343,22 +352,24 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `7669`
 		//  Estimated: `11134`
-		// Minimum execution time: 24_387_000 picoseconds.
-		Weight::from_parts(25_143_000, 0)
+		// Minimum execution time: 28_064_000 picoseconds.
+		Weight::from_parts(28_676_000, 0)
 			.saturating_add(Weight::from_parts(0, 11134))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1)
 	/// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn claim_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `90`
 		//  Estimated: `3555`
-		// Minimum execution time: 35_229_000 picoseconds.
-		Weight::from_parts(36_035_000, 0)
+		// Minimum execution time: 41_106_000 picoseconds.
+		Weight::from_parts(41_949_000, 0)
 			.saturating_add(Weight::from_parts(0, 3555))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 }
diff --git a/cumulus/parachains/runtimes/glutton/glutton-westend/Cargo.toml b/cumulus/parachains/runtimes/glutton/glutton-westend/Cargo.toml
index f2922b710e24..1c1041a4317e 100644
--- a/cumulus/parachains/runtimes/glutton/glutton-westend/Cargo.toml
+++ b/cumulus/parachains/runtimes/glutton/glutton-westend/Cargo.toml
@@ -20,11 +20,12 @@ frame-benchmarking = { optional = true, workspace = true }
 frame-executive = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-frame-system-rpc-runtime-api = { workspace = true }
 frame-system-benchmarking = { optional = true, workspace = true }
+frame-system-rpc-runtime-api = { workspace = true }
 frame-try-runtime = { optional = true, workspace = true }
 pallet-aura = { workspace = true }
 pallet-glutton = { workspace = true }
+pallet-message-queue = { workspace = true }
 pallet-sudo = { workspace = true }
 pallet-timestamp = { workspace = true }
 sp-api = { workspace = true }
@@ -33,7 +34,6 @@ sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
 sp-genesis-builder = { workspace = true }
 sp-inherents = { workspace = true }
-pallet-message-queue = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
diff --git a/cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs b/cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs
index fdf467ab64b8..763f8abea34a 100644
--- a/cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs
@@ -102,7 +102,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: alloc::borrow::Cow::Borrowed("glutton-westend"),
 	impl_name: alloc::borrow::Cow::Borrowed("glutton-westend"),
 	authoring_version: 1,
-	spec_version: 1_016_001,
+	spec_version: 1_017_001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
diff --git a/cumulus/parachains/runtimes/people/people-rococo/Cargo.toml b/cumulus/parachains/runtimes/people/people-rococo/Cargo.toml
index 4984f6314f87..de2898046c0d 100644
--- a/cumulus/parachains/runtimes/people/people-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/people/people-rococo/Cargo.toml
@@ -72,8 +72,8 @@ cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+cumulus-primitives-utility = { workspace = true }
 pallet-collator-selection = { workspace = true }
 parachain-info = { workspace = true }
 parachains-common = { workspace = true }
diff --git a/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs b/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs
index dc5f2ac0997c..b8db687da625 100644
--- a/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs
@@ -137,7 +137,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: alloc::borrow::Cow::Borrowed("people-rococo"),
 	impl_name: alloc::borrow::Cow::Borrowed("people-rococo"),
 	authoring_version: 1,
-	spec_version: 1_016_001,
+	spec_version: 1_017_001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
diff --git a/cumulus/parachains/runtimes/people/people-rococo/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/people/people-rococo/src/weights/pallet_xcm.rs
index fabce29b5fd9..d50afdbee475 100644
--- a/cumulus/parachains/runtimes/people/people-rococo/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/people/people-rococo/src/weights/pallet_xcm.rs
@@ -17,25 +17,27 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-02-20, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-12-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-bn-ce5rx-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `902e7ad7764b`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("people-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // target/production/polkadot-parachain
 // benchmark
 // pallet
-// --steps=50
-// --repeat=20
 // --extrinsic=*
+// --chain=people-rococo-dev
+// --pallet=pallet_xcm
+// --header=/__w/polkadot-sdk/polkadot-sdk/cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/people/people-rococo/src/weights
 // --wasm-execution=compiled
+// --steps=50
+// --repeat=20
 // --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
-// --pallet=pallet_xcm
-// --chain=people-rococo-dev
-// --header=./cumulus/file_header.txt
-// --output=./cumulus/parachains/runtimes/people/people-rococo/src/weights/
+// --no-storage-info
+// --no-min-squares
+// --no-median-slopes
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -48,6 +50,8 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_xcm`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
+	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -60,16 +64,18 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn send() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `38`
-		//  Estimated: `3503`
-		// Minimum execution time: 17_830_000 picoseconds.
-		Weight::from_parts(18_411_000, 0)
-			.saturating_add(Weight::from_parts(0, 3503))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Measured:  `107`
+		//  Estimated: `3572`
+		// Minimum execution time: 29_029_000 picoseconds.
+		Weight::from_parts(29_911_000, 0)
+			.saturating_add(Weight::from_parts(0, 3572))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -82,12 +88,12 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn teleport_assets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `70`
-		//  Estimated: `3535`
-		// Minimum execution time: 55_456_000 picoseconds.
-		Weight::from_parts(56_808_000, 0)
-			.saturating_add(Weight::from_parts(0, 3535))
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Measured:  `107`
+		//  Estimated: `3572`
+		// Minimum execution time: 73_046_000 picoseconds.
+		Weight::from_parts(76_061_000, 0)
+			.saturating_add(Weight::from_parts(0, 3572))
+			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `Benchmark::Override` (r:0 w:0)
@@ -110,15 +116,16 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		Weight::from_parts(18_446_744_073_709_551_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
-	/// Storage: `Benchmark::Override` (r:0 w:0)
-	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn execute() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
-		Weight::from_parts(18_446_744_073_709_551_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
+		//  Measured:  `32`
+		//  Estimated: `1517`
+		// Minimum execution time: 11_580_000 picoseconds.
+		Weight::from_parts(12_050_000, 0)
+			.saturating_add(Weight::from_parts(0, 1517))
+			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:0 w:1)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -126,8 +133,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_996_000 picoseconds.
-		Weight::from_parts(6_154_000, 0)
+		// Minimum execution time: 6_963_000 picoseconds.
+		Weight::from_parts(7_371_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -137,8 +144,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_768_000 picoseconds.
-		Weight::from_parts(1_914_000, 0)
+		// Minimum execution time: 2_281_000 picoseconds.
+		Weight::from_parts(2_417_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -162,8 +169,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `38`
 		//  Estimated: `3503`
-		// Minimum execution time: 24_120_000 picoseconds.
-		Weight::from_parts(24_745_000, 0)
+		// Minimum execution time: 30_422_000 picoseconds.
+		Weight::from_parts(31_342_000, 0)
 			.saturating_add(Weight::from_parts(0, 3503))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(5))
@@ -186,8 +193,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `255`
 		//  Estimated: `3720`
-		// Minimum execution time: 26_630_000 picoseconds.
-		Weight::from_parts(27_289_000, 0)
+		// Minimum execution time: 35_290_000 picoseconds.
+		Weight::from_parts(36_161_000, 0)
 			.saturating_add(Weight::from_parts(0, 3720))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -198,45 +205,45 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_821_000 picoseconds.
-		Weight::from_parts(1_946_000, 0)
+		// Minimum execution time: 2_115_000 picoseconds.
+		Weight::from_parts(2_389_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:5 w:2)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:6 w:2)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `89`
-		//  Estimated: `13454`
-		// Minimum execution time: 16_586_000 picoseconds.
-		Weight::from_parts(16_977_000, 0)
-			.saturating_add(Weight::from_parts(0, 13454))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15929`
+		// Minimum execution time: 22_355_000 picoseconds.
+		Weight::from_parts(23_011_000, 0)
+			.saturating_add(Weight::from_parts(0, 15929))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `93`
-		//  Estimated: `13458`
-		// Minimum execution time: 16_923_000 picoseconds.
-		Weight::from_parts(17_415_000, 0)
-			.saturating_add(Weight::from_parts(0, 13458))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15933`
+		// Minimum execution time: 22_043_000 picoseconds.
+		Weight::from_parts(22_506_000, 0)
+			.saturating_add(Weight::from_parts(0, 15933))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:7 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
-		//  Estimated: `15946`
-		// Minimum execution time: 18_596_000 picoseconds.
-		Weight::from_parts(18_823_000, 0)
-			.saturating_add(Weight::from_parts(0, 15946))
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Estimated: `18421`
+		// Minimum execution time: 26_143_000 picoseconds.
+		Weight::from_parts(26_577_000, 0)
+			.saturating_add(Weight::from_parts(0, 18421))
+			.saturating_add(T::DbWeight::get().reads(7))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -254,36 +261,36 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `6046`
-		// Minimum execution time: 23_817_000 picoseconds.
-		Weight::from_parts(24_520_000, 0)
+		// Minimum execution time: 30_489_000 picoseconds.
+		Weight::from_parts(31_415_000, 0)
 			.saturating_add(Weight::from_parts(0, 6046))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `136`
-		//  Estimated: `11026`
-		// Minimum execution time: 11_042_000 picoseconds.
-		Weight::from_parts(11_578_000, 0)
-			.saturating_add(Weight::from_parts(0, 11026))
-			.saturating_add(T::DbWeight::get().reads(4))
+		//  Measured:  `109`
+		//  Estimated: `13474`
+		// Minimum execution time: 16_848_000 picoseconds.
+		Weight::from_parts(17_169_000, 0)
+			.saturating_add(Weight::from_parts(0, 13474))
+			.saturating_add(T::DbWeight::get().reads(5))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `100`
-		//  Estimated: `13465`
-		// Minimum execution time: 17_306_000 picoseconds.
-		Weight::from_parts(17_817_000, 0)
-			.saturating_add(Weight::from_parts(0, 13465))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15940`
+		// Minimum execution time: 22_556_000 picoseconds.
+		Weight::from_parts(22_875_000, 0)
+			.saturating_add(Weight::from_parts(0, 15940))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -298,11 +305,11 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
-		//  Estimated: `13471`
-		// Minimum execution time: 32_141_000 picoseconds.
-		Weight::from_parts(32_954_000, 0)
-			.saturating_add(Weight::from_parts(0, 13471))
-			.saturating_add(T::DbWeight::get().reads(10))
+		//  Estimated: `15946`
+		// Minimum execution time: 42_772_000 picoseconds.
+		Weight::from_parts(43_606_000, 0)
+			.saturating_add(Weight::from_parts(0, 15946))
+			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
@@ -313,8 +320,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `32`
 		//  Estimated: `1517`
-		// Minimum execution time: 3_410_000 picoseconds.
-		Weight::from_parts(3_556_000, 0)
+		// Minimum execution time: 4_811_000 picoseconds.
+		Weight::from_parts(5_060_000, 0)
 			.saturating_add(Weight::from_parts(0, 1517))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -325,22 +332,24 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `7669`
 		//  Estimated: `11134`
-		// Minimum execution time: 25_021_000 picoseconds.
-		Weight::from_parts(25_240_000, 0)
+		// Minimum execution time: 31_925_000 picoseconds.
+		Weight::from_parts(32_294_000, 0)
 			.saturating_add(Weight::from_parts(0, 11134))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1)
 	/// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn claim_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `90`
 		//  Estimated: `3555`
-		// Minimum execution time: 33_801_000 picoseconds.
-		Weight::from_parts(34_655_000, 0)
+		// Minimum execution time: 41_804_000 picoseconds.
+		Weight::from_parts(42_347_000, 0)
 			.saturating_add(Weight::from_parts(0, 3555))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 }
diff --git a/cumulus/parachains/runtimes/people/people-westend/Cargo.toml b/cumulus/parachains/runtimes/people/people-westend/Cargo.toml
index 7822df585a58..65bc8264934f 100644
--- a/cumulus/parachains/runtimes/people/people-westend/Cargo.toml
+++ b/cumulus/parachains/runtimes/people/people-westend/Cargo.toml
@@ -72,8 +72,8 @@ cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+cumulus-primitives-utility = { workspace = true }
 pallet-collator-selection = { workspace = true }
 parachain-info = { workspace = true }
 parachains-common = { workspace = true }
diff --git a/cumulus/parachains/runtimes/people/people-westend/src/lib.rs b/cumulus/parachains/runtimes/people/people-westend/src/lib.rs
index 3265062a0441..620ec41c071c 100644
--- a/cumulus/parachains/runtimes/people/people-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/people/people-westend/src/lib.rs
@@ -136,10 +136,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: alloc::borrow::Cow::Borrowed("people-westend"),
 	impl_name: alloc::borrow::Cow::Borrowed("people-westend"),
 	authoring_version: 1,
-	spec_version: 1_016_001,
+	spec_version: 1_017_001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 1,
+	transaction_version: 2,
 	system_version: 1,
 };
 
diff --git a/cumulus/parachains/runtimes/people/people-westend/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/people/people-westend/src/weights/pallet_xcm.rs
index c337289243b7..f06669209a18 100644
--- a/cumulus/parachains/runtimes/people/people-westend/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/people/people-westend/src/weights/pallet_xcm.rs
@@ -17,25 +17,27 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-02-20, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-12-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-bn-ce5rx-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `4105cf7eb2c7`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("people-westend-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // target/production/polkadot-parachain
 // benchmark
 // pallet
-// --steps=50
-// --repeat=20
 // --extrinsic=*
+// --chain=people-westend-dev
+// --pallet=pallet_xcm
+// --header=/__w/polkadot-sdk/polkadot-sdk/cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/people/people-westend/src/weights
 // --wasm-execution=compiled
+// --steps=50
+// --repeat=20
 // --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
-// --pallet=pallet_xcm
-// --chain=people-westend-dev
-// --header=./cumulus/file_header.txt
-// --output=./cumulus/parachains/runtimes/people/people-westend/src/weights/
+// --no-storage-info
+// --no-min-squares
+// --no-median-slopes
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -48,6 +50,8 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_xcm`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
+	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -60,16 +64,18 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn send() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `38`
-		//  Estimated: `3503`
-		// Minimum execution time: 17_856_000 picoseconds.
-		Weight::from_parts(18_473_000, 0)
-			.saturating_add(Weight::from_parts(0, 3503))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Measured:  `107`
+		//  Estimated: `3572`
+		// Minimum execution time: 29_434_000 picoseconds.
+		Weight::from_parts(30_114_000, 0)
+			.saturating_add(Weight::from_parts(0, 3572))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -82,12 +88,12 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn teleport_assets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `70`
-		//  Estimated: `3535`
-		// Minimum execution time: 56_112_000 picoseconds.
-		Weight::from_parts(57_287_000, 0)
-			.saturating_add(Weight::from_parts(0, 3535))
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Measured:  `107`
+		//  Estimated: `3572`
+		// Minimum execution time: 73_433_000 picoseconds.
+		Weight::from_parts(75_377_000, 0)
+			.saturating_add(Weight::from_parts(0, 3572))
+			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `Benchmark::Override` (r:0 w:0)
@@ -110,15 +116,16 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		Weight::from_parts(18_446_744_073_709_551_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
-	/// Storage: `Benchmark::Override` (r:0 w:0)
-	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn execute() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
-		Weight::from_parts(18_446_744_073_709_551_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
+		//  Measured:  `32`
+		//  Estimated: `1517`
+		// Minimum execution time: 11_627_000 picoseconds.
+		Weight::from_parts(12_034_000, 0)
+			.saturating_add(Weight::from_parts(0, 1517))
+			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:0 w:1)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -126,8 +133,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_186_000 picoseconds.
-		Weight::from_parts(6_420_000, 0)
+		// Minimum execution time: 7_075_000 picoseconds.
+		Weight::from_parts(7_406_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -137,8 +144,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_824_000 picoseconds.
-		Weight::from_parts(1_999_000, 0)
+		// Minimum execution time: 2_308_000 picoseconds.
+		Weight::from_parts(2_485_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -162,8 +169,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `38`
 		//  Estimated: `3503`
-		// Minimum execution time: 23_833_000 picoseconds.
-		Weight::from_parts(24_636_000, 0)
+		// Minimum execution time: 29_939_000 picoseconds.
+		Weight::from_parts(30_795_000, 0)
 			.saturating_add(Weight::from_parts(0, 3503))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(5))
@@ -186,8 +193,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `255`
 		//  Estimated: `3720`
-		// Minimum execution time: 26_557_000 picoseconds.
-		Weight::from_parts(27_275_000, 0)
+		// Minimum execution time: 34_830_000 picoseconds.
+		Weight::from_parts(35_677_000, 0)
 			.saturating_add(Weight::from_parts(0, 3720))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -198,45 +205,45 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_921_000 picoseconds.
-		Weight::from_parts(2_040_000, 0)
+		// Minimum execution time: 2_363_000 picoseconds.
+		Weight::from_parts(2_517_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:5 w:2)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:6 w:2)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `89`
-		//  Estimated: `13454`
-		// Minimum execution time: 16_832_000 picoseconds.
-		Weight::from_parts(17_312_000, 0)
-			.saturating_add(Weight::from_parts(0, 13454))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15929`
+		// Minimum execution time: 22_322_000 picoseconds.
+		Weight::from_parts(22_709_000, 0)
+			.saturating_add(Weight::from_parts(0, 15929))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `93`
-		//  Estimated: `13458`
-		// Minimum execution time: 16_687_000 picoseconds.
-		Weight::from_parts(17_123_000, 0)
-			.saturating_add(Weight::from_parts(0, 13458))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15933`
+		// Minimum execution time: 22_418_000 picoseconds.
+		Weight::from_parts(22_834_000, 0)
+			.saturating_add(Weight::from_parts(0, 15933))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:7 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
-		//  Estimated: `15946`
-		// Minimum execution time: 18_164_000 picoseconds.
-		Weight::from_parts(18_580_000, 0)
-			.saturating_add(Weight::from_parts(0, 15946))
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Estimated: `18421`
+		// Minimum execution time: 26_310_000 picoseconds.
+		Weight::from_parts(26_623_000, 0)
+			.saturating_add(Weight::from_parts(0, 18421))
+			.saturating_add(T::DbWeight::get().reads(7))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -254,36 +261,36 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `6046`
-		// Minimum execution time: 23_577_000 picoseconds.
-		Weight::from_parts(24_324_000, 0)
+		// Minimum execution time: 29_863_000 picoseconds.
+		Weight::from_parts(30_467_000, 0)
 			.saturating_add(Weight::from_parts(0, 6046))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `136`
-		//  Estimated: `11026`
-		// Minimum execution time: 11_014_000 picoseconds.
-		Weight::from_parts(11_223_000, 0)
-			.saturating_add(Weight::from_parts(0, 11026))
-			.saturating_add(T::DbWeight::get().reads(4))
+		//  Measured:  `109`
+		//  Estimated: `13474`
+		// Minimum execution time: 17_075_000 picoseconds.
+		Weight::from_parts(17_578_000, 0)
+			.saturating_add(Weight::from_parts(0, 13474))
+			.saturating_add(T::DbWeight::get().reads(5))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `100`
-		//  Estimated: `13465`
-		// Minimum execution time: 16_887_000 picoseconds.
-		Weight::from_parts(17_361_000, 0)
-			.saturating_add(Weight::from_parts(0, 13465))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15940`
+		// Minimum execution time: 22_816_000 picoseconds.
+		Weight::from_parts(23_175_000, 0)
+			.saturating_add(Weight::from_parts(0, 15940))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -298,11 +305,11 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
-		//  Estimated: `13471`
-		// Minimum execution time: 31_705_000 picoseconds.
-		Weight::from_parts(32_166_000, 0)
-			.saturating_add(Weight::from_parts(0, 13471))
-			.saturating_add(T::DbWeight::get().reads(10))
+		//  Estimated: `15946`
+		// Minimum execution time: 42_767_000 picoseconds.
+		Weight::from_parts(43_308_000, 0)
+			.saturating_add(Weight::from_parts(0, 15946))
+			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
@@ -313,8 +320,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `32`
 		//  Estimated: `1517`
-		// Minimum execution time: 3_568_000 picoseconds.
-		Weight::from_parts(3_669_000, 0)
+		// Minimum execution time: 4_864_000 picoseconds.
+		Weight::from_parts(5_010_000, 0)
 			.saturating_add(Weight::from_parts(0, 1517))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -325,22 +332,24 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `7669`
 		//  Estimated: `11134`
-		// Minimum execution time: 24_823_000 picoseconds.
-		Weight::from_parts(25_344_000, 0)
+		// Minimum execution time: 30_237_000 picoseconds.
+		Weight::from_parts(30_662_000, 0)
 			.saturating_add(Weight::from_parts(0, 11134))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `PolkadotXcm::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `PolkadotXcm::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1)
 	/// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn claim_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `90`
 		//  Estimated: `3555`
-		// Minimum execution time: 34_516_000 picoseconds.
-		Weight::from_parts(35_478_000, 0)
+		// Minimum execution time: 41_418_000 picoseconds.
+		Weight::from_parts(42_011_000, 0)
 			.saturating_add(Weight::from_parts(0, 3555))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 }
diff --git a/cumulus/parachains/runtimes/test-utils/Cargo.toml b/cumulus/parachains/runtimes/test-utils/Cargo.toml
index 17c81ae4921a..cc8f29524514 100644
--- a/cumulus/parachains/runtimes/test-utils/Cargo.toml
+++ b/cumulus/parachains/runtimes/test-utils/Cargo.toml
@@ -21,27 +21,27 @@ pallet-balances = { workspace = true }
 pallet-session = { workspace = true }
 pallet-timestamp = { workspace = true }
 sp-consensus-aura = { workspace = true }
+sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
-sp-core = { workspace = true }
 
 # Cumulus
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
-pallet-collator-selection = { workspace = true }
-parachain-info = { workspace = true }
-parachains-common = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 cumulus-primitives-parachain-inherent = { workspace = true }
 cumulus-test-relay-sproof-builder = { workspace = true }
+pallet-collator-selection = { workspace = true }
+parachain-info = { workspace = true }
+parachains-common = { workspace = true }
 
 # Polkadot
+pallet-xcm = { workspace = true }
+polkadot-parachain-primitives = { workspace = true }
 xcm = { workspace = true }
 xcm-executor = { workspace = true }
-pallet-xcm = { workspace = true }
 xcm-runtime-apis = { workspace = true }
-polkadot-parachain-primitives = { workspace = true }
 
 [dev-dependencies]
 hex-literal = { workspace = true, default-features = true }
diff --git a/cumulus/parachains/runtimes/testing/penpal/Cargo.toml b/cumulus/parachains/runtimes/testing/penpal/Cargo.toml
index 3bd1e5c6f436..5b17f4f57388 100644
--- a/cumulus/parachains/runtimes/testing/penpal/Cargo.toml
+++ b/cumulus/parachains/runtimes/testing/penpal/Cargo.toml
@@ -32,6 +32,9 @@ frame-system = { workspace = true }
 frame-system-benchmarking = { optional = true, workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
 frame-try-runtime = { optional = true, workspace = true }
+pallet-asset-conversion = { workspace = true }
+pallet-asset-tx-payment = { workspace = true }
+pallet-assets = { workspace = true }
 pallet-aura = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
@@ -40,9 +43,6 @@ pallet-sudo = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
-pallet-asset-tx-payment = { workspace = true }
-pallet-assets = { workspace = true }
-pallet-asset-conversion = { workspace = true }
 sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
@@ -57,9 +57,9 @@ sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
 
 # Polkadot
-polkadot-primitives = { workspace = true }
 pallet-xcm = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
+polkadot-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
@@ -67,8 +67,8 @@ xcm-executor = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 # Cumulus
+assets-common = { workspace = true }
 cumulus-pallet-aura-ext = { workspace = true }
-pallet-message-queue = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-session-benchmarking = { workspace = true }
 cumulus-pallet-xcm = { workspace = true }
@@ -76,9 +76,9 @@ cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 cumulus-primitives-utility = { workspace = true }
 pallet-collator-selection = { workspace = true }
+pallet-message-queue = { workspace = true }
 parachain-info = { workspace = true }
 parachains-common = { workspace = true }
-assets-common = { workspace = true }
 snowbridge-router-primitives = { workspace = true }
 
 primitive-types = { version = "0.12.1", default-features = false, features = ["codec", "num-traits", "scale-info"] }
diff --git a/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml b/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml
index 035d0ac94be6..e8761445f161 100644
--- a/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml
+++ b/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml
@@ -43,15 +43,14 @@ sp-version = { workspace = true }
 # Polkadot
 pallet-xcm = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
+polkadot-runtime-common = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
-polkadot-runtime-common = { workspace = true }
 
 # Cumulus
 cumulus-pallet-aura-ext = { workspace = true }
-pallet-message-queue = { workspace = true }
-cumulus-pallet-parachain-system = { workspace = true, features = ["experimental-ump-signals"] }
+cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-ping = { workspace = true }
@@ -59,9 +58,10 @@ cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
 cumulus-primitives-utility = { workspace = true }
+pallet-message-queue = { workspace = true }
+parachain-info = { workspace = true }
 parachains-common = { workspace = true }
 testnet-parachains-constants = { features = ["rococo"], workspace = true }
-parachain-info = { workspace = true }
 
 [build-dependencies]
 substrate-wasm-builder = { optional = true, workspace = true, default-features = true }
diff --git a/cumulus/polkadot-omni-node/lib/Cargo.toml b/cumulus/polkadot-omni-node/lib/Cargo.toml
index afbe03ada89c..018fc88a2aea 100644
--- a/cumulus/polkadot-omni-node/lib/Cargo.toml
+++ b/cumulus/polkadot-omni-node/lib/Cargo.toml
@@ -19,11 +19,11 @@ async-trait = { workspace = true }
 clap = { features = ["derive"], workspace = true }
 codec = { workspace = true, default-features = true }
 color-print = { workspace = true }
+docify = { workspace = true }
 futures = { workspace = true }
 log = { workspace = true, default-features = true }
 serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
-docify = { workspace = true }
 
 # Local
 jsonrpsee = { features = ["server"], workspace = true }
@@ -34,48 +34,46 @@ subxt-metadata = { workspace = true, default-features = true }
 # Substrate
 frame-benchmarking = { optional = true, workspace = true, default-features = true }
 frame-benchmarking-cli = { workspace = true, default-features = true }
-sp-crypto-hashing = { workspace = true }
-sp-runtime = { workspace = true }
-sp-core = { workspace = true, default-features = true }
-sp-session = { workspace = true, default-features = true }
-frame-try-runtime = { optional = true, workspace = true, default-features = true }
-sc-consensus = { workspace = true, default-features = true }
 frame-support = { optional = true, workspace = true, default-features = true }
+frame-system-rpc-runtime-api = { workspace = true, default-features = true }
+frame-try-runtime = { optional = true, workspace = true, default-features = true }
+pallet-transaction-payment = { workspace = true, default-features = true }
+pallet-transaction-payment-rpc = { workspace = true, default-features = true }
+pallet-transaction-payment-rpc-runtime-api = { workspace = true, default-features = true }
+prometheus-endpoint = { workspace = true, default-features = true }
+sc-basic-authorship = { workspace = true, default-features = true }
+sc-chain-spec = { workspace = true, default-features = true }
 sc-cli = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-client-db = { workspace = true, default-features = true }
+sc-consensus = { workspace = true, default-features = true }
+sc-consensus-manual-seal = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
+sc-rpc = { workspace = true, default-features = true }
+sc-runtime-utilities = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
+sc-sysinfo = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
+sc-tracing = { workspace = true, default-features = true }
 sc-transaction-pool = { workspace = true, default-features = true }
-sp-transaction-pool = { workspace = true, default-features = true }
-sc-network = { workspace = true, default-features = true }
-sc-basic-authorship = { workspace = true, default-features = true }
-sp-timestamp = { workspace = true, default-features = true }
-sp-genesis-builder = { workspace = true }
+sp-api = { workspace = true, default-features = true }
 sp-block-builder = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
+sp-consensus-aura = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-crypto-hashing = { workspace = true }
+sp-genesis-builder = { workspace = true }
+sp-inherents = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
-sc-chain-spec = { workspace = true, default-features = true }
-sc-rpc = { workspace = true, default-features = true }
+sp-runtime = { workspace = true }
+sp-session = { workspace = true, default-features = true }
+sp-storage = { workspace = true, default-features = true }
+sp-timestamp = { workspace = true, default-features = true }
+sp-transaction-pool = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
 sp-weights = { workspace = true, default-features = true }
-sc-tracing = { workspace = true, default-features = true }
-sc-runtime-utilities = { workspace = true, default-features = true }
-sp-storage = { workspace = true, default-features = true }
-frame-system-rpc-runtime-api = { workspace = true, default-features = true }
-pallet-transaction-payment = { workspace = true, default-features = true }
-pallet-transaction-payment-rpc-runtime-api = { workspace = true, default-features = true }
-sp-inherents = { workspace = true, default-features = true }
-sp-api = { workspace = true, default-features = true }
-sp-consensus = { workspace = true, default-features = true }
-sp-consensus-aura = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
-sp-wasm-interface = { workspace = true, default-features = true }
-sc-consensus-manual-seal = { workspace = true, default-features = true }
-sc-sysinfo = { workspace = true, default-features = true }
-prometheus-endpoint = { workspace = true, default-features = true }
 substrate-frame-rpc-system = { workspace = true, default-features = true }
-pallet-transaction-payment-rpc = { workspace = true, default-features = true }
 substrate-state-trie-migration-rpc = { workspace = true, default-features = true }
 
 # Polkadot
@@ -86,9 +84,9 @@ polkadot-primitives = { workspace = true, default-features = true }
 cumulus-client-cli = { workspace = true, default-features = true }
 cumulus-client-collator = { workspace = true, default-features = true }
 cumulus-client-consensus-aura = { workspace = true, default-features = true }
-cumulus-client-consensus-relay-chain = { workspace = true, default-features = true }
 cumulus-client-consensus-common = { workspace = true, default-features = true }
 cumulus-client-consensus-proposer = { workspace = true, default-features = true }
+cumulus-client-consensus-relay-chain = { workspace = true, default-features = true }
 cumulus-client-parachain-inherent = { workspace = true, default-features = true }
 cumulus-client-service = { workspace = true, default-features = true }
 cumulus-primitives-aura = { workspace = true, default-features = true }
@@ -98,10 +96,10 @@ futures-timer = "3.0.3"
 
 [dev-dependencies]
 assert_cmd = { workspace = true }
+cumulus-test-runtime = { workspace = true }
 nix = { features = ["signal"], workspace = true }
 tokio = { version = "1.32.0", features = ["macros", "parking_lot", "time"] }
 wait-timeout = { workspace = true }
-cumulus-test-runtime = { workspace = true }
 
 [features]
 default = []
diff --git a/cumulus/polkadot-omni-node/lib/src/common/runtime.rs b/cumulus/polkadot-omni-node/lib/src/common/runtime.rs
index 2a95f41495a6..fcc1d7f0643e 100644
--- a/cumulus/polkadot-omni-node/lib/src/common/runtime.rs
+++ b/cumulus/polkadot-omni-node/lib/src/common/runtime.rs
@@ -103,7 +103,11 @@ pub struct DefaultRuntimeResolver;
 
 impl RuntimeResolver for DefaultRuntimeResolver {
 	fn runtime(&self, chain_spec: &dyn ChainSpec) -> sc_cli::Result<Runtime> {
-		let metadata_inspector = MetadataInspector::new(chain_spec)?;
+		let Ok(metadata_inspector) = MetadataInspector::new(chain_spec) else {
+			log::info!("Unable to check metadata. Skipping metadata checks. Metadata checks are supported for metadata versions v14 and higher.");
+			return Ok(Runtime::Omni(BlockNumber::U32, Consensus::Aura(AuraConsensusId::Sr25519)))
+		};
+
 		let block_number = match metadata_inspector.block_number() {
 			Some(inner) => inner,
 			None => {
diff --git a/cumulus/polkadot-omni-node/lib/src/nodes/manual_seal.rs b/cumulus/polkadot-omni-node/lib/src/nodes/manual_seal.rs
index 8b7921da30c0..f33865ad45cd 100644
--- a/cumulus/polkadot-omni-node/lib/src/nodes/manual_seal.rs
+++ b/cumulus/polkadot-omni-node/lib/src/nodes/manual_seal.rs
@@ -21,12 +21,14 @@ use crate::common::{
 };
 use codec::Encode;
 use cumulus_client_parachain_inherent::{MockValidationDataInherentDataProvider, MockXcmConfig};
-use cumulus_primitives_core::ParaId;
+use cumulus_primitives_core::{CollectCollationInfo, ParaId};
+use polkadot_primitives::UpgradeGoAhead;
 use sc_consensus::{DefaultImportQueue, LongestChain};
 use sc_consensus_manual_seal::rpc::{ManualSeal, ManualSealApiServer};
 use sc_network::NetworkBackend;
 use sc_service::{Configuration, PartialComponents, TaskManager};
 use sc_telemetry::TelemetryHandle;
+use sp_api::ProvideRuntimeApi;
 use sp_runtime::traits::Header;
 use std::{marker::PhantomData, sync::Arc};
 
@@ -155,6 +157,18 @@ impl<NodeSpec: NodeSpecT> ManualSealNode<NodeSpec> {
 					.header(block)
 					.expect("Header lookup should succeed")
 					.expect("Header passed in as parent should be present in backend.");
+
+				let should_send_go_ahead = match client_for_cidp
+					.runtime_api()
+					.collect_collation_info(block, &current_para_head)
+				{
+					Ok(info) => info.new_validation_code.is_some(),
+					Err(e) => {
+						log::error!("Failed to collect collation info: {:?}", e);
+						false
+					},
+				};
+
 				let current_para_block_head =
 					Some(polkadot_primitives::HeadData(current_para_head.encode()));
 				let client_for_xcm = client_for_cidp.clone();
@@ -177,6 +191,12 @@ impl<NodeSpec: NodeSpecT> ManualSealNode<NodeSpec> {
 						raw_downward_messages: vec![],
 						raw_horizontal_messages: vec![],
 						additional_key_values: None,
+						upgrade_go_ahead: should_send_go_ahead.then(|| {
+							log::info!(
+								"Detected pending validation code, sending go-ahead signal."
+							);
+							UpgradeGoAhead::GoAhead
+						}),
 					};
 					Ok((
 						// This is intentional, as the runtime that we expect to run against this
diff --git a/cumulus/polkadot-parachain/Cargo.toml b/cumulus/polkadot-parachain/Cargo.toml
index 3bfb79610448..9130f60ceb38 100644
--- a/cumulus/polkadot-parachain/Cargo.toml
+++ b/cumulus/polkadot-parachain/Cargo.toml
@@ -24,29 +24,29 @@ serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
 
 # Local
-polkadot-omni-node-lib = { features = ["rococo-native", "westend-native"], workspace = true }
-rococo-parachain-runtime = { workspace = true }
-glutton-westend-runtime = { workspace = true }
 asset-hub-rococo-runtime = { workspace = true, default-features = true }
 asset-hub-westend-runtime = { workspace = true }
+bridge-hub-rococo-runtime = { workspace = true, default-features = true }
+bridge-hub-westend-runtime = { workspace = true, default-features = true }
 collectives-westend-runtime = { workspace = true }
 contracts-rococo-runtime = { workspace = true }
-bridge-hub-rococo-runtime = { workspace = true, default-features = true }
 coretime-rococo-runtime = { workspace = true }
 coretime-westend-runtime = { workspace = true }
-bridge-hub-westend-runtime = { workspace = true, default-features = true }
+glutton-westend-runtime = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 penpal-runtime = { workspace = true }
 people-rococo-runtime = { workspace = true }
 people-westend-runtime = { workspace = true }
-parachains-common = { workspace = true, default-features = true }
+polkadot-omni-node-lib = { features = ["rococo-native", "westend-native"], workspace = true }
+rococo-parachain-runtime = { workspace = true }
 
 # Substrate
-sp-core = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
+sc-chain-spec = { workspace = true, default-features = true }
 sc-cli = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
-sc-chain-spec = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-genesis-builder = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 
 # Polkadot
 xcm = { workspace = true, default-features = true }
diff --git a/cumulus/primitives/proof-size-hostfunction/Cargo.toml b/cumulus/primitives/proof-size-hostfunction/Cargo.toml
index 6e8168091892..b3b300d66ef3 100644
--- a/cumulus/primitives/proof-size-hostfunction/Cargo.toml
+++ b/cumulus/primitives/proof-size-hostfunction/Cargo.toml
@@ -12,14 +12,14 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-sp-runtime-interface = { workspace = true }
 sp-externalities = { workspace = true }
+sp-runtime-interface = { workspace = true }
 sp-trie = { workspace = true }
 
 [dev-dependencies]
-sp-state-machine = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
+sp-state-machine = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/primitives/storage-weight-reclaim/Cargo.toml b/cumulus/primitives/storage-weight-reclaim/Cargo.toml
index 3c358bc25edb..4bcbabc1f16c 100644
--- a/cumulus/primitives/storage-weight-reclaim/Cargo.toml
+++ b/cumulus/primitives/storage-weight-reclaim/Cargo.toml
@@ -27,9 +27,9 @@ cumulus-primitives-proof-size-hostfunction = { workspace = true }
 docify = { workspace = true }
 
 [dev-dependencies]
+cumulus-test-runtime = { workspace = true }
 sp-io = { workspace = true }
 sp-trie = { workspace = true }
-cumulus-test-runtime = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/primitives/utility/Cargo.toml b/cumulus/primitives/utility/Cargo.toml
index f26e34a29509..84039b9345b2 100644
--- a/cumulus/primitives/utility/Cargo.toml
+++ b/cumulus/primitives/utility/Cargo.toml
@@ -17,14 +17,14 @@ log = { workspace = true }
 
 # Substrate
 frame-support = { workspace = true }
-sp-runtime = { workspace = true }
 pallet-asset-conversion = { workspace = true }
+sp-runtime = { workspace = true }
 
 # Polkadot
 polkadot-runtime-common = { workspace = true }
 xcm = { workspace = true }
-xcm-executor = { workspace = true }
 xcm-builder = { workspace = true }
+xcm-executor = { workspace = true }
 
 # Cumulus
 cumulus-primitives-core = { workspace = true }
diff --git a/cumulus/test/client/Cargo.toml b/cumulus/test/client/Cargo.toml
index 33023816c718..2c72ca98f35a 100644
--- a/cumulus/test/client/Cargo.toml
+++ b/cumulus/test/client/Cargo.toml
@@ -12,40 +12,40 @@ workspace = true
 codec = { features = ["derive"], workspace = true }
 
 # Substrate
-sc-service = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
+pallet-transaction-payment = { workspace = true, default-features = true }
+sc-block-builder = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-consensus-aura = { workspace = true, default-features = true }
-sc-block-builder = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
 sc-executor-common = { workspace = true, default-features = true }
-substrate-test-client = { workspace = true }
-sp-application-crypto = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
+sc-service = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-sp-consensus-aura = { workspace = true, default-features = true }
+sp-application-crypto = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
+sp-consensus-aura = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 sp-timestamp = { workspace = true, default-features = true }
-frame-system = { workspace = true, default-features = true }
-pallet-transaction-payment = { workspace = true, default-features = true }
-pallet-balances = { workspace = true, default-features = true }
+substrate-test-client = { workspace = true }
 
 # Polkadot
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
 # Cumulus
-cumulus-test-runtime = { workspace = true }
-cumulus-test-service = { workspace = true }
-cumulus-test-relay-sproof-builder = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true, default-features = true }
-cumulus-primitives-proof-size-hostfunction = { workspace = true, default-features = true }
 cumulus-primitives-parachain-inherent = { workspace = true, default-features = true }
+cumulus-primitives-proof-size-hostfunction = { workspace = true, default-features = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true, default-features = true }
+cumulus-test-relay-sproof-builder = { workspace = true, default-features = true }
+cumulus-test-runtime = { workspace = true }
+cumulus-test-service = { workspace = true }
 
 [features]
 runtime-benchmarks = [
diff --git a/cumulus/test/runtime/Cargo.toml b/cumulus/test/runtime/Cargo.toml
index 8117e6e69709..150838e5e96e 100644
--- a/cumulus/test/runtime/Cargo.toml
+++ b/cumulus/test/runtime/Cargo.toml
@@ -18,37 +18,37 @@ frame-executive = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
+pallet-aura = { workspace = true }
+pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
+pallet-glutton = { workspace = true }
 pallet-message-queue = { workspace = true }
+pallet-session = { workspace = true }
 pallet-sudo = { workspace = true }
-pallet-aura = { workspace = true }
-pallet-authorship = { workspace = true }
 pallet-timestamp = { workspace = true }
-pallet-glutton = { workspace = true }
 pallet-transaction-payment = { workspace = true }
-pallet-session = { workspace = true }
 sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
+sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
 sp-genesis-builder = { workspace = true }
 sp-inherents = { workspace = true }
 sp-io = { workspace = true }
+sp-keyring = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
-sp-consensus-aura = { workspace = true }
 sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
-sp-keyring = { workspace = true }
 
 # Cumulus
+cumulus-pallet-aura-ext = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
-parachain-info = { workspace = true }
 cumulus-primitives-aura = { workspace = true }
-pallet-collator-selection = { workspace = true }
-cumulus-pallet-aura-ext = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+pallet-collator-selection = { workspace = true }
+parachain-info = { workspace = true }
 
 [build-dependencies]
 substrate-wasm-builder = { optional = true, workspace = true, default-features = true }
@@ -96,3 +96,4 @@ std = [
 ]
 increment-spec-version = []
 elastic-scaling = []
+experimental-ump-signals = ["cumulus-pallet-parachain-system/experimental-ump-signals"]
diff --git a/cumulus/test/runtime/build.rs b/cumulus/test/runtime/build.rs
index 7a7fe8ffaa82..43e60c1074a0 100644
--- a/cumulus/test/runtime/build.rs
+++ b/cumulus/test/runtime/build.rs
@@ -29,6 +29,14 @@ fn main() {
 		.with_current_project()
 		.enable_feature("elastic-scaling")
 		.import_memory()
+		.set_file_name("wasm_binary_elastic_scaling_mvp.rs")
+		.build();
+
+	WasmBuilder::new()
+		.with_current_project()
+		.enable_feature("elastic-scaling")
+		.enable_feature("experimental-ump-signals")
+		.import_memory()
 		.set_file_name("wasm_binary_elastic_scaling.rs")
 		.build();
 }
diff --git a/cumulus/test/runtime/src/lib.rs b/cumulus/test/runtime/src/lib.rs
index b1649c410581..4abc10276af1 100644
--- a/cumulus/test/runtime/src/lib.rs
+++ b/cumulus/test/runtime/src/lib.rs
@@ -27,6 +27,11 @@ pub mod wasm_spec_version_incremented {
 	include!(concat!(env!("OUT_DIR"), "/wasm_binary_spec_version_incremented.rs"));
 }
 
+pub mod elastic_scaling_mvp {
+	#[cfg(feature = "std")]
+	include!(concat!(env!("OUT_DIR"), "/wasm_binary_elastic_scaling_mvp.rs"));
+}
+
 pub mod elastic_scaling {
 	#[cfg(feature = "std")]
 	include!(concat!(env!("OUT_DIR"), "/wasm_binary_elastic_scaling.rs"));
diff --git a/cumulus/test/service/Cargo.toml b/cumulus/test/service/Cargo.toml
index 86a8c48bb54f..b3d92444c7d1 100644
--- a/cumulus/test/service/Cargo.toml
+++ b/cumulus/test/service/Cargo.toml
@@ -22,80 +22,80 @@ prometheus = { workspace = true }
 rand = { workspace = true, default-features = true }
 serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
+tempfile = { workspace = true }
 tokio = { features = ["macros"], workspace = true, default-features = true }
 tracing = { workspace = true, default-features = true }
 url = { workspace = true }
-tempfile = { workspace = true }
 
 # Substrate
 frame-system = { workspace = true, default-features = true }
 frame-system-rpc-runtime-api = { workspace = true, default-features = true }
 pallet-transaction-payment = { workspace = true, default-features = true }
 sc-basic-authorship = { workspace = true, default-features = true }
+sc-block-builder = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true, default-features = true }
+sc-cli = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-consensus-aura = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
+sc-executor-common = { workspace = true, default-features = true }
+sc-executor-wasmtime = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
+sc-telemetry = { workspace = true, default-features = true }
 sc-tracing = { workspace = true, default-features = true }
 sc-transaction-pool = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
-sc-telemetry = { workspace = true, default-features = true }
+sp-api = { workspace = true, default-features = true }
 sp-arithmetic = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
+sp-consensus-aura = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
+sp-genesis-builder = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-sp-api = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
-sp-genesis-builder = { workspace = true, default-features = true }
 sp-runtime = { workspace = true }
 sp-state-machine = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
 sp-timestamp = { workspace = true, default-features = true }
-sp-consensus = { workspace = true, default-features = true }
-sp-consensus-aura = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 substrate-test-client = { workspace = true }
-sc-cli = { workspace = true, default-features = true }
-sc-block-builder = { workspace = true, default-features = true }
-sc-executor-wasmtime = { workspace = true, default-features = true }
-sc-executor-common = { workspace = true, default-features = true }
 
 # Polkadot
-polkadot-primitives = { workspace = true, default-features = true }
-polkadot-service = { workspace = true, default-features = true }
-polkadot-test-service = { workspace = true }
 polkadot-cli = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
+polkadot-service = { workspace = true, default-features = true }
+polkadot-test-service = { workspace = true }
 
 # Cumulus
 cumulus-client-cli = { workspace = true, default-features = true }
-parachains-common = { workspace = true, default-features = true }
+cumulus-client-collator = { workspace = true, default-features = true }
+cumulus-client-consensus-aura = { workspace = true, default-features = true }
 cumulus-client-consensus-common = { workspace = true, default-features = true }
 cumulus-client-consensus-proposer = { workspace = true, default-features = true }
-cumulus-client-consensus-aura = { workspace = true, default-features = true }
 cumulus-client-consensus-relay-chain = { workspace = true, default-features = true }
 cumulus-client-parachain-inherent = { workspace = true, default-features = true }
+cumulus-client-pov-recovery = { workspace = true, default-features = true }
 cumulus-client-service = { workspace = true, default-features = true }
-cumulus-client-collator = { workspace = true, default-features = true }
+cumulus-pallet-parachain-system = { workspace = true }
 cumulus-primitives-core = { workspace = true, default-features = true }
+cumulus-primitives-storage-weight-reclaim = { workspace = true, default-features = true }
 cumulus-relay-chain-inprocess-interface = { workspace = true, default-features = true }
 cumulus-relay-chain-interface = { workspace = true, default-features = true }
-cumulus-test-runtime = { workspace = true }
 cumulus-relay-chain-minimal-node = { workspace = true, default-features = true }
-cumulus-client-pov-recovery = { workspace = true, default-features = true }
 cumulus-test-relay-sproof-builder = { workspace = true, default-features = true }
-cumulus-pallet-parachain-system = { workspace = true }
-cumulus-primitives-storage-weight-reclaim = { workspace = true, default-features = true }
+cumulus-test-runtime = { workspace = true }
 pallet-timestamp = { workspace = true, default-features = true }
+parachains-common = { workspace = true, default-features = true }
 
 [dev-dependencies]
+cumulus-test-client = { workspace = true }
 futures = { workspace = true }
 portpicker = { workspace = true }
 sp-authority-discovery = { workspace = true, default-features = true }
-cumulus-test-client = { workspace = true }
 
 # Polkadot dependencies
 polkadot-test-service = { workspace = true }
diff --git a/cumulus/test/service/src/chain_spec.rs b/cumulus/test/service/src/chain_spec.rs
index 3d4e4dca5f8d..5ebcc14592d7 100644
--- a/cumulus/test/service/src/chain_spec.rs
+++ b/cumulus/test/service/src/chain_spec.rs
@@ -116,3 +116,13 @@ pub fn get_elastic_scaling_chain_spec(id: Option<ParaId>) -> ChainSpec {
 			.expect("WASM binary was not built, please build it!"),
 	)
 }
+
+/// Get the chain spec for a specific parachain ID.
+pub fn get_elastic_scaling_mvp_chain_spec(id: Option<ParaId>) -> ChainSpec {
+	get_chain_spec_with_extra_endowed(
+		id,
+		Default::default(),
+		cumulus_test_runtime::elastic_scaling_mvp::WASM_BINARY
+			.expect("WASM binary was not built, please build it!"),
+	)
+}
diff --git a/cumulus/test/service/src/cli.rs b/cumulus/test/service/src/cli.rs
index 220b0449f339..e019089e70fe 100644
--- a/cumulus/test/service/src/cli.rs
+++ b/cumulus/test/service/src/cli.rs
@@ -262,10 +262,16 @@ impl SubstrateCli for TestCollatorCli {
 				tracing::info!("Using default test service chain spec.");
 				Box::new(cumulus_test_service::get_chain_spec(Some(ParaId::from(2000)))) as Box<_>
 			},
+			"elastic-scaling-mvp" => {
+				tracing::info!("Using elastic-scaling mvp chain spec.");
+				Box::new(cumulus_test_service::get_elastic_scaling_mvp_chain_spec(Some(
+					ParaId::from(2100),
+				))) as Box<_>
+			},
 			"elastic-scaling" => {
 				tracing::info!("Using elastic-scaling chain spec.");
 				Box::new(cumulus_test_service::get_elastic_scaling_chain_spec(Some(ParaId::from(
-					2100,
+					2200,
 				)))) as Box<_>
 			},
 			path => {
diff --git a/cumulus/xcm/xcm-emulator/Cargo.toml b/cumulus/xcm/xcm-emulator/Cargo.toml
index d0c637d64d01..ae8cb79bb55e 100644
--- a/cumulus/xcm/xcm-emulator/Cargo.toml
+++ b/cumulus/xcm/xcm-emulator/Cargo.toml
@@ -12,36 +12,36 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+array-bytes = { workspace = true }
 codec = { workspace = true, default-features = true }
-paste = { workspace = true, default-features = true }
-log = { workspace = true }
 impl-trait-for-tuples = { workspace = true }
-array-bytes = { workspace = true }
+log = { workspace = true }
+paste = { workspace = true, default-features = true }
 
 # Substrate
 frame-support = { workspace = true, default-features = true }
 frame-system = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
+pallet-message-queue = { workspace = true, default-features = true }
+sp-arithmetic = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
-sp-std = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-arithmetic = { workspace = true, default-features = true }
+sp-std = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
-pallet-balances = { workspace = true, default-features = true }
-pallet-message-queue = { workspace = true, default-features = true }
 
 # Cumulus
-cumulus-primitives-core = { workspace = true, default-features = true }
-cumulus-pallet-xcmp-queue = { workspace = true, default-features = true }
 cumulus-pallet-parachain-system = { workspace = true, default-features = true }
+cumulus-pallet-xcmp-queue = { workspace = true, default-features = true }
+cumulus-primitives-core = { workspace = true, default-features = true }
 cumulus-primitives-parachain-inherent = { workspace = true, default-features = true }
 cumulus-test-relay-sproof-builder = { workspace = true, default-features = true }
 parachains-common = { workspace = true, default-features = true }
 
 # Polkadot
-xcm = { workspace = true, default-features = true }
-xcm-executor = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 polkadot-runtime-parachains = { workspace = true, default-features = true }
+xcm = { workspace = true, default-features = true }
+xcm-executor = { workspace = true, default-features = true }
diff --git a/docs/sdk/Cargo.toml b/docs/sdk/Cargo.toml
index 0e4a5c001382..a856e94f42b5 100644
--- a/docs/sdk/Cargo.toml
+++ b/docs/sdk/Cargo.toml
@@ -16,112 +16,112 @@ workspace = true
 [dependencies]
 # Needed for all FRAME-based code
 codec = { workspace = true }
-scale-info = { workspace = true }
 frame = { features = [
 	"experimental",
 	"runtime",
 ], workspace = true, default-features = true }
-pallet-examples = { workspace = true }
 pallet-contracts = { workspace = true }
 pallet-default-config-example = { workspace = true, default-features = true }
 pallet-example-offchain-worker = { workspace = true, default-features = true }
+pallet-examples = { workspace = true }
+scale-info = { workspace = true }
 
 # How we build docs in rust-docs
-simple-mermaid = "0.1.1"
 docify = { workspace = true }
 serde_json = { workspace = true }
+simple-mermaid = "0.1.1"
 
 # Polkadot SDK deps, typically all should only be in scope such that we can link to their doc item.
-polkadot-sdk = { features = ["runtime-full"], workspace = true, default-features = true }
-node-cli = { workspace = true }
-kitchensink-runtime = { workspace = true }
 chain-spec-builder = { workspace = true, default-features = true }
-subkey = { workspace = true, default-features = true }
-frame-system = { workspace = true }
-frame-support = { workspace = true }
-frame-executive = { workspace = true }
 frame-benchmarking = { workspace = true }
-pallet-example-authorization-tx-extension = { workspace = true, default-features = true }
-pallet-example-single-block-migrations = { workspace = true, default-features = true }
+frame-executive = { workspace = true }
 frame-metadata-hash-extension = { workspace = true, default-features = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
+kitchensink-runtime = { workspace = true }
 log = { workspace = true, default-features = true }
+node-cli = { workspace = true }
+pallet-example-authorization-tx-extension = { workspace = true, default-features = true }
+pallet-example-single-block-migrations = { workspace = true, default-features = true }
+polkadot-sdk = { features = ["runtime-full"], workspace = true, default-features = true }
+subkey = { workspace = true, default-features = true }
 
 # Substrate Client
-sc-network = { workspace = true, default-features = true }
-sc-rpc-api = { workspace = true, default-features = true }
-sc-rpc = { workspace = true, default-features = true }
-sc-client-db = { workspace = true, default-features = true }
+sc-chain-spec = { workspace = true, default-features = true }
 sc-cli = { workspace = true, default-features = true }
+sc-client-db = { workspace = true, default-features = true }
 sc-consensus-aura = { workspace = true, default-features = true }
 sc-consensus-babe = { workspace = true, default-features = true }
-sc-consensus-grandpa = { workspace = true, default-features = true }
 sc-consensus-beefy = { workspace = true, default-features = true }
+sc-consensus-grandpa = { workspace = true, default-features = true }
 sc-consensus-manual-seal = { workspace = true, default-features = true }
 sc-consensus-pow = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
+sc-rpc = { workspace = true, default-features = true }
+sc-rpc-api = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
-sc-chain-spec = { workspace = true, default-features = true }
 
 substrate-wasm-builder = { workspace = true, default-features = true }
 
 # Cumulus
+cumulus-client-service = { workspace = true, default-features = true }
 cumulus-pallet-aura-ext = { workspace = true, default-features = true }
 cumulus-pallet-parachain-system = { workspace = true, default-features = true }
-parachain-info = { workspace = true, default-features = true }
 cumulus-primitives-proof-size-hostfunction = { workspace = true, default-features = true }
-cumulus-client-service = { workspace = true, default-features = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true, default-features = true }
+parachain-info = { workspace = true, default-features = true }
 
 # Omni Node
 polkadot-omni-node-lib = { workspace = true, default-features = true }
 
 # Pallets and FRAME internals
-pallet-aura = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
-pallet-balances = { workspace = true, default-features = true }
-pallet-assets = { workspace = true, default-features = true }
-pallet-preimage = { workspace = true, default-features = true }
-pallet-transaction-payment = { workspace = true, default-features = true }
-pallet-asset-tx-payment = { workspace = true, default-features = true }
-pallet-skip-feeless-payment = { workspace = true, default-features = true }
 pallet-asset-conversion-tx-payment = { workspace = true, default-features = true }
-pallet-utility = { workspace = true, default-features = true }
-pallet-multisig = { workspace = true, default-features = true }
-pallet-proxy = { workspace = true, default-features = true }
+pallet-asset-tx-payment = { workspace = true, default-features = true }
+pallet-assets = { workspace = true, default-features = true }
+pallet-aura = { workspace = true, default-features = true }
 pallet-authorship = { workspace = true, default-features = true }
+pallet-babe = { workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
+pallet-broker = { workspace = true, default-features = true }
 pallet-collective = { workspace = true, default-features = true }
 pallet-democracy = { workspace = true, default-features = true }
-pallet-uniques = { workspace = true, default-features = true }
+pallet-grandpa = { workspace = true, default-features = true }
+pallet-multisig = { workspace = true, default-features = true }
 pallet-nfts = { workspace = true, default-features = true }
-pallet-scheduler = { workspace = true, default-features = true }
+pallet-preimage = { workspace = true, default-features = true }
+pallet-proxy = { workspace = true, default-features = true }
 pallet-referenda = { workspace = true, default-features = true }
-pallet-broker = { workspace = true, default-features = true }
-pallet-babe = { workspace = true, default-features = true }
-pallet-grandpa = { workspace = true, default-features = true }
+pallet-scheduler = { workspace = true, default-features = true }
+pallet-skip-feeless-payment = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
+pallet-transaction-payment = { workspace = true, default-features = true }
+pallet-uniques = { workspace = true, default-features = true }
+pallet-utility = { workspace = true, default-features = true }
 
 # Primitives
-sp-io = { workspace = true, default-features = true }
-sp-std = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
-sp-runtime-interface = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
 sp-arithmetic = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-genesis-builder = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 sp-offchain = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-runtime-interface = { workspace = true, default-features = true }
+sp-std = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
 sp-weights = { workspace = true, default-features = true }
 
 
 # XCM
+pallet-xcm = { workspace = true }
 xcm = { workspace = true, default-features = true }
 xcm-builder = { workspace = true }
 xcm-docs = { workspace = true }
 xcm-executor = { workspace = true }
 xcm-simulator = { workspace = true }
-pallet-xcm = { workspace = true }
 
 # runtime guides
 
@@ -129,12 +129,12 @@ chain-spec-guide-runtime = { workspace = true, default-features = true }
 
 # Templates
 minimal-template-runtime = { workspace = true, default-features = true }
-solochain-template-runtime = { workspace = true, default-features = true }
 parachain-template-runtime = { workspace = true, default-features = true }
+solochain-template-runtime = { workspace = true, default-features = true }
 
 # local packages
-first-runtime = { workspace = true, default-features = true }
 first-pallet = { workspace = true, default-features = true }
+first-runtime = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_cmd = "2.0.14"
diff --git a/docs/sdk/packages/guides/first-pallet/Cargo.toml b/docs/sdk/packages/guides/first-pallet/Cargo.toml
index dad5b8863494..a1411580119d 100644
--- a/docs/sdk/packages/guides/first-pallet/Cargo.toml
+++ b/docs/sdk/packages/guides/first-pallet/Cargo.toml
@@ -17,9 +17,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { workspace = true }
-frame = { workspace = true, features = ["experimental", "runtime"] }
 docify = { workspace = true }
+frame = { workspace = true, features = ["experimental", "runtime"] }
+scale-info = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/docs/sdk/src/reference_docs/chain_spec_runtime/Cargo.toml b/docs/sdk/src/reference_docs/chain_spec_runtime/Cargo.toml
index 307e2daa38c6..925cb7bb2e65 100644
--- a/docs/sdk/src/reference_docs/chain_spec_runtime/Cargo.toml
+++ b/docs/sdk/src/reference_docs/chain_spec_runtime/Cargo.toml
@@ -10,8 +10,8 @@ edition.workspace = true
 publish = false
 
 [dependencies]
-docify = { workspace = true }
 codec = { workspace = true }
+docify = { workspace = true }
 frame-support = { workspace = true }
 scale-info = { workspace = true }
 serde = { workspace = true }
@@ -31,11 +31,11 @@ pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 
 # genesis builder that allows us to interact with runtime genesis config
-sp-genesis-builder = { workspace = true }
-sp-runtime = { features = ["serde"], workspace = true }
+sp-application-crypto = { features = ["serde"], workspace = true }
 sp-core = { workspace = true }
+sp-genesis-builder = { workspace = true }
 sp-keyring = { workspace = true }
-sp-application-crypto = { features = ["serde"], workspace = true }
+sp-runtime = { features = ["serde"], workspace = true }
 
 [build-dependencies]
 substrate-wasm-builder = { optional = true, workspace = true, default-features = true }
diff --git a/polkadot/Cargo.toml b/polkadot/Cargo.toml
index 101caac0e313..ded8157ad90e 100644
--- a/polkadot/Cargo.toml
+++ b/polkadot/Cargo.toml
@@ -46,10 +46,10 @@ tikv-jemallocator = { version = "0.5.0", features = ["unprefixed_malloc_on_suppo
 [dev-dependencies]
 assert_cmd = { workspace = true }
 nix = { features = ["signal"], workspace = true }
+polkadot-core-primitives = { workspace = true, default-features = true }
+substrate-rpc-client = { workspace = true, default-features = true }
 tempfile = { workspace = true }
 tokio = { workspace = true, default-features = true }
-substrate-rpc-client = { workspace = true, default-features = true }
-polkadot-core-primitives = { workspace = true, default-features = true }
 
 [build-dependencies]
 substrate-build-script-utils = { workspace = true, default-features = true }
diff --git a/polkadot/cli/Cargo.toml b/polkadot/cli/Cargo.toml
index 3eff525b7b1e..6909d142b3a6 100644
--- a/polkadot/cli/Cargo.toml
+++ b/polkadot/cli/Cargo.toml
@@ -22,27 +22,27 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 cfg-if = { workspace = true }
 clap = { features = ["derive"], optional = true, workspace = true }
-log = { workspace = true, default-features = true }
-thiserror = { workspace = true }
 futures = { workspace = true }
+log = { workspace = true, default-features = true }
 pyroscope = { optional = true, workspace = true }
 pyroscope_pprofrs = { optional = true, workspace = true }
+thiserror = { workspace = true }
 
 polkadot-service = { optional = true, workspace = true }
 
-sp-core = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-sp-maybe-compressed-blob = { workspace = true, default-features = true }
 frame-benchmarking-cli = { optional = true, workspace = true, default-features = true }
-sc-cli = { optional = true, workspace = true, default-features = true }
-sc-service = { optional = true, workspace = true, default-features = true }
 polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
-sc-tracing = { optional = true, workspace = true, default-features = true }
-sc-sysinfo = { workspace = true, default-features = true }
+sc-cli = { optional = true, workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
+sc-service = { optional = true, workspace = true, default-features = true }
 sc-storage-monitor = { workspace = true, default-features = true }
+sc-sysinfo = { workspace = true, default-features = true }
+sc-tracing = { optional = true, workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-maybe-compressed-blob = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 
 [build-dependencies]
diff --git a/polkadot/core-primitives/Cargo.toml b/polkadot/core-primitives/Cargo.toml
index 33869f216f78..1fb14e9d58e7 100644
--- a/polkadot/core-primitives/Cargo.toml
+++ b/polkadot/core-primitives/Cargo.toml
@@ -12,10 +12,10 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+codec = { features = ["derive"], workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-codec = { features = ["derive"], workspace = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/erasure-coding/Cargo.toml b/polkadot/erasure-coding/Cargo.toml
index 528b955c4db3..ba712a89613b 100644
--- a/polkadot/erasure-coding/Cargo.toml
+++ b/polkadot/erasure-coding/Cargo.toml
@@ -12,17 +12,17 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-polkadot-primitives = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
-novelpoly = { workspace = true }
 codec = { features = ["derive", "std"], workspace = true }
+novelpoly = { workspace = true }
+polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-trie = { workspace = true, default-features = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
-quickcheck = { workspace = true }
 criterion = { features = ["cargo_bench_support"], workspace = true }
+quickcheck = { workspace = true }
 
 [[bench]]
 name = "scaling_with_validators"
diff --git a/polkadot/erasure-coding/fuzzer/Cargo.toml b/polkadot/erasure-coding/fuzzer/Cargo.toml
index 6f451f0319b2..5f1c2bda4058 100644
--- a/polkadot/erasure-coding/fuzzer/Cargo.toml
+++ b/polkadot/erasure-coding/fuzzer/Cargo.toml
@@ -10,10 +10,10 @@ publish = false
 workspace = true
 
 [dependencies]
-polkadot-erasure-coding = { workspace = true, default-features = true }
 honggfuzz = { workspace = true }
-polkadot-primitives = { workspace = true, default-features = true }
+polkadot-erasure-coding = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
 [[bin]]
 name = "reconstruct"
diff --git a/polkadot/node/collation-generation/Cargo.toml b/polkadot/node/collation-generation/Cargo.toml
index c1716e2e6eb8..eb9568cc22bc 100644
--- a/polkadot/node/collation-generation/Cargo.toml
+++ b/polkadot/node/collation-generation/Cargo.toml
@@ -12,6 +12,7 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+codec = { features = ["bit-vec", "derive"], workspace = true }
 futures = { workspace = true }
 gum = { workspace = true, default-features = true }
 polkadot-erasure-coding = { workspace = true, default-features = true }
@@ -19,16 +20,15 @@ polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
+schnellru = { workspace = true }
 sp-core = { workspace = true, default-features = true }
 sp-maybe-compressed-blob = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-codec = { features = ["bit-vec", "derive"], workspace = true }
-schnellru = { workspace = true }
 
 [dev-dependencies]
+assert_matches = { workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
+polkadot-primitives = { workspace = true, features = ["test"] }
 polkadot-primitives-test-helpers = { workspace = true }
-assert_matches = { workspace = true }
 rstest = { workspace = true }
 sp-keyring = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, features = ["test"] }
diff --git a/polkadot/node/core/approval-voting-parallel/Cargo.toml b/polkadot/node/core/approval-voting-parallel/Cargo.toml
index 995687fb4c11..a3b3e97da497 100644
--- a/polkadot/node/core/approval-voting-parallel/Cargo.toml
+++ b/polkadot/node/core/approval-voting-parallel/Cargo.toml
@@ -19,38 +19,38 @@ gum = { workspace = true }
 itertools = { workspace = true }
 thiserror = { workspace = true }
 
-polkadot-node-core-approval-voting = { workspace = true, default-features = true }
 polkadot-approval-distribution = { workspace = true, default-features = true }
+polkadot-node-core-approval-voting = { workspace = true, default-features = true }
+polkadot-node-metrics = { workspace = true, default-features = true }
+polkadot-node-network-protocol = { workspace = true, default-features = true }
+polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
-polkadot-node-network-protocol = { workspace = true, default-features = true }
-polkadot-node-metrics = { workspace = true, default-features = true }
 
 sc-keystore = { workspace = true, default-features = false }
+sp-application-crypto = { workspace = true, default-features = false, features = ["full_crypto"] }
 sp-consensus = { workspace = true, default-features = false }
 sp-consensus-slots = { workspace = true, default-features = false }
-sp-application-crypto = { workspace = true, default-features = false, features = ["full_crypto"] }
 sp-runtime = { workspace = true, default-features = false }
 
 rand = { workspace = true }
-rand_core = { workspace = true }
 rand_chacha = { workspace = true }
+rand_core = { workspace = true }
 
 [dev-dependencies]
+assert_matches = { workspace = true }
 async-trait = { workspace = true }
+kvdb-memorydb = { workspace = true }
+log = { workspace = true, default-features = true }
 parking_lot = { workspace = true }
-sp-keyring = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-consensus-babe = { workspace = true, default-features = true }
-sp-tracing = { workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true, default-features = true }
-assert_matches = { workspace = true }
-kvdb-memorydb = { workspace = true }
 polkadot-primitives-test-helpers = { workspace = true, default-features = true }
-log = { workspace = true, default-features = true }
 polkadot-subsystem-bench = { workspace = true, default-features = true }
 schnorrkel = { workspace = true, default-features = true }
+sp-consensus-babe = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
+sp-tracing = { workspace = true }
diff --git a/polkadot/node/core/approval-voting/Cargo.toml b/polkadot/node/core/approval-voting/Cargo.toml
index 80f5dcb7f318..2c292ba5efcb 100644
--- a/polkadot/node/core/approval-voting/Cargo.toml
+++ b/polkadot/node/core/approval-voting/Cargo.toml
@@ -12,50 +12,50 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+async-trait = { workspace = true }
+bitvec = { features = ["alloc"], workspace = true }
+codec = { features = ["bit-vec", "derive"], workspace = true }
+derive_more = { workspace = true, default-features = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
-codec = { features = ["bit-vec", "derive"], workspace = true }
 gum = { workspace = true, default-features = true }
-bitvec = { features = ["alloc"], workspace = true }
-schnellru = { workspace = true }
+itertools = { workspace = true }
+kvdb = { workspace = true }
 merlin = { workspace = true, default-features = true }
+schnellru = { workspace = true }
 schnorrkel = { workspace = true, default-features = true }
-kvdb = { workspace = true }
-derive_more = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-itertools = { workspace = true }
-async-trait = { workspace = true }
 
+polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
 
 sc-keystore = { workspace = true }
+sp-application-crypto = { features = ["full_crypto"], workspace = true }
 sp-consensus = { workspace = true }
 sp-consensus-slots = { workspace = true }
-sp-application-crypto = { features = ["full_crypto"], workspace = true }
 sp-runtime = { workspace = true }
 # rand_core should match schnorrkel
-rand_core = { workspace = true }
-rand_chacha = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
+rand_chacha = { workspace = true, default-features = true }
+rand_core = { workspace = true }
 
 [dev-dependencies]
+assert_matches = { workspace = true }
 async-trait = { workspace = true }
+kvdb-memorydb = { workspace = true }
+log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-consensus-babe = { workspace = true, default-features = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
-assert_matches = { workspace = true }
-kvdb-memorydb = { workspace = true }
+polkadot-primitives = { workspace = true, features = ["test"] }
 polkadot-primitives-test-helpers = { workspace = true }
-log = { workspace = true, default-features = true }
+sp-consensus-babe = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
 sp-tracing = { workspace = true }
-polkadot-primitives = { workspace = true, features = ["test"] }
 
 polkadot-subsystem-bench = { workspace = true }
 
diff --git a/polkadot/node/core/av-store/Cargo.toml b/polkadot/node/core/av-store/Cargo.toml
index 9f6864269cef..f3bd1f09caea 100644
--- a/polkadot/node/core/av-store/Cargo.toml
+++ b/polkadot/node/core/av-store/Cargo.toml
@@ -12,31 +12,31 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+bitvec = { workspace = true, default-features = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
+gum = { workspace = true, default-features = true }
 kvdb = { workspace = true }
 thiserror = { workspace = true }
-gum = { workspace = true, default-features = true }
-bitvec = { workspace = true, default-features = true }
 
 codec = { features = ["derive"], workspace = true, default-features = true }
 polkadot-erasure-coding = { workspace = true, default-features = true }
+polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
 sp-consensus = { workspace = true }
 
 [dev-dependencies]
-log = { workspace = true, default-features = true }
 assert_matches = { workspace = true }
 kvdb-memorydb = { workspace = true }
+log = { workspace = true, default-features = true }
 sp-tracing = { workspace = true }
 
-sp-core = { workspace = true, default-features = true }
-polkadot-node-subsystem-util = { workspace = true, default-features = true }
-polkadot-node-subsystem-test-helpers = { workspace = true }
-sp-keyring = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
+polkadot-node-subsystem-test-helpers = { workspace = true }
+polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-primitives-test-helpers = { workspace = true }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
diff --git a/polkadot/node/core/backing/Cargo.toml b/polkadot/node/core/backing/Cargo.toml
index a81fe9486c63..be829a84ee6e 100644
--- a/polkadot/node/core/backing/Cargo.toml
+++ b/polkadot/node/core/backing/Cargo.toml
@@ -12,30 +12,30 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+bitvec = { features = ["alloc"], workspace = true }
+fatality = { workspace = true }
 futures = { workspace = true }
-sp-keystore = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
+gum = { workspace = true, default-features = true }
+polkadot-erasure-coding = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
-polkadot-parachain-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
-polkadot-erasure-coding = { workspace = true, default-features = true }
+polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 polkadot-statement-table = { workspace = true, default-features = true }
-bitvec = { features = ["alloc"], workspace = true }
-gum = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-fatality = { workspace = true }
 schnellru = { workspace = true }
+sp-keystore = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
-sp-core = { workspace = true, default-features = true }
-sp-application-crypto = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-sc-keystore = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
-futures = { features = ["thread-pool"], workspace = true }
 assert_matches = { workspace = true }
-rstest = { workspace = true }
+futures = { features = ["thread-pool"], workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
-polkadot-primitives-test-helpers = { workspace = true }
 polkadot-primitives = { workspace = true, features = ["test"] }
+polkadot-primitives-test-helpers = { workspace = true }
+rstest = { workspace = true }
+sc-keystore = { workspace = true, default-features = true }
+sp-application-crypto = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
diff --git a/polkadot/node/core/bitfield-signing/Cargo.toml b/polkadot/node/core/bitfield-signing/Cargo.toml
index f00ba5712661..e75404729dbd 100644
--- a/polkadot/node/core/bitfield-signing/Cargo.toml
+++ b/polkadot/node/core/bitfield-signing/Cargo.toml
@@ -14,12 +14,12 @@ workspace = true
 [dependencies]
 futures = { workspace = true }
 gum = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
-wasm-timer = { workspace = true }
 thiserror = { workspace = true }
+wasm-timer = { workspace = true }
 
 [dev-dependencies]
 polkadot-node-subsystem-test-helpers = { workspace = true }
diff --git a/polkadot/node/core/candidate-validation/Cargo.toml b/polkadot/node/core/candidate-validation/Cargo.toml
index fea16b1c7604..e92976609f9e 100644
--- a/polkadot/node/core/candidate-validation/Cargo.toml
+++ b/polkadot/node/core/candidate-validation/Cargo.toml
@@ -17,28 +17,28 @@ futures = { workspace = true }
 futures-timer = { workspace = true }
 gum = { workspace = true, default-features = true }
 
-sp-keystore = { workspace = true }
-sp-application-crypto = { workspace = true }
 codec = { features = ["bit-vec", "derive"], workspace = true }
+sp-application-crypto = { workspace = true }
+sp-keystore = { workspace = true }
 
-polkadot-primitives = { workspace = true, default-features = true }
-polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
-polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
+polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
 [target.'cfg(not(any(target_os = "android", target_os = "unknown")))'.dependencies]
 polkadot-node-core-pvf = { workspace = true, default-features = true }
 
 [dev-dependencies]
-sp-keyring = { workspace = true, default-features = true }
-futures = { features = ["thread-pool"], workspace = true }
 assert_matches = { workspace = true }
+futures = { features = ["thread-pool"], workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
-sp-maybe-compressed-blob = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, features = ["test"] }
 polkadot-primitives-test-helpers = { workspace = true }
 rstest = { workspace = true }
-polkadot-primitives = { workspace = true, features = ["test"] }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-maybe-compressed-blob = { workspace = true, default-features = true }
diff --git a/polkadot/node/core/chain-api/Cargo.toml b/polkadot/node/core/chain-api/Cargo.toml
index 0f443868dada..0689a41233c7 100644
--- a/polkadot/node/core/chain-api/Cargo.toml
+++ b/polkadot/node/core/chain-api/Cargo.toml
@@ -21,11 +21,11 @@ sc-client-api = { workspace = true, default-features = true }
 sc-consensus-babe = { workspace = true, default-features = true }
 
 [dev-dependencies]
+codec = { workspace = true, default-features = true }
 futures = { features = ["thread-pool"], workspace = true }
 maplit = { workspace = true }
-codec = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
-sp-core = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
diff --git a/polkadot/node/core/chain-selection/Cargo.toml b/polkadot/node/core/chain-selection/Cargo.toml
index d2cc425a4816..e425b9f862a5 100644
--- a/polkadot/node/core/chain-selection/Cargo.toml
+++ b/polkadot/node/core/chain-selection/Cargo.toml
@@ -12,20 +12,20 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+codec = { workspace = true, default-features = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 gum = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
+kvdb = { workspace = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
-kvdb = { workspace = true }
+polkadot-primitives = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-codec = { workspace = true, default-features = true }
 
 [dev-dependencies]
-polkadot-node-subsystem-test-helpers = { workspace = true }
-sp-core = { workspace = true, default-features = true }
-parking_lot = { workspace = true, default-features = true }
 assert_matches = { workspace = true }
 kvdb-memorydb = { workspace = true }
+parking_lot = { workspace = true, default-features = true }
+polkadot-node-subsystem-test-helpers = { workspace = true }
+sp-core = { workspace = true, default-features = true }
diff --git a/polkadot/node/core/dispute-coordinator/Cargo.toml b/polkadot/node/core/dispute-coordinator/Cargo.toml
index 11b4ac645c23..6eb3020a0432 100644
--- a/polkadot/node/core/dispute-coordinator/Cargo.toml
+++ b/polkadot/node/core/dispute-coordinator/Cargo.toml
@@ -12,34 +12,34 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+codec = { workspace = true, default-features = true }
+fatality = { workspace = true }
 futures = { workspace = true }
 gum = { workspace = true, default-features = true }
-codec = { workspace = true, default-features = true }
 kvdb = { workspace = true }
-thiserror = { workspace = true }
 schnellru = { workspace = true }
-fatality = { workspace = true }
+thiserror = { workspace = true }
 
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
 sc-keystore = { workspace = true, default-features = true }
 
 
 [dev-dependencies]
+assert_matches = { workspace = true }
+futures-timer = { workspace = true }
 kvdb-memorydb = { workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
-sp-keyring = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-assert_matches = { workspace = true }
+polkadot-primitives = { workspace = true, features = ["test"] }
 polkadot-primitives-test-helpers = { workspace = true }
-futures-timer = { workspace = true }
 sp-application-crypto = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, features = ["test"] }
 
 [features]
 # If not enabled, the dispute coordinator will do nothing.
diff --git a/polkadot/node/core/parachains-inherent/Cargo.toml b/polkadot/node/core/parachains-inherent/Cargo.toml
index b1cd5e971b00..264b8da2b44d 100644
--- a/polkadot/node/core/parachains-inherent/Cargo.toml
+++ b/polkadot/node/core/parachains-inherent/Cargo.toml
@@ -12,13 +12,13 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+async-trait = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 gum = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-async-trait = { workspace = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
+thiserror = { workspace = true }
diff --git a/polkadot/node/core/prospective-parachains/Cargo.toml b/polkadot/node/core/prospective-parachains/Cargo.toml
index ced6c30c64b6..0d0ede8d1d9b 100644
--- a/polkadot/node/core/prospective-parachains/Cargo.toml
+++ b/polkadot/node/core/prospective-parachains/Cargo.toml
@@ -12,21 +12,21 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+fatality = { workspace = true }
 futures = { workspace = true }
 gum = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-fatality = { workspace = true }
 
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
-polkadot-primitives-test-helpers = { workspace = true }
 polkadot-primitives = { workspace = true, features = ["test"] }
-sp-tracing = { workspace = true }
-sp-core = { workspace = true, default-features = true }
+polkadot-primitives-test-helpers = { workspace = true }
 rand = { workspace = true }
 rstest = { workspace = true }
+sp-core = { workspace = true, default-features = true }
+sp-tracing = { workspace = true }
diff --git a/polkadot/node/core/provisioner/Cargo.toml b/polkadot/node/core/provisioner/Cargo.toml
index 26dca1adbc79..a3880d5a0f13 100644
--- a/polkadot/node/core/provisioner/Cargo.toml
+++ b/polkadot/node/core/provisioner/Cargo.toml
@@ -13,22 +13,22 @@ workspace = true
 
 [dependencies]
 bitvec = { features = ["alloc"], workspace = true }
+fatality = { workspace = true }
 futures = { workspace = true }
+futures-timer = { workspace = true }
 gum = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
-futures-timer = { workspace = true }
-fatality = { workspace = true }
+polkadot-primitives = { workspace = true, default-features = true }
 schnellru = { workspace = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
-sp-application-crypto = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
-polkadot-primitives-test-helpers = { workspace = true }
 polkadot-primitives = { workspace = true, features = ["test"] }
+polkadot-primitives-test-helpers = { workspace = true }
+sp-application-crypto = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
 
 rstest = { workspace = true }
diff --git a/polkadot/node/core/pvf-checker/Cargo.toml b/polkadot/node/core/pvf-checker/Cargo.toml
index cb7e3eadcf0a..fac5f85b6b56 100644
--- a/polkadot/node/core/pvf-checker/Cargo.toml
+++ b/polkadot/node/core/pvf-checker/Cargo.toml
@@ -13,23 +13,23 @@ workspace = true
 
 [dependencies]
 futures = { workspace = true }
-thiserror = { workspace = true }
 gum = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
 sp-keystore = { workspace = true, default-features = true }
 
 [dev-dependencies]
-sp-core = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
-sc-keystore = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
+futures-timer = { workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-primitives-test-helpers = { workspace = true }
+sc-keystore = { workspace = true, default-features = true }
 sp-application-crypto = { workspace = true, default-features = true }
-futures-timer = { workspace = true }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
diff --git a/polkadot/node/core/pvf/Cargo.toml b/polkadot/node/core/pvf/Cargo.toml
index 1b2a16ae8b55..f47f7b734285 100644
--- a/polkadot/node/core/pvf/Cargo.toml
+++ b/polkadot/node/core/pvf/Cargo.toml
@@ -23,28 +23,28 @@ is_executable = { optional = true, workspace = true }
 pin-project = { workspace = true }
 rand = { workspace = true, default-features = true }
 slotmap = { workspace = true }
+strum = { features = ["derive"], workspace = true, default-features = true }
 tempfile = { workspace = true }
 thiserror = { workspace = true }
 tokio = { features = ["fs", "process"], workspace = true, default-features = true }
-strum = { features = ["derive"], workspace = true, default-features = true }
 
 codec = { features = [
 	"derive",
 ], workspace = true }
 
-polkadot-parachain-primitives = { workspace = true, default-features = true }
 polkadot-core-primitives = { workspace = true, default-features = true }
 polkadot-node-core-pvf-common = { workspace = true, default-features = true }
 polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
+polkadot-parachain-primitives = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
 
+polkadot-node-core-pvf-execute-worker = { optional = true, workspace = true, default-features = true }
+polkadot-node-core-pvf-prepare-worker = { optional = true, workspace = true, default-features = true }
 sc-tracing = { workspace = true }
 sp-core = { workspace = true, default-features = true }
 sp-maybe-compressed-blob = { optional = true, workspace = true, default-features = true }
-polkadot-node-core-pvf-prepare-worker = { optional = true, workspace = true, default-features = true }
-polkadot-node-core-pvf-execute-worker = { optional = true, workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
diff --git a/polkadot/node/core/pvf/execute-worker/Cargo.toml b/polkadot/node/core/pvf/execute-worker/Cargo.toml
index 8327cf8058cd..4df425dfd199 100644
--- a/polkadot/node/core/pvf/execute-worker/Cargo.toml
+++ b/polkadot/node/core/pvf/execute-worker/Cargo.toml
@@ -12,11 +12,11 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+cfg-if = { workspace = true }
 cpu-time = { workspace = true }
 gum = { workspace = true, default-features = true }
-cfg-if = { workspace = true }
-nix = { features = ["process", "resource", "sched"], workspace = true }
 libc = { workspace = true }
+nix = { features = ["process", "resource", "sched"], workspace = true }
 
 codec = { features = ["derive"], workspace = true }
 
diff --git a/polkadot/node/core/pvf/prepare-worker/Cargo.toml b/polkadot/node/core/pvf/prepare-worker/Cargo.toml
index 9dc800a8ef56..aa551c196c37 100644
--- a/polkadot/node/core/pvf/prepare-worker/Cargo.toml
+++ b/polkadot/node/core/pvf/prepare-worker/Cargo.toml
@@ -16,11 +16,11 @@ blake3 = { workspace = true }
 cfg-if = { workspace = true }
 gum = { workspace = true, default-features = true }
 libc = { workspace = true }
+nix = { features = ["process", "resource", "sched"], workspace = true }
 rayon = { workspace = true }
-tracking-allocator = { workspace = true, default-features = true }
 tikv-jemalloc-ctl = { optional = true, workspace = true }
 tikv-jemallocator = { optional = true, workspace = true }
-nix = { features = ["process", "resource", "sched"], workspace = true }
+tracking-allocator = { workspace = true, default-features = true }
 
 codec = { features = ["derive"], workspace = true }
 
diff --git a/polkadot/node/core/runtime-api/Cargo.toml b/polkadot/node/core/runtime-api/Cargo.toml
index 15cbf4665d06..65c92dc5c070 100644
--- a/polkadot/node/core/runtime-api/Cargo.toml
+++ b/polkadot/node/core/runtime-api/Cargo.toml
@@ -18,17 +18,17 @@ schnellru = { workspace = true }
 
 sp-consensus-babe = { workspace = true, default-features = true }
 
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-types = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
 [dev-dependencies]
-sp-api = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
 async-trait = { workspace = true }
 futures = { features = ["thread-pool"], workspace = true }
-polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-primitives-test-helpers = { workspace = true }
+sp-api = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
diff --git a/polkadot/node/gum/Cargo.toml b/polkadot/node/gum/Cargo.toml
index 84875ea121b6..f4c22dd7595e 100644
--- a/polkadot/node/gum/Cargo.toml
+++ b/polkadot/node/gum/Cargo.toml
@@ -13,6 +13,6 @@ workspace = true
 
 [dependencies]
 coarsetime = { workspace = true }
-tracing = { workspace = true, default-features = true }
 gum-proc-macro = { workspace = true, default-features = true }
 polkadot-primitives = { features = ["std"], workspace = true, default-features = true }
+tracing = { workspace = true, default-features = true }
diff --git a/polkadot/node/gum/proc-macro/Cargo.toml b/polkadot/node/gum/proc-macro/Cargo.toml
index b4a3401b15e4..0b69d8b67cf1 100644
--- a/polkadot/node/gum/proc-macro/Cargo.toml
+++ b/polkadot/node/gum/proc-macro/Cargo.toml
@@ -18,11 +18,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-syn = { features = ["extra-traits", "full"], workspace = true }
-quote = { workspace = true }
-proc-macro2 = { workspace = true }
-proc-macro-crate = { workspace = true }
 expander = { workspace = true }
+proc-macro-crate = { workspace = true }
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
+syn = { features = ["extra-traits", "full"], workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
diff --git a/polkadot/node/malus/Cargo.toml b/polkadot/node/malus/Cargo.toml
index 49434606a61c..84a58f382e20 100644
--- a/polkadot/node/malus/Cargo.toml
+++ b/polkadot/node/malus/Cargo.toml
@@ -29,27 +29,27 @@ path = "../../src/bin/prepare-worker.rs"
 doc = false
 
 [dependencies]
-polkadot-cli = { features = ["malus", "rococo-native", "westend-native"], workspace = true, default-features = true }
-polkadot-node-subsystem = { workspace = true, default-features = true }
-polkadot-node-subsystem-util = { workspace = true, default-features = true }
-polkadot-node-subsystem-types = { workspace = true, default-features = true }
-polkadot-node-core-dispute-coordinator = { workspace = true, default-features = true }
-polkadot-node-core-candidate-validation = { workspace = true, default-features = true }
-polkadot-node-core-backing = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
-polkadot-node-network-protocol = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
-color-eyre = { workspace = true }
 assert_matches = { workspace = true }
 async-trait = { workspace = true }
-sp-keystore = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
 clap = { features = ["derive"], workspace = true }
+color-eyre = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 gum = { workspace = true, default-features = true }
+polkadot-cli = { features = ["malus", "rococo-native", "westend-native"], workspace = true, default-features = true }
 polkadot-erasure-coding = { workspace = true, default-features = true }
+polkadot-node-core-backing = { workspace = true, default-features = true }
+polkadot-node-core-candidate-validation = { workspace = true, default-features = true }
+polkadot-node-core-dispute-coordinator = { workspace = true, default-features = true }
+polkadot-node-network-protocol = { workspace = true, default-features = true }
+polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-node-subsystem = { workspace = true, default-features = true }
+polkadot-node-subsystem-types = { workspace = true, default-features = true }
+polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
 
 # Required for worker binaries to build.
 polkadot-node-core-pvf-common = { workspace = true, default-features = true }
@@ -57,9 +57,9 @@ polkadot-node-core-pvf-execute-worker = { workspace = true, default-features = t
 polkadot-node-core-pvf-prepare-worker = { workspace = true, default-features = true }
 
 [dev-dependencies]
+futures = { features = ["thread-pool"], workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
 sp-core = { workspace = true, default-features = true }
-futures = { features = ["thread-pool"], workspace = true }
 
 [build-dependencies]
 substrate-build-script-utils = { workspace = true, default-features = true }
diff --git a/polkadot/node/metrics/Cargo.toml b/polkadot/node/metrics/Cargo.toml
index 05344993a75e..454337cb63f8 100644
--- a/polkadot/node/metrics/Cargo.toml
+++ b/polkadot/node/metrics/Cargo.toml
@@ -18,28 +18,28 @@ gum = { workspace = true, default-features = true }
 
 metered = { features = ["futures_channel"], workspace = true }
 # Both `sc-service` and `sc-cli` are required by runtime metrics `logger_hook()`.
-sc-service = { workspace = true, default-features = true }
 sc-cli = { workspace = true, default-features = true }
+sc-service = { workspace = true, default-features = true }
 
-prometheus-endpoint = { workspace = true, default-features = true }
-sc-tracing = { workspace = true, default-features = true }
-codec = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 bs58 = { features = ["alloc"], workspace = true, default-features = true }
+codec = { workspace = true, default-features = true }
 log = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
+prometheus-endpoint = { workspace = true, default-features = true }
+sc-tracing = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_cmd = { workspace = true }
-tempfile = { workspace = true }
-hyper-util = { features = ["client-legacy", "tokio"], workspace = true }
-hyper = { workspace = true }
 http-body-util = { workspace = true }
-tokio = { workspace = true, default-features = true }
+hyper = { workspace = true }
+hyper-util = { features = ["client-legacy", "tokio"], workspace = true }
 polkadot-test-service = { features = ["runtime-metrics"], workspace = true }
-substrate-test-utils = { workspace = true }
+prometheus-parse = { workspace = true }
 sc-service = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
-prometheus-parse = { workspace = true }
+substrate-test-utils = { workspace = true }
+tempfile = { workspace = true }
+tokio = { workspace = true, default-features = true }
 
 [features]
 default = []
diff --git a/polkadot/node/network/approval-distribution/Cargo.toml b/polkadot/node/network/approval-distribution/Cargo.toml
index abf345552f89..d9d3fd8635a6 100644
--- a/polkadot/node/network/approval-distribution/Cargo.toml
+++ b/polkadot/node/network/approval-distribution/Cargo.toml
@@ -12,6 +12,7 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+itertools = { workspace = true }
 polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
@@ -19,12 +20,11 @@ polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
-itertools = { workspace = true }
 
+bitvec = { features = ["alloc"], workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 gum = { workspace = true, default-features = true }
-bitvec = { features = ["alloc"], workspace = true }
 
 [dev-dependencies]
 sc-keystore = { workspace = true }
@@ -38,7 +38,7 @@ polkadot-primitives-test-helpers = { workspace = true }
 assert_matches = { workspace = true }
 schnorrkel = { workspace = true }
 # rand_core should match schnorrkel
-rand_core = { workspace = true }
+log = { workspace = true, default-features = true }
 rand_chacha = { workspace = true, default-features = true }
+rand_core = { workspace = true }
 sp-tracing = { workspace = true }
-log = { workspace = true, default-features = true }
diff --git a/polkadot/node/network/availability-distribution/Cargo.toml b/polkadot/node/network/availability-distribution/Cargo.toml
index e87103d99f72..7de8cb191599 100644
--- a/polkadot/node/network/availability-distribution/Cargo.toml
+++ b/polkadot/node/network/availability-distribution/Cargo.toml
@@ -12,35 +12,35 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+codec = { features = ["std"], workspace = true, default-features = true }
+derive_more = { workspace = true, default-features = true }
+fatality = { workspace = true }
 futures = { workspace = true }
 gum = { workspace = true, default-features = true }
-codec = { features = ["std"], workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-erasure-coding = { workspace = true, default-features = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
+polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
+rand = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
+schnellru = { workspace = true }
 sp-core = { features = ["std"], workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-rand = { workspace = true, default-features = true }
-derive_more = { workspace = true, default-features = true }
-schnellru = { workspace = true }
-fatality = { workspace = true }
 
 [dev-dependencies]
+assert_matches = { workspace = true }
+futures-timer = { workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
+polkadot-primitives-test-helpers = { workspace = true }
+polkadot-subsystem-bench = { workspace = true }
+rstest = { workspace = true }
+sc-network = { workspace = true, default-features = true }
 sp-core = { features = ["std"], workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
-sc-network = { workspace = true, default-features = true }
-futures-timer = { workspace = true }
-assert_matches = { workspace = true }
-polkadot-primitives-test-helpers = { workspace = true }
-rstest = { workspace = true }
-polkadot-subsystem-bench = { workspace = true }
 
 
 [[bench]]
diff --git a/polkadot/node/network/availability-recovery/Cargo.toml b/polkadot/node/network/availability-recovery/Cargo.toml
index be4323e74f02..8d4e6893b0a5 100644
--- a/polkadot/node/network/availability-recovery/Cargo.toml
+++ b/polkadot/node/network/availability-recovery/Cargo.toml
@@ -12,35 +12,35 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+async-trait = { workspace = true }
+fatality = { workspace = true }
 futures = { workspace = true }
-tokio = { workspace = true, default-features = true }
-schnellru = { workspace = true }
+gum = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
-fatality = { workspace = true }
+schnellru = { workspace = true }
 thiserror = { workspace = true }
-async-trait = { workspace = true }
-gum = { workspace = true, default-features = true }
+tokio = { workspace = true, default-features = true }
 
+codec = { features = ["derive"], workspace = true }
 polkadot-erasure-coding = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
+polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
-polkadot-node-network-protocol = { workspace = true, default-features = true }
-codec = { features = ["derive"], workspace = true }
+polkadot-primitives = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
 futures-timer = { workspace = true }
-rstest = { workspace = true }
 log = { workspace = true, default-features = true }
+rstest = { workspace = true }
 
-sp-tracing = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
+sp-application-crypto = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
-sp-application-crypto = { workspace = true, default-features = true }
-sc-network = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 
 polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-primitives-test-helpers = { workspace = true }
diff --git a/polkadot/node/network/bitfield-distribution/Cargo.toml b/polkadot/node/network/bitfield-distribution/Cargo.toml
index 2ff30489b6c1..74a205276906 100644
--- a/polkadot/node/network/bitfield-distribution/Cargo.toml
+++ b/polkadot/node/network/bitfield-distribution/Cargo.toml
@@ -16,21 +16,21 @@ always-assert = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 gum = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
+polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
-polkadot-node-network-protocol = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
 
 [dev-dependencies]
-polkadot-node-subsystem-test-helpers = { workspace = true }
+assert_matches = { workspace = true }
 bitvec = { features = ["alloc"], workspace = true }
-sp-core = { workspace = true, default-features = true }
+maplit = { workspace = true }
+polkadot-node-subsystem-test-helpers = { workspace = true }
+rand_chacha = { workspace = true, default-features = true }
 sp-application-crypto = { workspace = true, default-features = true }
 sp-authority-discovery = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
-maplit = { workspace = true }
+sp-keystore = { workspace = true, default-features = true }
 sp-tracing = { workspace = true }
-assert_matches = { workspace = true }
-rand_chacha = { workspace = true, default-features = true }
diff --git a/polkadot/node/network/bridge/Cargo.toml b/polkadot/node/network/bridge/Cargo.toml
index c4b46c1dc001..cdc1bc3f6c1b 100644
--- a/polkadot/node/network/bridge/Cargo.toml
+++ b/polkadot/node/network/bridge/Cargo.toml
@@ -14,26 +14,26 @@ workspace = true
 [dependencies]
 always-assert = { workspace = true }
 async-trait = { workspace = true }
+bytes = { workspace = true, default-features = true }
+codec = { features = ["derive"], workspace = true }
+fatality = { workspace = true }
 futures = { workspace = true }
 gum = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
-codec = { features = ["derive"], workspace = true }
-sc-network = { workspace = true, default-features = true }
-sp-consensus = { workspace = true, default-features = true }
+parking_lot = { workspace = true, default-features = true }
 polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
-parking_lot = { workspace = true, default-features = true }
-bytes = { workspace = true, default-features = true }
-fatality = { workspace = true }
+polkadot-primitives = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
+futures-timer = { workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-primitives-test-helpers = { workspace = true }
 sp-core = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
-futures-timer = { workspace = true }
-polkadot-primitives-test-helpers = { workspace = true }
diff --git a/polkadot/node/network/collator-protocol/Cargo.toml b/polkadot/node/network/collator-protocol/Cargo.toml
index a51d24c70807..a02b281b6fc4 100644
--- a/polkadot/node/network/collator-protocol/Cargo.toml
+++ b/polkadot/node/network/collator-protocol/Cargo.toml
@@ -19,28 +19,28 @@ gum = { workspace = true, default-features = true }
 schnellru.workspace = true
 
 sp-core = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 
-polkadot-primitives = { workspace = true, default-features = true }
+fatality = { workspace = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
-polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
-fatality = { workspace = true }
+polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 thiserror = { workspace = true }
 tokio-util = { workspace = true }
 
 [dev-dependencies]
-sp-tracing = { workspace = true }
 assert_matches = { workspace = true }
 rstest = { workspace = true }
+sp-tracing = { workspace = true }
 
-sp-core = { features = ["std"], workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
+codec = { features = ["std"], workspace = true, default-features = true }
 sc-keystore = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
-codec = { features = ["std"], workspace = true, default-features = true }
+sp-core = { features = ["std"], workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 
 polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-primitives-test-helpers = { workspace = true }
diff --git a/polkadot/node/network/dispute-distribution/Cargo.toml b/polkadot/node/network/dispute-distribution/Cargo.toml
index 4f2f9ccadf8b..079a37ca0aff 100644
--- a/polkadot/node/network/dispute-distribution/Cargo.toml
+++ b/polkadot/node/network/dispute-distribution/Cargo.toml
@@ -12,32 +12,32 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+codec = { features = ["std"], workspace = true, default-features = true }
+derive_more = { workspace = true, default-features = true }
+fatality = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 gum = { workspace = true, default-features = true }
-derive_more = { workspace = true, default-features = true }
-codec = { features = ["std"], workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
+indexmap = { workspace = true }
 polkadot-erasure-coding = { workspace = true, default-features = true }
-polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
-polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-node-subsystem = { workspace = true, default-features = true }
+polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
+schnellru = { workspace = true }
 sp-application-crypto = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-fatality = { workspace = true }
-schnellru = { workspace = true }
-indexmap = { workspace = true }
 
 [dev-dependencies]
+assert_matches = { workspace = true }
 async-channel = { workspace = true }
 async-trait = { workspace = true }
+futures-timer = { workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
+polkadot-primitives-test-helpers = { workspace = true }
+sc-keystore = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
-sc-keystore = { workspace = true, default-features = true }
-futures-timer = { workspace = true }
-assert_matches = { workspace = true }
-polkadot-primitives-test-helpers = { workspace = true }
diff --git a/polkadot/node/network/gossip-support/Cargo.toml b/polkadot/node/network/gossip-support/Cargo.toml
index 7d17ea45eab9..1ba556fc46b0 100644
--- a/polkadot/node/network/gossip-support/Cargo.toml
+++ b/polkadot/node/network/gossip-support/Cargo.toml
@@ -12,12 +12,12 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+sc-network = { workspace = true, default-features = true }
+sc-network-common = { workspace = true, default-features = true }
 sp-application-crypto = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
-sc-network = { workspace = true, default-features = true }
-sc-network-common = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
 
 polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
@@ -26,15 +26,15 @@ polkadot-primitives = { workspace = true, default-features = true }
 
 futures = { workspace = true }
 futures-timer = { workspace = true }
+gum = { workspace = true, default-features = true }
 rand = { workspace = true }
 rand_chacha = { workspace = true }
-gum = { workspace = true, default-features = true }
 
 [dev-dependencies]
-sp-keyring = { workspace = true, default-features = true }
+sp-authority-discovery = { workspace = true, default-features = true }
 sp-consensus-babe = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
-sp-authority-discovery = { workspace = true, default-features = true }
 
 polkadot-node-subsystem-test-helpers = { workspace = true }
 
diff --git a/polkadot/node/network/protocol/Cargo.toml b/polkadot/node/network/protocol/Cargo.toml
index 0bcf224332bc..83a24959f60a 100644
--- a/polkadot/node/network/protocol/Cargo.toml
+++ b/polkadot/node/network/protocol/Cargo.toml
@@ -14,22 +14,22 @@ workspace = true
 [dependencies]
 async-channel = { workspace = true }
 async-trait = { workspace = true }
+bitvec = { workspace = true, default-features = true }
+codec = { features = ["derive"], workspace = true }
+derive_more = { workspace = true, default-features = true }
+fatality = { workspace = true }
+futures = { workspace = true }
+gum = { workspace = true, default-features = true }
 hex = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
-codec = { features = ["derive"], workspace = true }
+polkadot-primitives = { workspace = true, default-features = true }
+rand = { workspace = true, default-features = true }
+sc-authority-discovery = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
-sc-authority-discovery = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 strum = { features = ["derive"], workspace = true, default-features = true }
-futures = { workspace = true }
 thiserror = { workspace = true }
-fatality = { workspace = true }
-rand = { workspace = true, default-features = true }
-derive_more = { workspace = true, default-features = true }
-gum = { workspace = true, default-features = true }
-bitvec = { workspace = true, default-features = true }
 
 [dev-dependencies]
 rand_chacha = { workspace = true, default-features = true }
diff --git a/polkadot/node/network/statement-distribution/Cargo.toml b/polkadot/node/network/statement-distribution/Cargo.toml
index d737c7bf8968..8bd058b8c849 100644
--- a/polkadot/node/network/statement-distribution/Cargo.toml
+++ b/polkadot/node/network/statement-distribution/Cargo.toml
@@ -12,41 +12,41 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+arrayvec = { workspace = true }
+bitvec = { workspace = true, default-features = true }
+codec = { features = ["derive"], workspace = true }
+fatality = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 gum = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
-sp-staking = { workspace = true }
-sp-keystore = { workspace = true, default-features = true }
-polkadot-node-subsystem = { workspace = true, default-features = true }
+indexmap = { workspace = true }
+polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
-polkadot-node-network-protocol = { workspace = true, default-features = true }
-arrayvec = { workspace = true }
-indexmap = { workspace = true }
-codec = { features = ["derive"], workspace = true }
+polkadot-primitives = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
+sp-staking = { workspace = true }
 thiserror = { workspace = true }
-fatality = { workspace = true }
-bitvec = { workspace = true, default-features = true }
 
 [dev-dependencies]
-async-channel = { workspace = true }
 assert_matches = { workspace = true }
-polkadot-node-subsystem-test-helpers = { workspace = true }
-sp-authority-discovery = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-application-crypto = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
-sc-keystore = { workspace = true, default-features = true }
-sc-network = { workspace = true, default-features = true }
+async-channel = { workspace = true }
 futures-timer = { workspace = true }
+polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-primitives = { workspace = true, features = ["test"] }
 polkadot-primitives-test-helpers = { workspace = true }
-rand_chacha = { workspace = true, default-features = true }
 polkadot-subsystem-bench = { workspace = true }
+rand_chacha = { workspace = true, default-features = true }
 rstest = { workspace = true }
+sc-keystore = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
+sp-application-crypto = { workspace = true, default-features = true }
+sp-authority-discovery = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 
 [[bench]]
 name = "statement-distribution-regression-bench"
diff --git a/polkadot/node/overseer/Cargo.toml b/polkadot/node/overseer/Cargo.toml
index 62634c1da090..fd7f1e039247 100644
--- a/polkadot/node/overseer/Cargo.toml
+++ b/polkadot/node/overseer/Cargo.toml
@@ -12,30 +12,30 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-sc-client-api = { workspace = true, default-features = true }
-sp-api = { workspace = true, default-features = true }
+async-trait = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
+gum = { workspace = true, default-features = true }
+orchestra = { features = ["futures_channel"], workspace = true }
 parking_lot = { workspace = true, default-features = true }
+polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem-types = { workspace = true, default-features = true }
-polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
-orchestra = { features = ["futures_channel"], workspace = true }
-gum = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
+sp-api = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
-async-trait = { workspace = true }
 tikv-jemalloc-ctl = { optional = true, workspace = true }
 
 [dev-dependencies]
-metered = { features = ["futures_channel"], workspace = true }
-sp-core = { workspace = true, default-features = true }
-futures = { features = ["thread-pool"], workspace = true }
-femme = { workspace = true }
 assert_matches = { workspace = true }
-polkadot-primitives-test-helpers = { workspace = true }
+femme = { workspace = true }
+futures = { features = ["thread-pool"], workspace = true }
+metered = { features = ["futures_channel"], workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
+polkadot-primitives-test-helpers = { workspace = true }
+sp-core = { workspace = true, default-features = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 tikv-jemalloc-ctl = "0.5.0"
diff --git a/polkadot/node/primitives/Cargo.toml b/polkadot/node/primitives/Cargo.toml
index 50ee3a80ddb8..d138b77dea8f 100644
--- a/polkadot/node/primitives/Cargo.toml
+++ b/polkadot/node/primitives/Cargo.toml
@@ -12,24 +12,24 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+bitvec = { features = ["alloc"], workspace = true }
 bounded-vec = { workspace = true }
+codec = { features = ["derive"], workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
+polkadot-parachain-primitives = { workspace = true }
 polkadot-primitives = { workspace = true, default-features = true }
-codec = { features = ["derive"], workspace = true }
-sp-core = { workspace = true, default-features = true }
+sc-keystore = { workspace = true }
+schnorrkel = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
 sp-application-crypto = { workspace = true, default-features = true }
 sp-consensus-babe = { workspace = true, default-features = true }
 sp-consensus-slots = { workspace = true }
+sp-core = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-maybe-compressed-blob = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-polkadot-parachain-primitives = { workspace = true }
-schnorrkel = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-bitvec = { features = ["alloc"], workspace = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-sc-keystore = { workspace = true }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 zstd = { version = "0.12.4", default-features = false }
diff --git a/polkadot/node/primitives/src/lib.rs b/polkadot/node/primitives/src/lib.rs
index 6985e86098b0..1e5ce6489bc8 100644
--- a/polkadot/node/primitives/src/lib.rs
+++ b/polkadot/node/primitives/src/lib.rs
@@ -59,7 +59,7 @@ pub use disputes::{
 /// relatively rare.
 ///
 /// The associated worker binaries should use the same version as the node that spawns them.
-pub const NODE_VERSION: &'static str = "1.16.1";
+pub const NODE_VERSION: &'static str = "1.17.0";
 
 // For a 16-ary Merkle Prefix Trie, we can expect at most 16 32-byte hashes per node
 // plus some overhead:
diff --git a/polkadot/node/service/Cargo.toml b/polkadot/node/service/Cargo.toml
index c1e06dd830b5..122040a9b207 100644
--- a/polkadot/node/service/Cargo.toml
+++ b/polkadot/node/service/Cargo.toml
@@ -14,98 +14,98 @@ workspace = true
 
 [dependencies]
 # Substrate Client
-sc-authority-discovery = { workspace = true, default-features = true }
-sc-consensus-babe = { workspace = true, default-features = true }
-sc-consensus-beefy = { workspace = true, default-features = true }
-sc-consensus-grandpa = { workspace = true, default-features = true }
 mmr-gadget = { workspace = true, default-features = true }
-sp-mmr-primitives = { workspace = true, default-features = true }
-sp-genesis-builder = { workspace = true, default-features = true }
+sc-authority-discovery = { workspace = true, default-features = true }
+sc-basic-authorship = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
+sc-consensus-babe = { workspace = true, default-features = true }
+sc-consensus-beefy = { workspace = true, default-features = true }
+sc-consensus-grandpa = { workspace = true, default-features = true }
 sc-consensus-slots = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
+sc-keystore = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
-sc-transaction-pool = { workspace = true, default-features = true }
-sc-transaction-pool-api = { workspace = true, default-features = true }
-sc-sync-state-rpc = { workspace = true, default-features = true }
-sc-keystore = { workspace = true, default-features = true }
-sc-basic-authorship = { workspace = true, default-features = true }
 sc-offchain = { workspace = true, default-features = true }
-sc-sysinfo = { workspace = true, default-features = true }
 sc-service = { workspace = true }
+sc-sync-state-rpc = { workspace = true, default-features = true }
+sc-sysinfo = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
+sc-transaction-pool = { workspace = true, default-features = true }
+sc-transaction-pool-api = { workspace = true, default-features = true }
+sp-genesis-builder = { workspace = true, default-features = true }
+sp-mmr-primitives = { workspace = true, default-features = true }
 
 # Substrate Primitives
+pallet-transaction-payment = { workspace = true, default-features = true }
+sp-api = { workspace = true, default-features = true }
 sp-authority-discovery = { workspace = true, default-features = true }
+sp-block-builder = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
+sp-consensus-babe = { workspace = true, default-features = true }
 sp-consensus-beefy = { workspace = true, default-features = true }
 sp-consensus-grandpa = { workspace = true, default-features = true }
-sp-inherents = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-sp-api = { workspace = true, default-features = true }
-sp-block-builder = { workspace = true, default-features = true }
-sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
+sp-inherents = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 sp-offchain = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-session = { workspace = true, default-features = true }
-sp-transaction-pool = { workspace = true, default-features = true }
-pallet-transaction-payment = { workspace = true, default-features = true }
 sp-timestamp = { workspace = true, default-features = true }
-sp-consensus-babe = { workspace = true, default-features = true }
-sp-weights = { workspace = true, default-features = true }
+sp-transaction-pool = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
+sp-weights = { workspace = true, default-features = true }
 
 # Substrate Pallets
-pallet-transaction-payment-rpc-runtime-api = { workspace = true, default-features = true }
 frame-metadata-hash-extension = { optional = true, workspace = true, default-features = true }
 frame-system = { workspace = true, default-features = true }
+pallet-transaction-payment-rpc-runtime-api = { workspace = true, default-features = true }
 
 # Substrate Other
+frame-benchmarking = { workspace = true, default-features = true }
+frame-benchmarking-cli = { workspace = true, default-features = true }
 frame-system-rpc-runtime-api = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
-frame-benchmarking-cli = { workspace = true, default-features = true }
-frame-benchmarking = { workspace = true, default-features = true }
 
 # External Crates
 async-trait = { workspace = true }
+codec = { workspace = true, default-features = true }
 futures = { workspace = true }
-is_executable = { workspace = true }
 gum = { workspace = true, default-features = true }
-log = { workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
-thiserror = { workspace = true }
+is_executable = { workspace = true }
 kvdb = { workspace = true }
 kvdb-rocksdb = { optional = true, workspace = true }
+log = { workspace = true, default-features = true }
 parity-db = { optional = true, workspace = true }
-codec = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 # Polkadot
 polkadot-core-primitives = { workspace = true, default-features = true }
 polkadot-node-core-parachains-inherent = { workspace = true, default-features = true }
-polkadot-overseer = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
+polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
-polkadot-rpc = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
-polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-node-subsystem-types = { workspace = true, default-features = true }
+polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-overseer = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
+polkadot-rpc = { workspace = true, default-features = true }
 polkadot-runtime-parachains = { workspace = true, default-features = true }
-polkadot-node-network-protocol = { workspace = true, default-features = true }
 
 # Polkadot Runtime Constants
 rococo-runtime-constants = { optional = true, workspace = true, default-features = true }
 westend-runtime-constants = { optional = true, workspace = true, default-features = true }
 
 # Polkadot Runtimes
-westend-runtime = { optional = true, workspace = true }
 rococo-runtime = { optional = true, workspace = true }
+westend-runtime = { optional = true, workspace = true }
 
 # Polkadot Subsystems
 polkadot-approval-distribution = { optional = true, workspace = true, default-features = true }
@@ -137,11 +137,11 @@ xcm = { workspace = true, default-features = true }
 xcm-runtime-apis = { workspace = true, default-features = true }
 
 [dev-dependencies]
-polkadot-test-client = { workspace = true }
+assert_matches = { workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-primitives-test-helpers = { workspace = true }
+polkadot-test-client = { workspace = true }
 sp-tracing = { workspace = true }
-assert_matches = { workspace = true }
 tempfile = { workspace = true }
 
 [features]
diff --git a/polkadot/node/subsystem-bench/Cargo.toml b/polkadot/node/subsystem-bench/Cargo.toml
index 8633818e775d..e288ee2b78d3 100644
--- a/polkadot/node/subsystem-bench/Cargo.toml
+++ b/polkadot/node/subsystem-bench/Cargo.toml
@@ -21,79 +21,79 @@ doc = false
 
 
 [dependencies]
-tikv-jemallocator = { features = ["profiling", "unprefixed_malloc_on_supported_platforms"], workspace = true, optional = true }
-jemalloc_pprof = { workspace = true, optional = true }
-polkadot-service = { workspace = true, default-features = true }
-polkadot-node-subsystem = { workspace = true, default-features = true }
-polkadot-node-subsystem-util = { workspace = true, default-features = true }
-polkadot-node-subsystem-types = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, features = ["test"] }
-polkadot-node-network-protocol = { workspace = true, default-features = true }
-polkadot-availability-recovery = { features = ["subsystem-benchmarks"], workspace = true, default-features = true }
-polkadot-availability-distribution = { workspace = true, default-features = true }
-polkadot-statement-distribution = { workspace = true, default-features = true }
-polkadot-node-core-av-store = { workspace = true, default-features = true }
-polkadot-node-core-chain-api = { workspace = true, default-features = true }
-polkadot-availability-bitfield-distribution = { workspace = true, default-features = true }
-color-eyre = { workspace = true }
-polkadot-overseer = { workspace = true, default-features = true }
-colored = { workspace = true }
 assert_matches = { workspace = true }
 async-trait = { workspace = true }
-sp-keystore = { workspace = true, default-features = true }
-sc-keystore = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
+bincode = { workspace = true }
 clap = { features = ["derive"], workspace = true }
+color-eyre = { workspace = true }
+colored = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
-bincode = { workspace = true }
-sha1 = { workspace = true }
-hex = { workspace = true, default-features = true }
 gum = { workspace = true, default-features = true }
-polkadot-erasure-coding = { workspace = true, default-features = true }
+hex = { workspace = true, default-features = true }
+jemalloc_pprof = { workspace = true, optional = true }
 log = { workspace = true, default-features = true }
-sp-tracing = { workspace = true }
+polkadot-availability-bitfield-distribution = { workspace = true, default-features = true }
+polkadot-availability-distribution = { workspace = true, default-features = true }
+polkadot-availability-recovery = { features = ["subsystem-benchmarks"], workspace = true, default-features = true }
+polkadot-erasure-coding = { workspace = true, default-features = true }
+polkadot-node-core-av-store = { workspace = true, default-features = true }
+polkadot-node-core-chain-api = { workspace = true, default-features = true }
+polkadot-node-network-protocol = { workspace = true, default-features = true }
+polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-node-subsystem = { workspace = true, default-features = true }
+polkadot-node-subsystem-types = { workspace = true, default-features = true }
+polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-overseer = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, features = ["test"] }
+polkadot-service = { workspace = true, default-features = true }
+polkadot-statement-distribution = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
+sc-keystore = { workspace = true, default-features = true }
+sha1 = { workspace = true }
+sp-core = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
+sp-tracing = { workspace = true }
+tikv-jemallocator = { features = ["profiling", "unprefixed_malloc_on_supported_platforms"], workspace = true, optional = true }
 # `rand` only supports uniform distribution, we need normal distribution for latency.
-rand_distr = { workspace = true }
 bitvec = { workspace = true, default-features = true }
 kvdb-memorydb = { workspace = true }
+rand_distr = { workspace = true }
 
-codec = { features = ["derive", "std"], workspace = true, default-features = true }
-tokio = { features = ["parking_lot", "rt-multi-thread"], workspace = true, default-features = true }
 clap-num = { workspace = true }
+codec = { features = ["derive", "std"], workspace = true, default-features = true }
+itertools = { workspace = true }
+polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
-sp-keyring = { workspace = true, default-features = true }
-sp-application-crypto = { workspace = true, default-features = true }
+polkadot-primitives-test-helpers = { workspace = true }
+prometheus = { workspace = true }
+prometheus-endpoint = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
-sp-consensus = { workspace = true, default-features = true }
-polkadot-node-metrics = { workspace = true, default-features = true }
-itertools = { workspace = true }
-polkadot-primitives-test-helpers = { workspace = true }
-prometheus-endpoint = { workspace = true, default-features = true }
-prometheus = { workspace = true }
 serde = { workspace = true, default-features = true }
-serde_yaml = { workspace = true }
 serde_json = { workspace = true }
+serde_yaml = { workspace = true }
+sp-application-crypto = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+tokio = { features = ["parking_lot", "rt-multi-thread"], workspace = true, default-features = true }
 
+polkadot-approval-distribution = { workspace = true, default-features = true }
 polkadot-node-core-approval-voting = { workspace = true, default-features = true }
 polkadot-node-core-approval-voting-parallel = { workspace = true, default-features = true }
-polkadot-approval-distribution = { workspace = true, default-features = true }
 sp-consensus-babe = { workspace = true, default-features = true }
 sp-runtime = { workspace = true }
 sp-timestamp = { workspace = true, default-features = true }
 
 schnorrkel = { workspace = true }
 # rand_core should match schnorrkel
-rand_core = { workspace = true }
-rand_chacha = { workspace = true, default-features = true }
-paste = { workspace = true, default-features = true }
 orchestra = { features = ["futures_channel"], workspace = true }
+paste = { workspace = true, default-features = true }
 pyroscope = { workspace = true }
 pyroscope_pprofrs = { workspace = true }
+rand_chacha = { workspace = true, default-features = true }
+rand_core = { workspace = true }
 strum = { features = ["derive"], workspace = true, default-features = true }
 
 [features]
diff --git a/polkadot/node/subsystem-test-helpers/Cargo.toml b/polkadot/node/subsystem-test-helpers/Cargo.toml
index d3229291673c..4e660b15c1e2 100644
--- a/polkadot/node/subsystem-test-helpers/Cargo.toml
+++ b/polkadot/node/subsystem-test-helpers/Cargo.toml
@@ -14,16 +14,16 @@ workspace = true
 async-trait = { workspace = true }
 futures = { workspace = true }
 parking_lot = { workspace = true, default-features = true }
-polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-erasure-coding = { workspace = true, default-features = true }
+polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
 
 sc-client-api = { workspace = true, default-features = true }
+sc-keystore = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
+sp-application-crypto = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-sc-keystore = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
-sp-application-crypto = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
diff --git a/polkadot/node/subsystem-types/Cargo.toml b/polkadot/node/subsystem-types/Cargo.toml
index 44bb7036d63d..6c88a4474137 100644
--- a/polkadot/node/subsystem-types/Cargo.toml
+++ b/polkadot/node/subsystem-types/Cargo.toml
@@ -12,25 +12,25 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+async-trait = { workspace = true }
+bitvec = { features = ["alloc"], workspace = true }
 derive_more = { workspace = true, default-features = true }
 fatality = { workspace = true }
 futures = { workspace = true }
-polkadot-primitives = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
+orchestra = { features = ["futures_channel"], workspace = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
+polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 polkadot-statement-table = { workspace = true, default-features = true }
-orchestra = { features = ["futures_channel"], workspace = true }
+prometheus-endpoint = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
+sc-transaction-pool-api = { workspace = true, default-features = true }
+smallvec = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
+sp-authority-discovery = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus-babe = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-authority-discovery = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-sc-transaction-pool-api = { workspace = true, default-features = true }
-smallvec = { workspace = true, default-features = true }
-prometheus-endpoint = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-async-trait = { workspace = true }
-bitvec = { features = ["alloc"], workspace = true }
diff --git a/polkadot/node/subsystem-util/Cargo.toml b/polkadot/node/subsystem-util/Cargo.toml
index 9c21fede1c47..0e6ebf611997 100644
--- a/polkadot/node/subsystem-util/Cargo.toml
+++ b/polkadot/node/subsystem-util/Cargo.toml
@@ -13,33 +13,33 @@ workspace = true
 
 [dependencies]
 async-trait = { workspace = true }
+codec = { features = ["derive"], workspace = true }
+derive_more = { workspace = true, default-features = true }
+fatality = { workspace = true }
 futures = { workspace = true }
 futures-channel = { workspace = true }
+gum = { workspace = true, default-features = true }
 itertools = { workspace = true }
-codec = { features = ["derive"], workspace = true }
 parking_lot = { workspace = true, default-features = true }
 pin-project = { workspace = true }
 rand = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-fatality = { workspace = true }
-gum = { workspace = true, default-features = true }
-derive_more = { workspace = true, default-features = true }
 schnellru = { workspace = true }
+thiserror = { workspace = true }
 
+metered = { features = ["futures_channel"], workspace = true }
 polkadot-erasure-coding = { workspace = true, default-features = true }
-polkadot-node-subsystem = { workspace = true, default-features = true }
-polkadot-node-subsystem-types = { workspace = true, default-features = true }
 polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-node-subsystem = { workspace = true, default-features = true }
+polkadot-node-subsystem-types = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
-metered = { features = ["futures_channel"], workspace = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
-sp-core = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
 sp-application-crypto = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
 
 kvdb = { workspace = true }
 parity-db = { workspace = true }
@@ -47,9 +47,9 @@ parity-db = { workspace = true }
 [dev-dependencies]
 assert_matches = { workspace = true }
 futures = { features = ["thread-pool"], workspace = true }
+kvdb-memorydb = { workspace = true }
+kvdb-shared-tests = { workspace = true }
 log = { workspace = true, default-features = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-primitives-test-helpers = { workspace = true }
-kvdb-shared-tests = { workspace = true }
 tempfile = { workspace = true }
-kvdb-memorydb = { workspace = true }
diff --git a/polkadot/node/subsystem/Cargo.toml b/polkadot/node/subsystem/Cargo.toml
index 4f30d3ce9c09..8b4a26e33ee6 100644
--- a/polkadot/node/subsystem/Cargo.toml
+++ b/polkadot/node/subsystem/Cargo.toml
@@ -12,5 +12,5 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-polkadot-overseer = { workspace = true, default-features = true }
 polkadot-node-subsystem-types = { workspace = true, default-features = true }
+polkadot-overseer = { workspace = true, default-features = true }
diff --git a/polkadot/node/test/client/Cargo.toml b/polkadot/node/test/client/Cargo.toml
index 587af659fbd2..13b14c0b9231 100644
--- a/polkadot/node/test/client/Cargo.toml
+++ b/polkadot/node/test/client/Cargo.toml
@@ -13,32 +13,32 @@ workspace = true
 codec = { features = ["derive"], workspace = true }
 
 # Polkadot dependencies
+polkadot-node-subsystem = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 polkadot-test-runtime = { workspace = true }
 polkadot-test-service = { workspace = true }
-polkadot-primitives = { workspace = true, default-features = true }
-polkadot-node-subsystem = { workspace = true, default-features = true }
 
 # Substrate dependencies
-substrate-test-client = { workspace = true }
-sc-service = { workspace = true, default-features = true }
+frame-benchmarking = { workspace = true, default-features = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-offchain = { workspace = true, default-features = true }
-sp-blockchain = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
-sp-inherents = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
+sc-service = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
-sp-timestamp = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-consensus-babe = { workspace = true, default-features = true }
-sp-state-machine = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-inherents = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-frame-benchmarking = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-state-machine = { workspace = true, default-features = true }
+sp-timestamp = { workspace = true, default-features = true }
+substrate-test-client = { workspace = true }
 
 [dev-dependencies]
-sp-keyring = { workspace = true, default-features = true }
 futures = { workspace = true }
+sp-keyring = { workspace = true, default-features = true }
 
 [features]
 runtime-benchmarks = [
diff --git a/polkadot/node/test/service/Cargo.toml b/polkadot/node/test/service/Cargo.toml
index 4ef9d88621fb..54db2a0ac942 100644
--- a/polkadot/node/test/service/Cargo.toml
+++ b/polkadot/node/test/service/Cargo.toml
@@ -11,50 +11,50 @@ workspace = true
 
 [dependencies]
 futures = { workspace = true }
-hex = { workspace = true, default-features = true }
 gum = { workspace = true, default-features = true }
+hex = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
 tempfile = { workspace = true }
 tokio = { workspace = true, default-features = true }
 
 # Polkadot dependencies
+polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 polkadot-rpc = { workspace = true, default-features = true }
 polkadot-runtime-common = { workspace = true, default-features = true }
+polkadot-runtime-parachains = { workspace = true, default-features = true }
 polkadot-service = { workspace = true, default-features = true }
-polkadot-node-subsystem = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-test-runtime = { workspace = true }
 test-runtime-constants = { workspace = true, default-features = true }
-polkadot-runtime-parachains = { workspace = true, default-features = true }
 
 # Substrate dependencies
-sp-authority-discovery = { workspace = true, default-features = true }
-sc-authority-discovery = { workspace = true, default-features = true }
-sc-consensus-babe = { workspace = true, default-features = true }
-sp-consensus-babe = { workspace = true, default-features = true }
-sp-consensus = { workspace = true, default-features = true }
 frame-system = { workspace = true, default-features = true }
-sc-consensus-grandpa = { workspace = true, default-features = true }
-sp-consensus-grandpa = { workspace = true, default-features = true }
-sp-inherents = { workspace = true, default-features = true }
-pallet-staking = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
+pallet-staking = { workspace = true, default-features = true }
 pallet-transaction-payment = { workspace = true, default-features = true }
+sc-authority-discovery = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true, default-features = true }
 sc-cli = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
+sc-consensus-babe = { workspace = true, default-features = true }
+sc-consensus-grandpa = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
+sc-service = { workspace = true }
 sc-tracing = { workspace = true, default-features = true }
 sc-transaction-pool = { workspace = true, default-features = true }
-sc-service = { workspace = true }
 sp-arithmetic = { workspace = true, default-features = true }
+sp-authority-discovery = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
+sp-consensus-babe = { workspace = true, default-features = true }
+sp-consensus-grandpa = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
+sp-inherents = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
diff --git a/polkadot/node/zombienet-backchannel/Cargo.toml b/polkadot/node/zombienet-backchannel/Cargo.toml
index 56c49a1ec305..0d04012e28a8 100644
--- a/polkadot/node/zombienet-backchannel/Cargo.toml
+++ b/polkadot/node/zombienet-backchannel/Cargo.toml
@@ -12,13 +12,13 @@ license.workspace = true
 workspace = true
 
 [dependencies]
-tokio = { features = ["macros", "net", "rt-multi-thread", "sync"], workspace = true }
-url = { workspace = true }
-tokio-tungstenite = { workspace = true }
-futures-util = { workspace = true, default-features = true }
 codec = { features = ["derive"], workspace = true, default-features = true }
-reqwest = { features = ["rustls-tls"], workspace = true }
-thiserror = { workspace = true }
+futures-util = { workspace = true, default-features = true }
 gum = { workspace = true, default-features = true }
+reqwest = { features = ["rustls-tls"], workspace = true }
 serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
+thiserror = { workspace = true }
+tokio = { features = ["macros", "net", "rt-multi-thread", "sync"], workspace = true }
+tokio-tungstenite = { workspace = true }
+url = { workspace = true }
diff --git a/polkadot/parachain/Cargo.toml b/polkadot/parachain/Cargo.toml
index ea6c4423dc19..0dd103d58b25 100644
--- a/polkadot/parachain/Cargo.toml
+++ b/polkadot/parachain/Cargo.toml
@@ -15,14 +15,14 @@ workspace = true
 # note: special care is taken to avoid inclusion of `sp-io` externals when compiling
 # this crate for WASM. This is critical to avoid forcing all parachain WASM into implementing
 # various unnecessary Substrate-specific endpoints.
+bounded-collections = { features = ["serde"], workspace = true }
 codec = { features = ["derive"], workspace = true }
+derive_more = { workspace = true, default-features = true }
+polkadot-core-primitives = { workspace = true }
 scale-info = { features = ["derive", "serde"], workspace = true }
-sp-runtime = { features = ["serde"], workspace = true }
 sp-core = { features = ["serde"], workspace = true }
+sp-runtime = { features = ["serde"], workspace = true }
 sp-weights = { workspace = true }
-polkadot-core-primitives = { workspace = true }
-derive_more = { workspace = true, default-features = true }
-bounded-collections = { features = ["serde"], workspace = true }
 
 # all optional crates.
 serde = { features = ["alloc", "derive"], workspace = true }
diff --git a/polkadot/parachain/test-parachains/Cargo.toml b/polkadot/parachain/test-parachains/Cargo.toml
index 9f35653f957f..2a1e1722bff9 100644
--- a/polkadot/parachain/test-parachains/Cargo.toml
+++ b/polkadot/parachain/test-parachains/Cargo.toml
@@ -11,8 +11,8 @@ publish = false
 workspace = true
 
 [dependencies]
-tiny-keccak = { features = ["keccak"], workspace = true }
 codec = { features = ["derive"], workspace = true }
+tiny-keccak = { features = ["keccak"], workspace = true }
 
 test-parachain-adder = { workspace = true }
 test-parachain-halt = { workspace = true }
diff --git a/polkadot/parachain/test-parachains/adder/Cargo.toml b/polkadot/parachain/test-parachains/adder/Cargo.toml
index 7a150b75d5cd..945b0e156904 100644
--- a/polkadot/parachain/test-parachains/adder/Cargo.toml
+++ b/polkadot/parachain/test-parachains/adder/Cargo.toml
@@ -12,10 +12,10 @@ publish = false
 workspace = true
 
 [dependencies]
-polkadot-parachain-primitives = { features = ["wasm-api"], workspace = true }
 codec = { features = ["derive"], workspace = true }
-tiny-keccak = { features = ["keccak"], workspace = true }
 dlmalloc = { features = ["global"], workspace = true }
+polkadot-parachain-primitives = { features = ["wasm-api"], workspace = true }
+tiny-keccak = { features = ["keccak"], workspace = true }
 
 # We need to make sure the global allocator is disabled until we have support of full substrate externalities
 sp-io = { features = ["disable_allocator"], workspace = true }
diff --git a/polkadot/parachain/test-parachains/adder/collator/Cargo.toml b/polkadot/parachain/test-parachains/adder/collator/Cargo.toml
index 061378a76a82..20305dc07c3a 100644
--- a/polkadot/parachain/test-parachains/adder/collator/Cargo.toml
+++ b/polkadot/parachain/test-parachains/adder/collator/Cargo.toml
@@ -15,30 +15,30 @@ name = "adder-collator"
 path = "src/main.rs"
 
 [dependencies]
-codec = { features = ["derive"], workspace = true }
 clap = { features = ["derive"], workspace = true }
+codec = { features = ["derive"], workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 log = { workspace = true, default-features = true }
 
-test-parachain-adder = { workspace = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-cli = { workspace = true, default-features = true }
-polkadot-service = { features = ["rococo-native"], workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
+polkadot-service = { features = ["rococo-native"], workspace = true, default-features = true }
+test-parachain-adder = { workspace = true }
 
 sc-cli = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 
 [dev-dependencies]
+polkadot-node-core-pvf = { features = ["test-utils"], workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
 polkadot-test-service = { workspace = true }
-polkadot-node-core-pvf = { features = ["test-utils"], workspace = true, default-features = true }
 
-substrate-test-utils = { workspace = true }
 sc-service = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
+substrate-test-utils = { workspace = true }
 
 tokio = { features = ["macros"], workspace = true, default-features = true }
diff --git a/polkadot/parachain/test-parachains/halt/Cargo.toml b/polkadot/parachain/test-parachains/halt/Cargo.toml
index f8272f6ed196..ea8372ccd121 100644
--- a/polkadot/parachain/test-parachains/halt/Cargo.toml
+++ b/polkadot/parachain/test-parachains/halt/Cargo.toml
@@ -14,8 +14,8 @@ workspace = true
 [dependencies]
 
 [build-dependencies]
-substrate-wasm-builder = { workspace = true, default-features = true }
 rustversion = { workspace = true }
+substrate-wasm-builder = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/parachain/test-parachains/undying/Cargo.toml b/polkadot/parachain/test-parachains/undying/Cargo.toml
index 4b2e12ebf435..43b5a3352434 100644
--- a/polkadot/parachain/test-parachains/undying/Cargo.toml
+++ b/polkadot/parachain/test-parachains/undying/Cargo.toml
@@ -12,11 +12,11 @@ license.workspace = true
 workspace = true
 
 [dependencies]
-polkadot-parachain-primitives = { features = ["wasm-api"], workspace = true }
 codec = { features = ["derive"], workspace = true }
-tiny-keccak = { features = ["keccak"], workspace = true }
 dlmalloc = { features = ["global"], workspace = true }
 log = { workspace = true }
+polkadot-parachain-primitives = { features = ["wasm-api"], workspace = true }
+tiny-keccak = { features = ["keccak"], workspace = true }
 
 # We need to make sure the global allocator is disabled until we have support of full substrate externalities
 sp-io = { features = ["disable_allocator"], workspace = true }
diff --git a/polkadot/parachain/test-parachains/undying/collator/Cargo.toml b/polkadot/parachain/test-parachains/undying/collator/Cargo.toml
index 5760258c70ea..b964b4dc49ce 100644
--- a/polkadot/parachain/test-parachains/undying/collator/Cargo.toml
+++ b/polkadot/parachain/test-parachains/undying/collator/Cargo.toml
@@ -15,30 +15,30 @@ name = "undying-collator"
 path = "src/main.rs"
 
 [dependencies]
-codec = { features = ["derive"], workspace = true }
 clap = { features = ["derive"], workspace = true }
+codec = { features = ["derive"], workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 log = { workspace = true, default-features = true }
 
-test-parachain-undying = { workspace = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-cli = { workspace = true, default-features = true }
-polkadot-service = { features = ["rococo-native"], workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
+polkadot-service = { features = ["rococo-native"], workspace = true, default-features = true }
+test-parachain-undying = { workspace = true }
 
 sc-cli = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 
 [dev-dependencies]
+polkadot-node-core-pvf = { features = ["test-utils"], workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
 polkadot-test-service = { workspace = true }
-polkadot-node-core-pvf = { features = ["test-utils"], workspace = true, default-features = true }
 
-substrate-test-utils = { workspace = true }
 sc-service = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
+substrate-test-utils = { workspace = true }
 
 tokio = { features = ["macros"], workspace = true, default-features = true }
diff --git a/polkadot/primitives/Cargo.toml b/polkadot/primitives/Cargo.toml
index 150aaf153fa7..e693fe8c4a8c 100644
--- a/polkadot/primitives/Cargo.toml
+++ b/polkadot/primitives/Cargo.toml
@@ -13,23 +13,23 @@ workspace = true
 
 [dependencies]
 bitvec = { features = ["alloc", "serde"], workspace = true }
-hex-literal = { workspace = true, default-features = true }
 codec = { features = ["bit-vec", "derive"], workspace = true }
-scale-info = { features = ["bit-vec", "derive", "serde"], workspace = true }
+hex-literal = { workspace = true, default-features = true }
 log = { workspace = true }
+scale-info = { features = ["bit-vec", "derive", "serde"], workspace = true }
 serde = { features = ["alloc", "derive"], workspace = true }
 thiserror = { workspace = true, optional = true }
 
-sp-application-crypto = { features = ["serde"], workspace = true }
-sp-inherents = { workspace = true }
-sp-core = { workspace = true }
-sp-runtime = { workspace = true }
 sp-api = { workspace = true }
+sp-application-crypto = { features = ["serde"], workspace = true }
 sp-arithmetic = { features = ["serde"], workspace = true }
 sp-authority-discovery = { features = ["serde"], workspace = true }
 sp-consensus-slots = { features = ["serde"], workspace = true }
+sp-core = { workspace = true }
+sp-inherents = { workspace = true }
 sp-io = { workspace = true }
 sp-keystore = { optional = true, workspace = true }
+sp-runtime = { workspace = true }
 sp-staking = { features = ["serde"], workspace = true }
 sp-std = { workspace = true, optional = true }
 
diff --git a/polkadot/primitives/test-helpers/Cargo.toml b/polkadot/primitives/test-helpers/Cargo.toml
index 27de3c4b9c56..962b210848c8 100644
--- a/polkadot/primitives/test-helpers/Cargo.toml
+++ b/polkadot/primitives/test-helpers/Cargo.toml
@@ -10,9 +10,9 @@ license.workspace = true
 workspace = true
 
 [dependencies]
-sp-keyring = { workspace = true, default-features = true }
-sp-application-crypto = { workspace = true }
-sp-runtime = { workspace = true, default-features = true }
-sp-core = { features = ["std"], workspace = true, default-features = true }
 polkadot-primitives = { features = ["test"], workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
+sp-application-crypto = { workspace = true }
+sp-core = { features = ["std"], workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
diff --git a/polkadot/rpc/Cargo.toml b/polkadot/rpc/Cargo.toml
index 48980dde4bbc..33ce3ff4acc6 100644
--- a/polkadot/rpc/Cargo.toml
+++ b/polkadot/rpc/Cargo.toml
@@ -13,19 +13,11 @@ workspace = true
 
 [dependencies]
 jsonrpsee = { features = ["server"], workspace = true }
+mmr-rpc = { workspace = true, default-features = true }
+pallet-transaction-payment-rpc = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-sp-blockchain = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
-sp-api = { workspace = true, default-features = true }
-sp-application-crypto = { workspace = true, default-features = true }
-sp-consensus = { workspace = true, default-features = true }
-sp-consensus-babe = { workspace = true, default-features = true }
-sp-consensus-beefy = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true, default-features = true }
-sc-rpc = { workspace = true, default-features = true }
-sc-rpc-spec-v2 = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
 sc-consensus-babe = { workspace = true, default-features = true }
 sc-consensus-babe-rpc = { workspace = true, default-features = true }
 sc-consensus-beefy = { workspace = true, default-features = true }
@@ -33,10 +25,18 @@ sc-consensus-beefy-rpc = { workspace = true, default-features = true }
 sc-consensus-epochs = { workspace = true, default-features = true }
 sc-consensus-grandpa = { workspace = true, default-features = true }
 sc-consensus-grandpa-rpc = { workspace = true, default-features = true }
+sc-rpc = { workspace = true, default-features = true }
+sc-rpc-spec-v2 = { workspace = true, default-features = true }
 sc-sync-state-rpc = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
-substrate-frame-rpc-system = { workspace = true, default-features = true }
-mmr-rpc = { workspace = true, default-features = true }
-pallet-transaction-payment-rpc = { workspace = true, default-features = true }
+sp-api = { workspace = true, default-features = true }
+sp-application-crypto = { workspace = true, default-features = true }
 sp-block-builder = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
+sp-consensus-babe = { workspace = true, default-features = true }
+sp-consensus-beefy = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+substrate-frame-rpc-system = { workspace = true, default-features = true }
 substrate-state-trie-migration-rpc = { workspace = true, default-features = true }
diff --git a/polkadot/runtime/common/Cargo.toml b/polkadot/runtime/common/Cargo.toml
index 4b307b56bcbe..4ffa5c475ed7 100644
--- a/polkadot/runtime/common/Cargo.toml
+++ b/polkadot/runtime/common/Cargo.toml
@@ -12,9 +12,9 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-impl-trait-for-tuples = { workspace = true }
 bitvec = { features = ["alloc"], workspace = true }
 codec = { features = ["derive"], workspace = true }
+impl-trait-for-tuples = { workspace = true }
 log = { workspace = true }
 rustc-hex = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
@@ -23,55 +23,55 @@ serde_derive = { workspace = true }
 static_assertions = { workspace = true, default-features = true }
 
 sp-api = { workspace = true }
+sp-core = { features = ["serde"], workspace = true }
 sp-inherents = { workspace = true }
 sp-io = { workspace = true }
+sp-keyring = { workspace = true }
+sp-npos-elections = { features = ["serde"], workspace = true }
 sp-runtime = { features = ["serde"], workspace = true }
 sp-session = { workspace = true }
 sp-staking = { features = ["serde"], workspace = true }
-sp-core = { features = ["serde"], workspace = true }
-sp-keyring = { workspace = true }
-sp-npos-elections = { features = ["serde"], workspace = true }
 
+frame-election-provider-support = { workspace = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
+pallet-asset-rate = { optional = true, workspace = true }
 pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-broker = { workspace = true }
+pallet-election-provider-multi-phase = { workspace = true }
 pallet-fast-unstake = { workspace = true }
 pallet-identity = { workspace = true }
 pallet-session = { workspace = true }
-frame-support = { workspace = true }
 pallet-staking = { workspace = true }
 pallet-staking-reward-fn = { workspace = true }
-frame-system = { workspace = true }
 pallet-timestamp = { workspace = true }
-pallet-vesting = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-treasury = { workspace = true }
-pallet-asset-rate = { optional = true, workspace = true }
-pallet-election-provider-multi-phase = { workspace = true }
-frame-election-provider-support = { workspace = true }
+pallet-vesting = { workspace = true }
 
 frame-benchmarking = { optional = true, workspace = true }
 pallet-babe = { optional = true, workspace = true }
 
-polkadot-primitives = { workspace = true }
 libsecp256k1 = { workspace = true }
+polkadot-primitives = { workspace = true }
 polkadot-runtime-parachains = { workspace = true }
 
 slot-range-helper = { workspace = true }
 xcm = { workspace = true }
-xcm-executor = { optional = true, workspace = true }
 xcm-builder = { workspace = true }
+xcm-executor = { optional = true, workspace = true }
 
 [dev-dependencies]
-hex-literal = { workspace = true, default-features = true }
 frame-support-test = { workspace = true }
+hex-literal = { workspace = true, default-features = true }
+libsecp256k1 = { workspace = true, default-features = true }
 pallet-babe = { workspace = true, default-features = true }
 pallet-treasury = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
-libsecp256k1 = { workspace = true, default-features = true }
 polkadot-primitives-test-helpers = { workspace = true }
+serde_json = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/runtime/common/slot_range_helper/Cargo.toml b/polkadot/runtime/common/slot_range_helper/Cargo.toml
index 3f110bdd76c6..684cdcd01e14 100644
--- a/polkadot/runtime/common/slot_range_helper/Cargo.toml
+++ b/polkadot/runtime/common/slot_range_helper/Cargo.toml
@@ -12,9 +12,9 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-paste = { workspace = true, default-features = true }
-enumn = { workspace = true }
 codec = { features = ["derive"], workspace = true }
+enumn = { workspace = true }
+paste = { workspace = true, default-features = true }
 sp-runtime = { workspace = true }
 
 [features]
diff --git a/polkadot/runtime/common/src/auctions.rs b/polkadot/runtime/common/src/auctions.rs
deleted file mode 100644
index 3ac1ba2dc4e0..000000000000
--- a/polkadot/runtime/common/src/auctions.rs
+++ /dev/null
@@ -1,1980 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Auctioning system to determine the set of Parachains in operation. This includes logic for the
-//! auctioning mechanism and for reserving balance as part of the "payment". Unreserving the balance
-//! happens elsewhere.
-
-use crate::{
-	slot_range::SlotRange,
-	traits::{AuctionStatus, Auctioneer, LeaseError, Leaser, Registrar},
-};
-use alloc::{vec, vec::Vec};
-use codec::Decode;
-use core::mem::swap;
-use frame_support::{
-	dispatch::DispatchResult,
-	ensure,
-	traits::{Currency, Get, Randomness, ReservableCurrency},
-	weights::Weight,
-};
-use frame_system::pallet_prelude::BlockNumberFor;
-pub use pallet::*;
-use polkadot_primitives::Id as ParaId;
-use sp_runtime::traits::{CheckedSub, One, Saturating, Zero};
-
-type CurrencyOf<T> = <<T as Config>::Leaser as Leaser<BlockNumberFor<T>>>::Currency;
-type BalanceOf<T> = <<<T as Config>::Leaser as Leaser<BlockNumberFor<T>>>::Currency as Currency<
-	<T as frame_system::Config>::AccountId,
->>::Balance;
-
-pub trait WeightInfo {
-	fn new_auction() -> Weight;
-	fn bid() -> Weight;
-	fn cancel_auction() -> Weight;
-	fn on_initialize() -> Weight;
-}
-
-pub struct TestWeightInfo;
-impl WeightInfo for TestWeightInfo {
-	fn new_auction() -> Weight {
-		Weight::zero()
-	}
-	fn bid() -> Weight {
-		Weight::zero()
-	}
-	fn cancel_auction() -> Weight {
-		Weight::zero()
-	}
-	fn on_initialize() -> Weight {
-		Weight::zero()
-	}
-}
-
-/// An auction index. We count auctions in this type.
-pub type AuctionIndex = u32;
-
-type LeasePeriodOf<T> = <<T as Config>::Leaser as Leaser<BlockNumberFor<T>>>::LeasePeriod;
-
-// Winning data type. This encodes the top bidders of each range together with their bid.
-type WinningData<T> = [Option<(<T as frame_system::Config>::AccountId, ParaId, BalanceOf<T>)>;
-	SlotRange::SLOT_RANGE_COUNT];
-// Winners data type. This encodes each of the final winners of a parachain auction, the parachain
-// index assigned to them, their winning bid and the range that they won.
-type WinnersData<T> =
-	Vec<(<T as frame_system::Config>::AccountId, ParaId, BalanceOf<T>, SlotRange)>;
-
-#[frame_support::pallet]
-pub mod pallet {
-	use super::*;
-	use frame_support::{dispatch::DispatchClass, pallet_prelude::*, traits::EnsureOrigin};
-	use frame_system::{ensure_root, ensure_signed, pallet_prelude::*};
-
-	#[pallet::pallet]
-	pub struct Pallet<T>(_);
-
-	/// The module's configuration trait.
-	#[pallet::config]
-	pub trait Config: frame_system::Config {
-		/// The overarching event type.
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-
-		/// The type representing the leasing system.
-		type Leaser: Leaser<
-			BlockNumberFor<Self>,
-			AccountId = Self::AccountId,
-			LeasePeriod = BlockNumberFor<Self>,
-		>;
-
-		/// The parachain registrar type.
-		type Registrar: Registrar<AccountId = Self::AccountId>;
-
-		/// The number of blocks over which an auction may be retroactively ended.
-		#[pallet::constant]
-		type EndingPeriod: Get<BlockNumberFor<Self>>;
-
-		/// The length of each sample to take during the ending period.
-		///
-		/// `EndingPeriod` / `SampleLength` = Total # of Samples
-		#[pallet::constant]
-		type SampleLength: Get<BlockNumberFor<Self>>;
-
-		/// Something that provides randomness in the runtime.
-		type Randomness: Randomness<Self::Hash, BlockNumberFor<Self>>;
-
-		/// The origin which may initiate auctions.
-		type InitiateOrigin: EnsureOrigin<Self::RuntimeOrigin>;
-
-		/// Weight Information for the Extrinsics in the Pallet
-		type WeightInfo: WeightInfo;
-	}
-
-	#[pallet::event]
-	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	pub enum Event<T: Config> {
-		/// An auction started. Provides its index and the block number where it will begin to
-		/// close and the first lease period of the quadruplet that is auctioned.
-		AuctionStarted {
-			auction_index: AuctionIndex,
-			lease_period: LeasePeriodOf<T>,
-			ending: BlockNumberFor<T>,
-		},
-		/// An auction ended. All funds become unreserved.
-		AuctionClosed { auction_index: AuctionIndex },
-		/// Funds were reserved for a winning bid. First balance is the extra amount reserved.
-		/// Second is the total.
-		Reserved { bidder: T::AccountId, extra_reserved: BalanceOf<T>, total_amount: BalanceOf<T> },
-		/// Funds were unreserved since bidder is no longer active. `[bidder, amount]`
-		Unreserved { bidder: T::AccountId, amount: BalanceOf<T> },
-		/// Someone attempted to lease the same slot twice for a parachain. The amount is held in
-		/// reserve but no parachain slot has been leased.
-		ReserveConfiscated { para_id: ParaId, leaser: T::AccountId, amount: BalanceOf<T> },
-		/// A new bid has been accepted as the current winner.
-		BidAccepted {
-			bidder: T::AccountId,
-			para_id: ParaId,
-			amount: BalanceOf<T>,
-			first_slot: LeasePeriodOf<T>,
-			last_slot: LeasePeriodOf<T>,
-		},
-		/// The winning offset was chosen for an auction. This will map into the `Winning` storage
-		/// map.
-		WinningOffset { auction_index: AuctionIndex, block_number: BlockNumberFor<T> },
-	}
-
-	#[pallet::error]
-	pub enum Error<T> {
-		/// This auction is already in progress.
-		AuctionInProgress,
-		/// The lease period is in the past.
-		LeasePeriodInPast,
-		/// Para is not registered
-		ParaNotRegistered,
-		/// Not a current auction.
-		NotCurrentAuction,
-		/// Not an auction.
-		NotAuction,
-		/// Auction has already ended.
-		AuctionEnded,
-		/// The para is already leased out for part of this range.
-		AlreadyLeasedOut,
-	}
-
-	/// Number of auctions started so far.
-	#[pallet::storage]
-	pub type AuctionCounter<T> = StorageValue<_, AuctionIndex, ValueQuery>;
-
-	/// Information relating to the current auction, if there is one.
-	///
-	/// The first item in the tuple is the lease period index that the first of the four
-	/// contiguous lease periods on auction is for. The second is the block number when the
-	/// auction will "begin to end", i.e. the first block of the Ending Period of the auction.
-	#[pallet::storage]
-	pub type AuctionInfo<T: Config> = StorageValue<_, (LeasePeriodOf<T>, BlockNumberFor<T>)>;
-
-	/// Amounts currently reserved in the accounts of the bidders currently winning
-	/// (sub-)ranges.
-	#[pallet::storage]
-	pub type ReservedAmounts<T: Config> =
-		StorageMap<_, Twox64Concat, (T::AccountId, ParaId), BalanceOf<T>>;
-
-	/// The winning bids for each of the 10 ranges at each sample in the final Ending Period of
-	/// the current auction. The map's key is the 0-based index into the Sample Size. The
-	/// first sample of the ending period is 0; the last is `Sample Size - 1`.
-	#[pallet::storage]
-	pub type Winning<T: Config> = StorageMap<_, Twox64Concat, BlockNumberFor<T>, WinningData<T>>;
-
-	#[pallet::extra_constants]
-	impl<T: Config> Pallet<T> {
-		#[pallet::constant_name(SlotRangeCount)]
-		fn slot_range_count() -> u32 {
-			SlotRange::SLOT_RANGE_COUNT as u32
-		}
-
-		#[pallet::constant_name(LeasePeriodsPerSlot)]
-		fn lease_periods_per_slot() -> u32 {
-			SlotRange::LEASE_PERIODS_PER_SLOT as u32
-		}
-	}
-
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		fn on_initialize(n: BlockNumberFor<T>) -> Weight {
-			let mut weight = T::DbWeight::get().reads(1);
-
-			// If the current auction was in its ending period last block, then ensure that the
-			// (sub-)range winner information is duplicated from the previous block in case no bids
-			// happened in the last block.
-			if let AuctionStatus::EndingPeriod(offset, _sub_sample) = Self::auction_status(n) {
-				weight = weight.saturating_add(T::DbWeight::get().reads(1));
-				if !Winning::<T>::contains_key(&offset) {
-					weight = weight.saturating_add(T::DbWeight::get().writes(1));
-					let winning_data = offset
-						.checked_sub(&One::one())
-						.and_then(Winning::<T>::get)
-						.unwrap_or([Self::EMPTY; SlotRange::SLOT_RANGE_COUNT]);
-					Winning::<T>::insert(offset, winning_data);
-				}
-			}
-
-			// Check to see if an auction just ended.
-			if let Some((winning_ranges, auction_lease_period_index)) = Self::check_auction_end(n) {
-				// Auction is ended now. We have the winning ranges and the lease period index which
-				// acts as the offset. Handle it.
-				Self::manage_auction_end(auction_lease_period_index, winning_ranges);
-				weight = weight.saturating_add(T::WeightInfo::on_initialize());
-			}
-
-			weight
-		}
-	}
-
-	#[pallet::call]
-	impl<T: Config> Pallet<T> {
-		/// Create a new auction.
-		///
-		/// This can only happen when there isn't already an auction in progress and may only be
-		/// called by the root origin. Accepts the `duration` of this auction and the
-		/// `lease_period_index` of the initial lease period of the four that are to be auctioned.
-		#[pallet::call_index(0)]
-		#[pallet::weight((T::WeightInfo::new_auction(), DispatchClass::Operational))]
-		pub fn new_auction(
-			origin: OriginFor<T>,
-			#[pallet::compact] duration: BlockNumberFor<T>,
-			#[pallet::compact] lease_period_index: LeasePeriodOf<T>,
-		) -> DispatchResult {
-			T::InitiateOrigin::ensure_origin(origin)?;
-			Self::do_new_auction(duration, lease_period_index)
-		}
-
-		/// Make a new bid from an account (including a parachain account) for deploying a new
-		/// parachain.
-		///
-		/// Multiple simultaneous bids from the same bidder are allowed only as long as all active
-		/// bids overlap each other (i.e. are mutually exclusive). Bids cannot be redacted.
-		///
-		/// - `sub` is the sub-bidder ID, allowing for multiple competing bids to be made by (and
-		/// funded by) the same account.
-		/// - `auction_index` is the index of the auction to bid on. Should just be the present
-		/// value of `AuctionCounter`.
-		/// - `first_slot` is the first lease period index of the range to bid on. This is the
-		/// absolute lease period index value, not an auction-specific offset.
-		/// - `last_slot` is the last lease period index of the range to bid on. This is the
-		/// absolute lease period index value, not an auction-specific offset.
-		/// - `amount` is the amount to bid to be held as deposit for the parachain should the
-		/// bid win. This amount is held throughout the range.
-		#[pallet::call_index(1)]
-		#[pallet::weight(T::WeightInfo::bid())]
-		pub fn bid(
-			origin: OriginFor<T>,
-			#[pallet::compact] para: ParaId,
-			#[pallet::compact] auction_index: AuctionIndex,
-			#[pallet::compact] first_slot: LeasePeriodOf<T>,
-			#[pallet::compact] last_slot: LeasePeriodOf<T>,
-			#[pallet::compact] amount: BalanceOf<T>,
-		) -> DispatchResult {
-			let who = ensure_signed(origin)?;
-			Self::handle_bid(who, para, auction_index, first_slot, last_slot, amount)?;
-			Ok(())
-		}
-
-		/// Cancel an in-progress auction.
-		///
-		/// Can only be called by Root origin.
-		#[pallet::call_index(2)]
-		#[pallet::weight(T::WeightInfo::cancel_auction())]
-		pub fn cancel_auction(origin: OriginFor<T>) -> DispatchResult {
-			ensure_root(origin)?;
-			// Unreserve all bids.
-			for ((bidder, _), amount) in ReservedAmounts::<T>::drain() {
-				CurrencyOf::<T>::unreserve(&bidder, amount);
-			}
-			#[allow(deprecated)]
-			Winning::<T>::remove_all(None);
-			AuctionInfo::<T>::kill();
-			Ok(())
-		}
-	}
-}
-
-impl<T: Config> Auctioneer<BlockNumberFor<T>> for Pallet<T> {
-	type AccountId = T::AccountId;
-	type LeasePeriod = BlockNumberFor<T>;
-	type Currency = CurrencyOf<T>;
-
-	fn new_auction(
-		duration: BlockNumberFor<T>,
-		lease_period_index: LeasePeriodOf<T>,
-	) -> DispatchResult {
-		Self::do_new_auction(duration, lease_period_index)
-	}
-
-	// Returns the status of the auction given the current block number.
-	fn auction_status(now: BlockNumberFor<T>) -> AuctionStatus<BlockNumberFor<T>> {
-		let early_end = match AuctionInfo::<T>::get() {
-			Some((_, early_end)) => early_end,
-			None => return AuctionStatus::NotStarted,
-		};
-
-		let after_early_end = match now.checked_sub(&early_end) {
-			Some(after_early_end) => after_early_end,
-			None => return AuctionStatus::StartingPeriod,
-		};
-
-		let ending_period = T::EndingPeriod::get();
-		if after_early_end < ending_period {
-			let sample_length = T::SampleLength::get().max(One::one());
-			let sample = after_early_end / sample_length;
-			let sub_sample = after_early_end % sample_length;
-			return AuctionStatus::EndingPeriod(sample, sub_sample);
-		} else {
-			// This is safe because of the comparison operator above
-			return AuctionStatus::VrfDelay(after_early_end - ending_period);
-		}
-	}
-
-	fn place_bid(
-		bidder: T::AccountId,
-		para: ParaId,
-		first_slot: LeasePeriodOf<T>,
-		last_slot: LeasePeriodOf<T>,
-		amount: BalanceOf<T>,
-	) -> DispatchResult {
-		Self::handle_bid(bidder, para, AuctionCounter::<T>::get(), first_slot, last_slot, amount)
-	}
-
-	fn lease_period_index(b: BlockNumberFor<T>) -> Option<(Self::LeasePeriod, bool)> {
-		T::Leaser::lease_period_index(b)
-	}
-
-	#[cfg(any(feature = "runtime-benchmarks", test))]
-	fn lease_period_length() -> (BlockNumberFor<T>, BlockNumberFor<T>) {
-		T::Leaser::lease_period_length()
-	}
-
-	fn has_won_an_auction(para: ParaId, bidder: &T::AccountId) -> bool {
-		!T::Leaser::deposit_held(para, bidder).is_zero()
-	}
-}
-
-impl<T: Config> Pallet<T> {
-	// A trick to allow me to initialize large arrays with nothing in them.
-	const EMPTY: Option<(<T as frame_system::Config>::AccountId, ParaId, BalanceOf<T>)> = None;
-
-	/// Create a new auction.
-	///
-	/// This can only happen when there isn't already an auction in progress. Accepts the `duration`
-	/// of this auction and the `lease_period_index` of the initial lease period of the four that
-	/// are to be auctioned.
-	fn do_new_auction(
-		duration: BlockNumberFor<T>,
-		lease_period_index: LeasePeriodOf<T>,
-	) -> DispatchResult {
-		let maybe_auction = AuctionInfo::<T>::get();
-		ensure!(maybe_auction.is_none(), Error::<T>::AuctionInProgress);
-		let now = frame_system::Pallet::<T>::block_number();
-		if let Some((current_lease_period, _)) = T::Leaser::lease_period_index(now) {
-			// If there is no active lease period, then we don't need to make this check.
-			ensure!(lease_period_index >= current_lease_period, Error::<T>::LeasePeriodInPast);
-		}
-
-		// Bump the counter.
-		let n = AuctionCounter::<T>::mutate(|n| {
-			*n += 1;
-			*n
-		});
-
-		// Set the information.
-		let ending = frame_system::Pallet::<T>::block_number().saturating_add(duration);
-		AuctionInfo::<T>::put((lease_period_index, ending));
-
-		Self::deposit_event(Event::<T>::AuctionStarted {
-			auction_index: n,
-			lease_period: lease_period_index,
-			ending,
-		});
-		Ok(())
-	}
-
-	/// Actually place a bid in the current auction.
-	///
-	/// - `bidder`: The account that will be funding this bid.
-	/// - `auction_index`: The auction index of the bid. For this to succeed, must equal
-	/// the current value of `AuctionCounter`.
-	/// - `first_slot`: The first lease period index of the range to be bid on.
-	/// - `last_slot`: The last lease period index of the range to be bid on (inclusive).
-	/// - `amount`: The total amount to be the bid for deposit over the range.
-	pub fn handle_bid(
-		bidder: T::AccountId,
-		para: ParaId,
-		auction_index: u32,
-		first_slot: LeasePeriodOf<T>,
-		last_slot: LeasePeriodOf<T>,
-		amount: BalanceOf<T>,
-	) -> DispatchResult {
-		// Ensure para is registered before placing a bid on it.
-		ensure!(T::Registrar::is_registered(para), Error::<T>::ParaNotRegistered);
-		// Bidding on latest auction.
-		ensure!(auction_index == AuctionCounter::<T>::get(), Error::<T>::NotCurrentAuction);
-		// Assume it's actually an auction (this should never fail because of above).
-		let (first_lease_period, _) = AuctionInfo::<T>::get().ok_or(Error::<T>::NotAuction)?;
-
-		// Get the auction status and the current sample block. For the starting period, the sample
-		// block is zero.
-		let auction_status = Self::auction_status(frame_system::Pallet::<T>::block_number());
-		// The offset into the ending samples of the auction.
-		let offset = match auction_status {
-			AuctionStatus::NotStarted => return Err(Error::<T>::AuctionEnded.into()),
-			AuctionStatus::StartingPeriod => Zero::zero(),
-			AuctionStatus::EndingPeriod(o, _) => o,
-			AuctionStatus::VrfDelay(_) => return Err(Error::<T>::AuctionEnded.into()),
-		};
-
-		// We also make sure that the bid is not for any existing leases the para already has.
-		ensure!(
-			!T::Leaser::already_leased(para, first_slot, last_slot),
-			Error::<T>::AlreadyLeasedOut
-		);
-
-		// Our range.
-		let range = SlotRange::new_bounded(first_lease_period, first_slot, last_slot)?;
-		// Range as an array index.
-		let range_index = range as u8 as usize;
-
-		// The current winning ranges.
-		let mut current_winning = Winning::<T>::get(offset)
-			.or_else(|| offset.checked_sub(&One::one()).and_then(Winning::<T>::get))
-			.unwrap_or([Self::EMPTY; SlotRange::SLOT_RANGE_COUNT]);
-
-		// If this bid beat the previous winner of our range.
-		if current_winning[range_index].as_ref().map_or(true, |last| amount > last.2) {
-			// Ok; we are the new winner of this range - reserve the additional amount and record.
-
-			// Get the amount already held on deposit if this is a renewal bid (i.e. there's
-			// an existing lease on the same para by the same leaser).
-			let existing_lease_deposit = T::Leaser::deposit_held(para, &bidder);
-			let reserve_required = amount.saturating_sub(existing_lease_deposit);
-
-			// Get the amount already reserved in any prior and still active bids by us.
-			let bidder_para = (bidder.clone(), para);
-			let already_reserved = ReservedAmounts::<T>::get(&bidder_para).unwrap_or_default();
-
-			// If these don't already cover the bid...
-			if let Some(additional) = reserve_required.checked_sub(&already_reserved) {
-				// ...then reserve some more funds from their account, failing if there's not
-				// enough funds.
-				CurrencyOf::<T>::reserve(&bidder, additional)?;
-				// ...and record the amount reserved.
-				ReservedAmounts::<T>::insert(&bidder_para, reserve_required);
-
-				Self::deposit_event(Event::<T>::Reserved {
-					bidder: bidder.clone(),
-					extra_reserved: additional,
-					total_amount: reserve_required,
-				});
-			}
-
-			// Return any funds reserved for the previous winner if we are not in the ending period
-			// and they no longer have any active bids.
-			let mut outgoing_winner = Some((bidder.clone(), para, amount));
-			swap(&mut current_winning[range_index], &mut outgoing_winner);
-			if let Some((who, para, _amount)) = outgoing_winner {
-				if auction_status.is_starting() &&
-					current_winning
-						.iter()
-						.filter_map(Option::as_ref)
-						.all(|&(ref other, other_para, _)| other != &who || other_para != para)
-				{
-					// Previous bidder is no longer winning any ranges: unreserve their funds.
-					if let Some(amount) = ReservedAmounts::<T>::take(&(who.clone(), para)) {
-						// It really should be reserved; there's not much we can do here on fail.
-						let err_amt = CurrencyOf::<T>::unreserve(&who, amount);
-						debug_assert!(err_amt.is_zero());
-						Self::deposit_event(Event::<T>::Unreserved { bidder: who, amount });
-					}
-				}
-			}
-
-			// Update the range winner.
-			Winning::<T>::insert(offset, &current_winning);
-			Self::deposit_event(Event::<T>::BidAccepted {
-				bidder,
-				para_id: para,
-				amount,
-				first_slot,
-				last_slot,
-			});
-		}
-		Ok(())
-	}
-
-	/// Some when the auction's end is known (with the end block number). None if it is unknown.
-	/// If `Some` then the block number must be at most the previous block and at least the
-	/// previous block minus `T::EndingPeriod::get()`.
-	///
-	/// This mutates the state, cleaning up `AuctionInfo` and `Winning` in the case of an auction
-	/// ending. An immediately subsequent call with the same argument will always return `None`.
-	fn check_auction_end(now: BlockNumberFor<T>) -> Option<(WinningData<T>, LeasePeriodOf<T>)> {
-		if let Some((lease_period_index, early_end)) = AuctionInfo::<T>::get() {
-			let ending_period = T::EndingPeriod::get();
-			let late_end = early_end.saturating_add(ending_period);
-			let is_ended = now >= late_end;
-			if is_ended {
-				// auction definitely ended.
-				// check to see if we can determine the actual ending point.
-				let (raw_offset, known_since) = T::Randomness::random(&b"para_auction"[..]);
-
-				if late_end <= known_since {
-					// Our random seed was known only after the auction ended. Good to use.
-					let raw_offset_block_number = <BlockNumberFor<T>>::decode(
-						&mut raw_offset.as_ref(),
-					)
-					.expect("secure hashes should always be bigger than the block number; qed");
-					let offset = (raw_offset_block_number % ending_period) /
-						T::SampleLength::get().max(One::one());
-
-					let auction_counter = AuctionCounter::<T>::get();
-					Self::deposit_event(Event::<T>::WinningOffset {
-						auction_index: auction_counter,
-						block_number: offset,
-					});
-					let res = Winning::<T>::get(offset)
-						.unwrap_or([Self::EMPTY; SlotRange::SLOT_RANGE_COUNT]);
-					// This `remove_all` statement should remove at most `EndingPeriod` /
-					// `SampleLength` items, which should be bounded and sensibly configured in the
-					// runtime.
-					#[allow(deprecated)]
-					Winning::<T>::remove_all(None);
-					AuctionInfo::<T>::kill();
-					return Some((res, lease_period_index));
-				}
-			}
-		}
-		None
-	}
-
-	/// Auction just ended. We have the current lease period, the auction's lease period (which
-	/// is guaranteed to be at least the current period) and the bidders that were winning each
-	/// range at the time of the auction's close.
-	fn manage_auction_end(
-		auction_lease_period_index: LeasePeriodOf<T>,
-		winning_ranges: WinningData<T>,
-	) {
-		// First, unreserve all amounts that were reserved for the bids. We will later re-reserve
-		// the amounts from the bidders that ended up being assigned the slot so there's no need to
-		// special-case them here.
-		for ((bidder, _), amount) in ReservedAmounts::<T>::drain() {
-			CurrencyOf::<T>::unreserve(&bidder, amount);
-		}
-
-		// Next, calculate the winning combination of slots and thus the final winners of the
-		// auction.
-		let winners = Self::calculate_winners(winning_ranges);
-
-		// Go through those winners and re-reserve their bid, updating our table of deposits
-		// accordingly.
-		for (leaser, para, amount, range) in winners.into_iter() {
-			let begin_offset = LeasePeriodOf::<T>::from(range.as_pair().0 as u32);
-			let period_begin = auction_lease_period_index + begin_offset;
-			let period_count = LeasePeriodOf::<T>::from(range.len() as u32);
-
-			match T::Leaser::lease_out(para, &leaser, amount, period_begin, period_count) {
-				Err(LeaseError::ReserveFailed) |
-				Err(LeaseError::AlreadyEnded) |
-				Err(LeaseError::NoLeasePeriod) => {
-					// Should never happen since we just unreserved this amount (and our offset is
-					// from the present period). But if it does, there's not much we can do.
-				},
-				Err(LeaseError::AlreadyLeased) => {
-					// The leaser attempted to get a second lease on the same para ID, possibly
-					// griefing us. Let's keep the amount reserved and let governance sort it out.
-					if CurrencyOf::<T>::reserve(&leaser, amount).is_ok() {
-						Self::deposit_event(Event::<T>::ReserveConfiscated {
-							para_id: para,
-							leaser,
-							amount,
-						});
-					}
-				},
-				Ok(()) => {}, // Nothing to report.
-			}
-		}
-
-		Self::deposit_event(Event::<T>::AuctionClosed {
-			auction_index: AuctionCounter::<T>::get(),
-		});
-	}
-
-	/// Calculate the final winners from the winning slots.
-	///
-	/// This is a simple dynamic programming algorithm designed by Al, the original code is at:
-	/// `https://github.com/w3f/consensus/blob/master/NPoS/auctiondynamicthing.py`
-	fn calculate_winners(mut winning: WinningData<T>) -> WinnersData<T> {
-		let winning_ranges = {
-			let mut best_winners_ending_at: [(Vec<SlotRange>, BalanceOf<T>);
-				SlotRange::LEASE_PERIODS_PER_SLOT] = Default::default();
-			let best_bid = |range: SlotRange| {
-				winning[range as u8 as usize]
-					.as_ref()
-					.map(|(_, _, amount)| *amount * (range.len() as u32).into())
-			};
-			for i in 0..SlotRange::LEASE_PERIODS_PER_SLOT {
-				let r = SlotRange::new_bounded(0, 0, i as u32).expect("`i < LPPS`; qed");
-				if let Some(bid) = best_bid(r) {
-					best_winners_ending_at[i] = (vec![r], bid);
-				}
-				for j in 0..i {
-					let r = SlotRange::new_bounded(0, j as u32 + 1, i as u32)
-						.expect("`i < LPPS`; `j < i`; `j + 1 < LPPS`; qed");
-					if let Some(mut bid) = best_bid(r) {
-						bid += best_winners_ending_at[j].1;
-						if bid > best_winners_ending_at[i].1 {
-							let mut new_winners = best_winners_ending_at[j].0.clone();
-							new_winners.push(r);
-							best_winners_ending_at[i] = (new_winners, bid);
-						}
-					} else {
-						if best_winners_ending_at[j].1 > best_winners_ending_at[i].1 {
-							best_winners_ending_at[i] = best_winners_ending_at[j].clone();
-						}
-					}
-				}
-			}
-			best_winners_ending_at[SlotRange::LEASE_PERIODS_PER_SLOT - 1].0.clone()
-		};
-
-		winning_ranges
-			.into_iter()
-			.filter_map(|range| {
-				winning[range as u8 as usize]
-					.take()
-					.map(|(bidder, para, amount)| (bidder, para, amount, range))
-			})
-			.collect::<Vec<_>>()
-	}
-}
-
-/// tests for this module
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::{auctions, mock::TestRegistrar};
-	use frame_support::{
-		assert_noop, assert_ok, assert_storage_noop, derive_impl, ord_parameter_types,
-		parameter_types,
-		traits::{EitherOfDiverse, OnFinalize, OnInitialize},
-	};
-	use frame_system::{EnsureRoot, EnsureSignedBy};
-	use pallet_balances;
-	use polkadot_primitives::{BlockNumber, Id as ParaId};
-	use polkadot_primitives_test_helpers::{dummy_hash, dummy_head_data, dummy_validation_code};
-	use sp_core::H256;
-	use sp_runtime::{
-		traits::{BlakeTwo256, IdentityLookup},
-		BuildStorage,
-		DispatchError::BadOrigin,
-	};
-	use std::{cell::RefCell, collections::BTreeMap};
-
-	type Block = frame_system::mocking::MockBlockU32<Test>;
-
-	frame_support::construct_runtime!(
-		pub enum Test
-		{
-			System: frame_system,
-			Balances: pallet_balances,
-			Auctions: auctions,
-		}
-	);
-
-	#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
-	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::Everything;
-		type BlockWeights = ();
-		type BlockLength = ();
-		type DbWeight = ();
-		type RuntimeOrigin = RuntimeOrigin;
-		type RuntimeCall = RuntimeCall;
-		type Nonce = u64;
-		type Hash = H256;
-		type Hashing = BlakeTwo256;
-		type AccountId = u64;
-		type Lookup = IdentityLookup<Self::AccountId>;
-		type Block = Block;
-		type RuntimeEvent = RuntimeEvent;
-		type Version = ();
-		type PalletInfo = PalletInfo;
-		type AccountData = pallet_balances::AccountData<u64>;
-		type OnNewAccount = ();
-		type OnKilledAccount = ();
-		type SystemWeightInfo = ();
-		type SS58Prefix = ();
-		type OnSetCode = ();
-		type MaxConsumers = frame_support::traits::ConstU32<16>;
-	}
-
-	#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig)]
-	impl pallet_balances::Config for Test {
-		type AccountStore = System;
-	}
-
-	#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Debug)]
-	pub struct LeaseData {
-		leaser: u64,
-		amount: u64,
-	}
-
-	thread_local! {
-		pub static LEASES:
-			RefCell<BTreeMap<(ParaId, BlockNumber), LeaseData>> = RefCell::new(BTreeMap::new());
-	}
-
-	fn leases() -> Vec<((ParaId, BlockNumber), LeaseData)> {
-		LEASES.with(|p| (&*p.borrow()).clone().into_iter().collect::<Vec<_>>())
-	}
-
-	pub struct TestLeaser;
-	impl Leaser<BlockNumber> for TestLeaser {
-		type AccountId = u64;
-		type LeasePeriod = BlockNumber;
-		type Currency = Balances;
-
-		fn lease_out(
-			para: ParaId,
-			leaser: &Self::AccountId,
-			amount: <Self::Currency as Currency<Self::AccountId>>::Balance,
-			period_begin: Self::LeasePeriod,
-			period_count: Self::LeasePeriod,
-		) -> Result<(), LeaseError> {
-			LEASES.with(|l| {
-				let mut leases = l.borrow_mut();
-				let now = System::block_number();
-				let (current_lease_period, _) =
-					Self::lease_period_index(now).ok_or(LeaseError::NoLeasePeriod)?;
-				if period_begin < current_lease_period {
-					return Err(LeaseError::AlreadyEnded);
-				}
-				for period in period_begin..(period_begin + period_count) {
-					if leases.contains_key(&(para, period)) {
-						return Err(LeaseError::AlreadyLeased);
-					}
-					leases.insert((para, period), LeaseData { leaser: *leaser, amount });
-				}
-				Ok(())
-			})
-		}
-
-		fn deposit_held(
-			para: ParaId,
-			leaser: &Self::AccountId,
-		) -> <Self::Currency as Currency<Self::AccountId>>::Balance {
-			leases()
-				.iter()
-				.filter_map(|((id, _period), data)| {
-					if id == &para && &data.leaser == leaser {
-						Some(data.amount)
-					} else {
-						None
-					}
-				})
-				.max()
-				.unwrap_or_default()
-		}
-
-		fn lease_period_length() -> (BlockNumber, BlockNumber) {
-			(10, 0)
-		}
-
-		fn lease_period_index(b: BlockNumber) -> Option<(Self::LeasePeriod, bool)> {
-			let (lease_period_length, offset) = Self::lease_period_length();
-			let b = b.checked_sub(offset)?;
-
-			let lease_period = b / lease_period_length;
-			let first_block = (b % lease_period_length).is_zero();
-
-			Some((lease_period, first_block))
-		}
-
-		fn already_leased(
-			para_id: ParaId,
-			first_period: Self::LeasePeriod,
-			last_period: Self::LeasePeriod,
-		) -> bool {
-			leases().into_iter().any(|((para, period), _data)| {
-				para == para_id && first_period <= period && period <= last_period
-			})
-		}
-	}
-
-	ord_parameter_types! {
-		pub const Six: u64 = 6;
-	}
-
-	type RootOrSix = EitherOfDiverse<EnsureRoot<u64>, EnsureSignedBy<Six, u64>>;
-
-	thread_local! {
-		pub static LAST_RANDOM: RefCell<Option<(H256, u32)>> = RefCell::new(None);
-	}
-	fn set_last_random(output: H256, known_since: u32) {
-		LAST_RANDOM.with(|p| *p.borrow_mut() = Some((output, known_since)))
-	}
-	pub struct TestPastRandomness;
-	impl Randomness<H256, BlockNumber> for TestPastRandomness {
-		fn random(_subject: &[u8]) -> (H256, u32) {
-			LAST_RANDOM.with(|p| {
-				if let Some((output, known_since)) = &*p.borrow() {
-					(*output, *known_since)
-				} else {
-					(H256::zero(), frame_system::Pallet::<Test>::block_number())
-				}
-			})
-		}
-	}
-
-	parameter_types! {
-		pub static EndingPeriod: BlockNumber = 3;
-		pub static SampleLength: BlockNumber = 1;
-	}
-
-	impl Config for Test {
-		type RuntimeEvent = RuntimeEvent;
-		type Leaser = TestLeaser;
-		type Registrar = TestRegistrar<Self>;
-		type EndingPeriod = EndingPeriod;
-		type SampleLength = SampleLength;
-		type Randomness = TestPastRandomness;
-		type InitiateOrigin = RootOrSix;
-		type WeightInfo = crate::auctions::TestWeightInfo;
-	}
-
-	// This function basically just builds a genesis storage key/value store according to
-	// our desired mock up.
-	pub fn new_test_ext() -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
-		pallet_balances::GenesisConfig::<Test> {
-			balances: vec![(1, 10), (2, 20), (3, 30), (4, 40), (5, 50), (6, 60)],
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-		let mut ext: sp_io::TestExternalities = t.into();
-		ext.execute_with(|| {
-			// Register para 0, 1, 2, and 3 for tests
-			assert_ok!(TestRegistrar::<Test>::register(
-				1,
-				0.into(),
-				dummy_head_data(),
-				dummy_validation_code()
-			));
-			assert_ok!(TestRegistrar::<Test>::register(
-				1,
-				1.into(),
-				dummy_head_data(),
-				dummy_validation_code()
-			));
-			assert_ok!(TestRegistrar::<Test>::register(
-				1,
-				2.into(),
-				dummy_head_data(),
-				dummy_validation_code()
-			));
-			assert_ok!(TestRegistrar::<Test>::register(
-				1,
-				3.into(),
-				dummy_head_data(),
-				dummy_validation_code()
-			));
-		});
-		ext
-	}
-
-	fn run_to_block(n: BlockNumber) {
-		while System::block_number() < n {
-			Auctions::on_finalize(System::block_number());
-			Balances::on_finalize(System::block_number());
-			System::on_finalize(System::block_number());
-			System::set_block_number(System::block_number() + 1);
-			System::on_initialize(System::block_number());
-			Balances::on_initialize(System::block_number());
-			Auctions::on_initialize(System::block_number());
-		}
-	}
-
-	#[test]
-	fn basic_setup_works() {
-		new_test_ext().execute_with(|| {
-			assert_eq!(AuctionCounter::<Test>::get(), 0);
-			assert_eq!(TestLeaser::deposit_held(0u32.into(), &1), 0);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::NotStarted
-			);
-
-			run_to_block(10);
-
-			assert_eq!(AuctionCounter::<Test>::get(), 0);
-			assert_eq!(TestLeaser::deposit_held(0u32.into(), &1), 0);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::NotStarted
-			);
-		});
-	}
-
-	#[test]
-	fn can_start_auction() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-
-			assert_noop!(Auctions::new_auction(RuntimeOrigin::signed(1), 5, 1), BadOrigin);
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
-
-			assert_eq!(AuctionCounter::<Test>::get(), 1);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::StartingPeriod
-			);
-		});
-	}
-
-	#[test]
-	fn bidding_works() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 4, 5));
-
-			assert_eq!(Balances::reserved_balance(1), 5);
-			assert_eq!(Balances::free_balance(1), 5);
-			assert_eq!(
-				Winning::<Test>::get(0).unwrap()[SlotRange::ZeroThree as u8 as usize],
-				Some((1, 0.into(), 5))
-			);
-		});
-	}
-
-	#[test]
-	fn under_bidding_works() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
-
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 4, 5));
-
-			assert_storage_noop!({
-				assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), 0.into(), 1, 1, 4, 1));
-			});
-		});
-	}
-
-	#[test]
-	fn over_bidding_works() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 4, 5));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), 0.into(), 1, 1, 4, 6));
-
-			assert_eq!(Balances::reserved_balance(1), 0);
-			assert_eq!(Balances::free_balance(1), 10);
-			assert_eq!(Balances::reserved_balance(2), 6);
-			assert_eq!(Balances::free_balance(2), 14);
-			assert_eq!(
-				Winning::<Test>::get(0).unwrap()[SlotRange::ZeroThree as u8 as usize],
-				Some((2, 0.into(), 6))
-			);
-		});
-	}
-
-	#[test]
-	fn auction_proceeds_correctly() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
-
-			assert_eq!(AuctionCounter::<Test>::get(), 1);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::StartingPeriod
-			);
-
-			run_to_block(2);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::StartingPeriod
-			);
-
-			run_to_block(3);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::StartingPeriod
-			);
-
-			run_to_block(4);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::StartingPeriod
-			);
-
-			run_to_block(5);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::StartingPeriod
-			);
-
-			run_to_block(6);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::EndingPeriod(0, 0)
-			);
-
-			run_to_block(7);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::EndingPeriod(1, 0)
-			);
-
-			run_to_block(8);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::EndingPeriod(2, 0)
-			);
-
-			run_to_block(9);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::NotStarted
-			);
-		});
-	}
-
-	#[test]
-	fn can_win_auction() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 4, 1));
-			assert_eq!(Balances::reserved_balance(1), 1);
-			assert_eq!(Balances::free_balance(1), 9);
-			run_to_block(9);
-
-			assert_eq!(
-				leases(),
-				vec![
-					((0.into(), 1), LeaseData { leaser: 1, amount: 1 }),
-					((0.into(), 2), LeaseData { leaser: 1, amount: 1 }),
-					((0.into(), 3), LeaseData { leaser: 1, amount: 1 }),
-					((0.into(), 4), LeaseData { leaser: 1, amount: 1 }),
-				]
-			);
-			assert_eq!(TestLeaser::deposit_held(0.into(), &1), 1);
-		});
-	}
-
-	#[test]
-	fn can_win_auction_with_late_randomness() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 4, 1));
-			assert_eq!(Balances::reserved_balance(1), 1);
-			assert_eq!(Balances::free_balance(1), 9);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::StartingPeriod
-			);
-			run_to_block(8);
-			// Auction has not yet ended.
-			assert_eq!(leases(), vec![]);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::EndingPeriod(2, 0)
-			);
-			// This will prevent the auction's winner from being decided in the next block, since
-			// the random seed was known before the final bids were made.
-			set_last_random(H256::zero(), 8);
-			// Auction definitely ended now, but we don't know exactly when in the last 3 blocks yet
-			// since no randomness available yet.
-			run_to_block(9);
-			// Auction has now ended... But auction winner still not yet decided, so no leases yet.
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::VrfDelay(0)
-			);
-			assert_eq!(leases(), vec![]);
-
-			// Random seed now updated to a value known at block 9, when the auction ended. This
-			// means that the winner can now be chosen.
-			set_last_random(H256::zero(), 9);
-			run_to_block(10);
-			// Auction ended and winner selected
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::NotStarted
-			);
-			assert_eq!(
-				leases(),
-				vec![
-					((0.into(), 1), LeaseData { leaser: 1, amount: 1 }),
-					((0.into(), 2), LeaseData { leaser: 1, amount: 1 }),
-					((0.into(), 3), LeaseData { leaser: 1, amount: 1 }),
-					((0.into(), 4), LeaseData { leaser: 1, amount: 1 }),
-				]
-			);
-			assert_eq!(TestLeaser::deposit_held(0.into(), &1), 1);
-		});
-	}
-
-	#[test]
-	fn can_win_incomplete_auction() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 4, 4, 5));
-			run_to_block(9);
-
-			assert_eq!(leases(), vec![((0.into(), 4), LeaseData { leaser: 1, amount: 5 }),]);
-			assert_eq!(TestLeaser::deposit_held(0.into(), &1), 5);
-		});
-	}
-
-	#[test]
-	fn should_choose_best_combination() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 1, 1));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), 0.into(), 1, 2, 3, 4));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(3), 0.into(), 1, 4, 4, 2));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 1.into(), 1, 1, 4, 2));
-			run_to_block(9);
-
-			assert_eq!(
-				leases(),
-				vec![
-					((0.into(), 1), LeaseData { leaser: 1, amount: 1 }),
-					((0.into(), 2), LeaseData { leaser: 2, amount: 4 }),
-					((0.into(), 3), LeaseData { leaser: 2, amount: 4 }),
-					((0.into(), 4), LeaseData { leaser: 3, amount: 2 }),
-				]
-			);
-			assert_eq!(TestLeaser::deposit_held(0.into(), &1), 1);
-			assert_eq!(TestLeaser::deposit_held(1.into(), &1), 0);
-			assert_eq!(TestLeaser::deposit_held(0.into(), &2), 4);
-			assert_eq!(TestLeaser::deposit_held(0.into(), &3), 2);
-		});
-	}
-
-	#[test]
-	fn gap_bid_works() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
-
-			// User 1 will make a bid for period 1 and 4 for the same Para 0
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 1, 1));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 4, 4, 4));
-
-			// User 2 and 3 will make a bid for para 1 on period 2 and 3 respectively
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), 1.into(), 1, 2, 2, 2));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(3), 1.into(), 1, 3, 3, 3));
-
-			// Total reserved should be the max of the two
-			assert_eq!(Balances::reserved_balance(1), 4);
-
-			// Other people are reserved correctly too
-			assert_eq!(Balances::reserved_balance(2), 2);
-			assert_eq!(Balances::reserved_balance(3), 3);
-
-			// End the auction.
-			run_to_block(9);
-
-			assert_eq!(
-				leases(),
-				vec![
-					((0.into(), 1), LeaseData { leaser: 1, amount: 1 }),
-					((0.into(), 4), LeaseData { leaser: 1, amount: 4 }),
-					((1.into(), 2), LeaseData { leaser: 2, amount: 2 }),
-					((1.into(), 3), LeaseData { leaser: 3, amount: 3 }),
-				]
-			);
-			assert_eq!(TestLeaser::deposit_held(0.into(), &1), 4);
-			assert_eq!(TestLeaser::deposit_held(1.into(), &2), 2);
-			assert_eq!(TestLeaser::deposit_held(1.into(), &3), 3);
-		});
-	}
-
-	#[test]
-	fn deposit_credit_should_work() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 1, 5));
-			assert_eq!(Balances::reserved_balance(1), 5);
-			run_to_block(10);
-
-			assert_eq!(leases(), vec![((0.into(), 1), LeaseData { leaser: 1, amount: 5 }),]);
-			assert_eq!(TestLeaser::deposit_held(0.into(), &1), 5);
-
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 2));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 2, 2, 2, 6));
-			// Only 1 reserved since we have a deposit credit of 5.
-			assert_eq!(Balances::reserved_balance(1), 1);
-			run_to_block(20);
-
-			assert_eq!(
-				leases(),
-				vec![
-					((0.into(), 1), LeaseData { leaser: 1, amount: 5 }),
-					((0.into(), 2), LeaseData { leaser: 1, amount: 6 }),
-				]
-			);
-			assert_eq!(TestLeaser::deposit_held(0.into(), &1), 6);
-		});
-	}
-
-	#[test]
-	fn deposit_credit_on_alt_para_should_not_count() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 1, 5));
-			assert_eq!(Balances::reserved_balance(1), 5);
-			run_to_block(10);
-
-			assert_eq!(leases(), vec![((0.into(), 1), LeaseData { leaser: 1, amount: 5 }),]);
-			assert_eq!(TestLeaser::deposit_held(0.into(), &1), 5);
-
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 2));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 1.into(), 2, 2, 2, 6));
-			// 6 reserved since we are bidding on a new para; only works because we don't
-			assert_eq!(Balances::reserved_balance(1), 6);
-			run_to_block(20);
-
-			assert_eq!(
-				leases(),
-				vec![
-					((0.into(), 1), LeaseData { leaser: 1, amount: 5 }),
-					((1.into(), 2), LeaseData { leaser: 1, amount: 6 }),
-				]
-			);
-			assert_eq!(TestLeaser::deposit_held(0.into(), &1), 5);
-			assert_eq!(TestLeaser::deposit_held(1.into(), &1), 6);
-		});
-	}
-
-	#[test]
-	fn multiple_bids_work_pre_ending() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
-
-			for i in 1..6u64 {
-				run_to_block(i as _);
-				assert_ok!(Auctions::bid(RuntimeOrigin::signed(i), 0.into(), 1, 1, 4, i));
-				for j in 1..6 {
-					assert_eq!(Balances::reserved_balance(j), if j == i { j } else { 0 });
-					assert_eq!(Balances::free_balance(j), if j == i { j * 9 } else { j * 10 });
-				}
-			}
-
-			run_to_block(9);
-			assert_eq!(
-				leases(),
-				vec![
-					((0.into(), 1), LeaseData { leaser: 5, amount: 5 }),
-					((0.into(), 2), LeaseData { leaser: 5, amount: 5 }),
-					((0.into(), 3), LeaseData { leaser: 5, amount: 5 }),
-					((0.into(), 4), LeaseData { leaser: 5, amount: 5 }),
-				]
-			);
-		});
-	}
-
-	#[test]
-	fn multiple_bids_work_post_ending() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 0, 1));
-
-			for i in 1..6u64 {
-				run_to_block(((i - 1) / 2 + 1) as _);
-				assert_ok!(Auctions::bid(RuntimeOrigin::signed(i), 0.into(), 1, 1, 4, i));
-				for j in 1..6 {
-					assert_eq!(Balances::reserved_balance(j), if j <= i { j } else { 0 });
-					assert_eq!(Balances::free_balance(j), if j <= i { j * 9 } else { j * 10 });
-				}
-			}
-			for i in 1..6u64 {
-				assert_eq!(ReservedAmounts::<Test>::get((i, ParaId::from(0))).unwrap(), i);
-			}
-
-			run_to_block(5);
-			assert_eq!(
-				leases(),
-				(1..=4)
-					.map(|i| ((0.into(), i), LeaseData { leaser: 2, amount: 2 }))
-					.collect::<Vec<_>>()
-			);
-		});
-	}
-
-	#[test]
-	fn incomplete_calculate_winners_works() {
-		let mut winning = [None; SlotRange::SLOT_RANGE_COUNT];
-		winning[SlotRange::ThreeThree as u8 as usize] = Some((1, 0.into(), 1));
-
-		let winners = vec![(1, 0.into(), 1, SlotRange::ThreeThree)];
-
-		assert_eq!(Auctions::calculate_winners(winning), winners);
-	}
-
-	#[test]
-	fn first_incomplete_calculate_winners_works() {
-		let mut winning = [None; SlotRange::SLOT_RANGE_COUNT];
-		winning[0] = Some((1, 0.into(), 1));
-
-		let winners = vec![(1, 0.into(), 1, SlotRange::ZeroZero)];
-
-		assert_eq!(Auctions::calculate_winners(winning), winners);
-	}
-
-	#[test]
-	fn calculate_winners_works() {
-		let mut winning = [None; SlotRange::SLOT_RANGE_COUNT];
-		winning[SlotRange::ZeroZero as u8 as usize] = Some((2, 0.into(), 2));
-		winning[SlotRange::ZeroThree as u8 as usize] = Some((1, 100.into(), 1));
-		winning[SlotRange::OneOne as u8 as usize] = Some((3, 1.into(), 1));
-		winning[SlotRange::TwoTwo as u8 as usize] = Some((1, 2.into(), 53));
-		winning[SlotRange::ThreeThree as u8 as usize] = Some((5, 3.into(), 1));
-
-		let winners = vec![
-			(2, 0.into(), 2, SlotRange::ZeroZero),
-			(3, 1.into(), 1, SlotRange::OneOne),
-			(1, 2.into(), 53, SlotRange::TwoTwo),
-			(5, 3.into(), 1, SlotRange::ThreeThree),
-		];
-		assert_eq!(Auctions::calculate_winners(winning), winners);
-
-		winning[SlotRange::ZeroOne as u8 as usize] = Some((4, 10.into(), 3));
-		let winners = vec![
-			(4, 10.into(), 3, SlotRange::ZeroOne),
-			(1, 2.into(), 53, SlotRange::TwoTwo),
-			(5, 3.into(), 1, SlotRange::ThreeThree),
-		];
-		assert_eq!(Auctions::calculate_winners(winning), winners);
-
-		winning[SlotRange::ZeroThree as u8 as usize] = Some((1, 100.into(), 100));
-		let winners = vec![(1, 100.into(), 100, SlotRange::ZeroThree)];
-		assert_eq!(Auctions::calculate_winners(winning), winners);
-	}
-
-	#[test]
-	fn lower_bids_are_correctly_refunded() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 1, 1));
-			let para_1 = ParaId::from(1_u32);
-			let para_2 = ParaId::from(2_u32);
-
-			// Make a bid and reserve a balance
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), para_1, 1, 1, 4, 9));
-			assert_eq!(Balances::reserved_balance(1), 9);
-			assert_eq!(ReservedAmounts::<Test>::get((1, para_1)), Some(9));
-			assert_eq!(Balances::reserved_balance(2), 0);
-			assert_eq!(ReservedAmounts::<Test>::get((2, para_2)), None);
-
-			// Bigger bid, reserves new balance and returns funds
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), para_2, 1, 1, 4, 19));
-			assert_eq!(Balances::reserved_balance(1), 0);
-			assert_eq!(ReservedAmounts::<Test>::get((1, para_1)), None);
-			assert_eq!(Balances::reserved_balance(2), 19);
-			assert_eq!(ReservedAmounts::<Test>::get((2, para_2)), Some(19));
-		});
-	}
-
-	#[test]
-	fn initialize_winners_in_ending_period_works() {
-		new_test_ext().execute_with(|| {
-			let ed: u64 = <Test as pallet_balances::Config>::ExistentialDeposit::get();
-			assert_eq!(ed, 1);
-			run_to_block(1);
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 9, 1));
-			let para_1 = ParaId::from(1_u32);
-			let para_2 = ParaId::from(2_u32);
-			let para_3 = ParaId::from(3_u32);
-
-			// Make bids
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), para_1, 1, 1, 4, 9));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), para_2, 1, 3, 4, 19));
-
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::StartingPeriod
-			);
-			let mut winning = [None; SlotRange::SLOT_RANGE_COUNT];
-			winning[SlotRange::ZeroThree as u8 as usize] = Some((1, para_1, 9));
-			winning[SlotRange::TwoThree as u8 as usize] = Some((2, para_2, 19));
-			assert_eq!(Winning::<Test>::get(0), Some(winning));
-
-			run_to_block(9);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::StartingPeriod
-			);
-
-			run_to_block(10);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::EndingPeriod(0, 0)
-			);
-			assert_eq!(Winning::<Test>::get(0), Some(winning));
-
-			run_to_block(11);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::EndingPeriod(1, 0)
-			);
-			assert_eq!(Winning::<Test>::get(1), Some(winning));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(3), para_3, 1, 3, 4, 29));
-
-			run_to_block(12);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::EndingPeriod(2, 0)
-			);
-			winning[SlotRange::TwoThree as u8 as usize] = Some((3, para_3, 29));
-			assert_eq!(Winning::<Test>::get(2), Some(winning));
-		});
-	}
-
-	#[test]
-	fn handle_bid_requires_registered_para() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
-			assert_noop!(
-				Auctions::bid(RuntimeOrigin::signed(1), 1337.into(), 1, 1, 4, 1),
-				Error::<Test>::ParaNotRegistered
-			);
-			assert_ok!(TestRegistrar::<Test>::register(
-				1,
-				1337.into(),
-				dummy_head_data(),
-				dummy_validation_code()
-			));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 1337.into(), 1, 1, 4, 1));
-		});
-	}
-
-	#[test]
-	fn handle_bid_checks_existing_lease_periods() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 2, 3, 1));
-			assert_eq!(Balances::reserved_balance(1), 1);
-			assert_eq!(Balances::free_balance(1), 9);
-			run_to_block(9);
-
-			assert_eq!(
-				leases(),
-				vec![
-					((0.into(), 2), LeaseData { leaser: 1, amount: 1 }),
-					((0.into(), 3), LeaseData { leaser: 1, amount: 1 }),
-				]
-			);
-			assert_eq!(TestLeaser::deposit_held(0.into(), &1), 1);
-
-			// Para 1 just won an auction above and won some lease periods.
-			// No bids can work which overlap these periods.
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
-			assert_noop!(
-				Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 2, 1, 4, 1),
-				Error::<Test>::AlreadyLeasedOut,
-			);
-			assert_noop!(
-				Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 2, 1, 2, 1),
-				Error::<Test>::AlreadyLeasedOut,
-			);
-			assert_noop!(
-				Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 2, 3, 4, 1),
-				Error::<Test>::AlreadyLeasedOut,
-			);
-			// This is okay, not an overlapping bid.
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 2, 1, 1, 1));
-		});
-	}
-
-	// Here we will test that taking only 10 samples during the ending period works as expected.
-	#[test]
-	fn less_winning_samples_work() {
-		new_test_ext().execute_with(|| {
-			let ed: u64 = <Test as pallet_balances::Config>::ExistentialDeposit::get();
-			assert_eq!(ed, 1);
-			EndingPeriod::set(30);
-			SampleLength::set(10);
-
-			run_to_block(1);
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 9, 11));
-			let para_1 = ParaId::from(1_u32);
-			let para_2 = ParaId::from(2_u32);
-			let para_3 = ParaId::from(3_u32);
-
-			// Make bids
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), para_1, 1, 11, 14, 9));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), para_2, 1, 13, 14, 19));
-
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::StartingPeriod
-			);
-			let mut winning = [None; SlotRange::SLOT_RANGE_COUNT];
-			winning[SlotRange::ZeroThree as u8 as usize] = Some((1, para_1, 9));
-			winning[SlotRange::TwoThree as u8 as usize] = Some((2, para_2, 19));
-			assert_eq!(Winning::<Test>::get(0), Some(winning));
-
-			run_to_block(9);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::StartingPeriod
-			);
-
-			run_to_block(10);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::EndingPeriod(0, 0)
-			);
-			assert_eq!(Winning::<Test>::get(0), Some(winning));
-
-			// New bids update the current winning
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(3), para_3, 1, 14, 14, 29));
-			winning[SlotRange::ThreeThree as u8 as usize] = Some((3, para_3, 29));
-			assert_eq!(Winning::<Test>::get(0), Some(winning));
-
-			run_to_block(20);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::EndingPeriod(1, 0)
-			);
-			assert_eq!(Winning::<Test>::get(1), Some(winning));
-			run_to_block(25);
-			// Overbid mid sample
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(3), para_3, 1, 13, 14, 29));
-			winning[SlotRange::TwoThree as u8 as usize] = Some((3, para_3, 29));
-			assert_eq!(Winning::<Test>::get(1), Some(winning));
-
-			run_to_block(30);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::EndingPeriod(2, 0)
-			);
-			assert_eq!(Winning::<Test>::get(2), Some(winning));
-
-			set_last_random(H256::from([254; 32]), 40);
-			run_to_block(40);
-			// Auction ended and winner selected
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::NotStarted
-			);
-			assert_eq!(
-				leases(),
-				vec![
-					((3.into(), 13), LeaseData { leaser: 3, amount: 29 }),
-					((3.into(), 14), LeaseData { leaser: 3, amount: 29 }),
-				]
-			);
-		});
-	}
-
-	#[test]
-	fn auction_status_works() {
-		new_test_ext().execute_with(|| {
-			EndingPeriod::set(30);
-			SampleLength::set(10);
-			set_last_random(dummy_hash(), 0);
-
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::NotStarted
-			);
-
-			run_to_block(1);
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 9, 11));
-
-			run_to_block(9);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::StartingPeriod
-			);
-
-			run_to_block(10);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::EndingPeriod(0, 0)
-			);
-
-			run_to_block(11);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::EndingPeriod(0, 1)
-			);
-
-			run_to_block(19);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::EndingPeriod(0, 9)
-			);
-
-			run_to_block(20);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::EndingPeriod(1, 0)
-			);
-
-			run_to_block(25);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::EndingPeriod(1, 5)
-			);
-
-			run_to_block(30);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::EndingPeriod(2, 0)
-			);
-
-			run_to_block(39);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::EndingPeriod(2, 9)
-			);
-
-			run_to_block(40);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::VrfDelay(0)
-			);
-
-			run_to_block(44);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::VrfDelay(4)
-			);
-
-			set_last_random(dummy_hash(), 45);
-			run_to_block(45);
-			assert_eq!(
-				Auctions::auction_status(System::block_number()),
-				AuctionStatus::<u32>::NotStarted
-			);
-		});
-	}
-
-	#[test]
-	fn can_cancel_auction() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-			assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
-			assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 4, 1));
-			assert_eq!(Balances::reserved_balance(1), 1);
-			assert_eq!(Balances::free_balance(1), 9);
-
-			assert_noop!(Auctions::cancel_auction(RuntimeOrigin::signed(6)), BadOrigin);
-			assert_ok!(Auctions::cancel_auction(RuntimeOrigin::root()));
-
-			assert!(AuctionInfo::<Test>::get().is_none());
-			assert_eq!(Balances::reserved_balance(1), 0);
-			assert_eq!(ReservedAmounts::<Test>::iter().count(), 0);
-			assert_eq!(Winning::<Test>::iter().count(), 0);
-		});
-	}
-}
-
-#[cfg(feature = "runtime-benchmarks")]
-mod benchmarking {
-	use super::{Pallet as Auctions, *};
-	use frame_support::{
-		assert_ok,
-		traits::{EnsureOrigin, OnInitialize},
-	};
-	use frame_system::RawOrigin;
-	use polkadot_runtime_parachains::paras;
-	use sp_runtime::{traits::Bounded, SaturatedConversion};
-
-	use frame_benchmarking::v2::*;
-
-	fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
-		let events = frame_system::Pallet::<T>::events();
-		let system_event: <T as frame_system::Config>::RuntimeEvent = generic_event.into();
-		// compare to the last event record
-		let frame_system::EventRecord { event, .. } = &events[events.len() - 1];
-		assert_eq!(event, &system_event);
-	}
-
-	fn fill_winners<T: Config + paras::Config>(lease_period_index: LeasePeriodOf<T>) {
-		let auction_index = AuctionCounter::<T>::get();
-		let minimum_balance = CurrencyOf::<T>::minimum_balance();
-
-		for n in 1..=SlotRange::SLOT_RANGE_COUNT as u32 {
-			let owner = account("owner", n, 0);
-			let worst_validation_code = T::Registrar::worst_validation_code();
-			let worst_head_data = T::Registrar::worst_head_data();
-			CurrencyOf::<T>::make_free_balance_be(&owner, BalanceOf::<T>::max_value());
-
-			assert!(T::Registrar::register(
-				owner,
-				ParaId::from(n),
-				worst_head_data,
-				worst_validation_code
-			)
-			.is_ok());
-		}
-		assert_ok!(paras::Pallet::<T>::add_trusted_validation_code(
-			frame_system::Origin::<T>::Root.into(),
-			T::Registrar::worst_validation_code(),
-		));
-
-		T::Registrar::execute_pending_transitions();
-
-		for n in 1..=SlotRange::SLOT_RANGE_COUNT as u32 {
-			let bidder = account("bidder", n, 0);
-			CurrencyOf::<T>::make_free_balance_be(&bidder, BalanceOf::<T>::max_value());
-
-			let slot_range = SlotRange::n((n - 1) as u8).unwrap();
-			let (start, end) = slot_range.as_pair();
-
-			assert!(Auctions::<T>::bid(
-				RawOrigin::Signed(bidder).into(),
-				ParaId::from(n),
-				auction_index,
-				lease_period_index + start.into(),        // First Slot
-				lease_period_index + end.into(),          // Last slot
-				minimum_balance.saturating_mul(n.into()), // Amount
-			)
-			.is_ok());
-		}
-	}
-
-	#[benchmarks(
-		where T: pallet_babe::Config + paras::Config,
-	)]
-	mod benchmarks {
-		use super::*;
-
-		#[benchmark]
-		fn new_auction() -> Result<(), BenchmarkError> {
-			let duration = BlockNumberFor::<T>::max_value();
-			let lease_period_index = LeasePeriodOf::<T>::max_value();
-			let origin = T::InitiateOrigin::try_successful_origin()
-				.map_err(|_| BenchmarkError::Weightless)?;
-
-			#[extrinsic_call]
-			_(origin as T::RuntimeOrigin, duration, lease_period_index);
-
-			assert_last_event::<T>(
-				Event::<T>::AuctionStarted {
-					auction_index: AuctionCounter::<T>::get(),
-					lease_period: LeasePeriodOf::<T>::max_value(),
-					ending: BlockNumberFor::<T>::max_value(),
-				}
-				.into(),
-			);
-
-			Ok(())
-		}
-
-		// Worst case scenario a new bid comes in which kicks out an existing bid for the same slot.
-		#[benchmark]
-		fn bid() -> Result<(), BenchmarkError> {
-			// If there is an offset, we need to be on that block to be able to do lease things.
-			let (_, offset) = T::Leaser::lease_period_length();
-			frame_system::Pallet::<T>::set_block_number(offset + One::one());
-
-			// Create a new auction
-			let duration = BlockNumberFor::<T>::max_value();
-			let lease_period_index = LeasePeriodOf::<T>::zero();
-			let origin = T::InitiateOrigin::try_successful_origin()
-				.expect("InitiateOrigin has no successful origin required for the benchmark");
-			Auctions::<T>::new_auction(origin, duration, lease_period_index)?;
-
-			let para = ParaId::from(0);
-			let new_para = ParaId::from(1_u32);
-
-			// Register the paras
-			let owner = account("owner", 0, 0);
-			CurrencyOf::<T>::make_free_balance_be(&owner, BalanceOf::<T>::max_value());
-			let worst_head_data = T::Registrar::worst_head_data();
-			let worst_validation_code = T::Registrar::worst_validation_code();
-			T::Registrar::register(
-				owner.clone(),
-				para,
-				worst_head_data.clone(),
-				worst_validation_code.clone(),
-			)?;
-			T::Registrar::register(
-				owner,
-				new_para,
-				worst_head_data,
-				worst_validation_code.clone(),
-			)?;
-			assert_ok!(paras::Pallet::<T>::add_trusted_validation_code(
-				frame_system::Origin::<T>::Root.into(),
-				worst_validation_code,
-			));
-
-			T::Registrar::execute_pending_transitions();
-
-			// Make an existing bid
-			let auction_index = AuctionCounter::<T>::get();
-			let first_slot = AuctionInfo::<T>::get().unwrap().0;
-			let last_slot = first_slot + 3u32.into();
-			let first_amount = CurrencyOf::<T>::minimum_balance();
-			let first_bidder: T::AccountId = account("first_bidder", 0, 0);
-			CurrencyOf::<T>::make_free_balance_be(&first_bidder, BalanceOf::<T>::max_value());
-			Auctions::<T>::bid(
-				RawOrigin::Signed(first_bidder.clone()).into(),
-				para,
-				auction_index,
-				first_slot,
-				last_slot,
-				first_amount,
-			)?;
-
-			let caller: T::AccountId = whitelisted_caller();
-			CurrencyOf::<T>::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
-			let bigger_amount = CurrencyOf::<T>::minimum_balance().saturating_mul(10u32.into());
-			assert_eq!(CurrencyOf::<T>::reserved_balance(&first_bidder), first_amount);
-
-			#[extrinsic_call]
-			_(
-				RawOrigin::Signed(caller.clone()),
-				new_para,
-				auction_index,
-				first_slot,
-				last_slot,
-				bigger_amount,
-			);
-
-			// Confirms that we unreserved funds from a previous bidder, which is worst case
-			// scenario.
-			assert_eq!(CurrencyOf::<T>::reserved_balance(&caller), bigger_amount);
-
-			Ok(())
-		}
-
-		// Worst case: 10 bidders taking all wining spots, and we need to calculate the winner for
-		// auction end. Entire winner map should be full and removed at the end of the benchmark.
-		#[benchmark]
-		fn on_initialize() -> Result<(), BenchmarkError> {
-			// If there is an offset, we need to be on that block to be able to do lease things.
-			let (lease_length, offset) = T::Leaser::lease_period_length();
-			frame_system::Pallet::<T>::set_block_number(offset + One::one());
-
-			// Create a new auction
-			let duration: BlockNumberFor<T> = lease_length / 2u32.into();
-			let lease_period_index = LeasePeriodOf::<T>::zero();
-			let now = frame_system::Pallet::<T>::block_number();
-			let origin = T::InitiateOrigin::try_successful_origin()
-				.expect("InitiateOrigin has no successful origin required for the benchmark");
-			Auctions::<T>::new_auction(origin, duration, lease_period_index)?;
-
-			fill_winners::<T>(lease_period_index);
-
-			for winner in Winning::<T>::get(BlockNumberFor::<T>::from(0u32)).unwrap().iter() {
-				assert!(winner.is_some());
-			}
-
-			let winning_data = Winning::<T>::get(BlockNumberFor::<T>::from(0u32)).unwrap();
-			// Make winning map full
-			for i in 0u32..(T::EndingPeriod::get() / T::SampleLength::get()).saturated_into() {
-				Winning::<T>::insert(BlockNumberFor::<T>::from(i), winning_data.clone());
-			}
-
-			// Move ahead to the block we want to initialize
-			frame_system::Pallet::<T>::set_block_number(duration + now + T::EndingPeriod::get());
-
-			// Trigger epoch change for new random number value:
-			{
-				pallet_babe::EpochStart::<T>::set((Zero::zero(), u32::MAX.into()));
-				pallet_babe::Pallet::<T>::on_initialize(duration + now + T::EndingPeriod::get());
-				let authorities = pallet_babe::Pallet::<T>::authorities();
-				// Check for non empty authority set since it otherwise emits a No-OP warning.
-				if !authorities.is_empty() {
-					pallet_babe::Pallet::<T>::enact_epoch_change(
-						authorities.clone(),
-						authorities,
-						None,
-					);
-				}
-			}
-
-			#[block]
-			{
-				Auctions::<T>::on_initialize(duration + now + T::EndingPeriod::get());
-			}
-
-			let auction_index = AuctionCounter::<T>::get();
-			assert_last_event::<T>(Event::<T>::AuctionClosed { auction_index }.into());
-			assert!(Winning::<T>::iter().count().is_zero());
-
-			Ok(())
-		}
-
-		// Worst case: 10 bidders taking all wining spots, and winning data is full.
-		#[benchmark]
-		fn cancel_auction() -> Result<(), BenchmarkError> {
-			// If there is an offset, we need to be on that block to be able to do lease things.
-			let (lease_length, offset) = T::Leaser::lease_period_length();
-			frame_system::Pallet::<T>::set_block_number(offset + One::one());
-
-			// Create a new auction
-			let duration: BlockNumberFor<T> = lease_length / 2u32.into();
-			let lease_period_index = LeasePeriodOf::<T>::zero();
-			let origin = T::InitiateOrigin::try_successful_origin()
-				.expect("InitiateOrigin has no successful origin required for the benchmark");
-			Auctions::<T>::new_auction(origin, duration, lease_period_index)?;
-
-			fill_winners::<T>(lease_period_index);
-
-			let winning_data = Winning::<T>::get(BlockNumberFor::<T>::from(0u32)).unwrap();
-			for winner in winning_data.iter() {
-				assert!(winner.is_some());
-			}
-
-			// Make winning map full
-			for i in 0u32..(T::EndingPeriod::get() / T::SampleLength::get()).saturated_into() {
-				Winning::<T>::insert(BlockNumberFor::<T>::from(i), winning_data.clone());
-			}
-			assert!(AuctionInfo::<T>::get().is_some());
-
-			#[extrinsic_call]
-			_(RawOrigin::Root);
-
-			assert!(AuctionInfo::<T>::get().is_none());
-			Ok(())
-		}
-
-		impl_benchmark_test_suite!(
-			Auctions,
-			crate::integration_tests::new_test_ext(),
-			crate::integration_tests::Test,
-		);
-	}
-}
diff --git a/polkadot/runtime/common/src/auctions/benchmarking.rs b/polkadot/runtime/common/src/auctions/benchmarking.rs
new file mode 100644
index 000000000000..6d52cd850b6f
--- /dev/null
+++ b/polkadot/runtime/common/src/auctions/benchmarking.rs
@@ -0,0 +1,282 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Benchmarking for auctions pallet
+
+#![cfg(feature = "runtime-benchmarks")]
+use super::{Pallet as Auctions, *};
+use frame_support::{
+	assert_ok,
+	traits::{EnsureOrigin, OnInitialize},
+};
+use frame_system::RawOrigin;
+use polkadot_runtime_parachains::paras;
+use sp_runtime::{traits::Bounded, SaturatedConversion};
+
+use frame_benchmarking::v2::*;
+
+fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
+	let events = frame_system::Pallet::<T>::events();
+	let system_event: <T as frame_system::Config>::RuntimeEvent = generic_event.into();
+	// compare to the last event record
+	let frame_system::EventRecord { event, .. } = &events[events.len() - 1];
+	assert_eq!(event, &system_event);
+}
+
+fn fill_winners<T: Config + paras::Config>(lease_period_index: LeasePeriodOf<T>) {
+	let auction_index = AuctionCounter::<T>::get();
+	let minimum_balance = CurrencyOf::<T>::minimum_balance();
+
+	for n in 1..=SlotRange::SLOT_RANGE_COUNT as u32 {
+		let owner = account("owner", n, 0);
+		let worst_validation_code = T::Registrar::worst_validation_code();
+		let worst_head_data = T::Registrar::worst_head_data();
+		CurrencyOf::<T>::make_free_balance_be(&owner, BalanceOf::<T>::max_value());
+
+		assert!(T::Registrar::register(
+			owner,
+			ParaId::from(n),
+			worst_head_data,
+			worst_validation_code
+		)
+		.is_ok());
+	}
+	assert_ok!(paras::Pallet::<T>::add_trusted_validation_code(
+		frame_system::Origin::<T>::Root.into(),
+		T::Registrar::worst_validation_code(),
+	));
+
+	T::Registrar::execute_pending_transitions();
+
+	for n in 1..=SlotRange::SLOT_RANGE_COUNT as u32 {
+		let bidder = account("bidder", n, 0);
+		CurrencyOf::<T>::make_free_balance_be(&bidder, BalanceOf::<T>::max_value());
+
+		let slot_range = SlotRange::n((n - 1) as u8).unwrap();
+		let (start, end) = slot_range.as_pair();
+
+		assert!(Auctions::<T>::bid(
+			RawOrigin::Signed(bidder).into(),
+			ParaId::from(n),
+			auction_index,
+			lease_period_index + start.into(),        // First Slot
+			lease_period_index + end.into(),          // Last slot
+			minimum_balance.saturating_mul(n.into()), // Amount
+		)
+		.is_ok());
+	}
+}
+
+#[benchmarks(
+		where T: pallet_babe::Config + paras::Config,
+	)]
+mod benchmarks {
+	use super::*;
+
+	#[benchmark]
+	fn new_auction() -> Result<(), BenchmarkError> {
+		let duration = BlockNumberFor::<T>::max_value();
+		let lease_period_index = LeasePeriodOf::<T>::max_value();
+		let origin =
+			T::InitiateOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
+
+		#[extrinsic_call]
+		_(origin as T::RuntimeOrigin, duration, lease_period_index);
+
+		assert_last_event::<T>(
+			Event::<T>::AuctionStarted {
+				auction_index: AuctionCounter::<T>::get(),
+				lease_period: LeasePeriodOf::<T>::max_value(),
+				ending: BlockNumberFor::<T>::max_value(),
+			}
+			.into(),
+		);
+
+		Ok(())
+	}
+
+	// Worst case scenario a new bid comes in which kicks out an existing bid for the same slot.
+	#[benchmark]
+	fn bid() -> Result<(), BenchmarkError> {
+		// If there is an offset, we need to be on that block to be able to do lease things.
+		let (_, offset) = T::Leaser::lease_period_length();
+		frame_system::Pallet::<T>::set_block_number(offset + One::one());
+
+		// Create a new auction
+		let duration = BlockNumberFor::<T>::max_value();
+		let lease_period_index = LeasePeriodOf::<T>::zero();
+		let origin = T::InitiateOrigin::try_successful_origin()
+			.expect("InitiateOrigin has no successful origin required for the benchmark");
+		Auctions::<T>::new_auction(origin, duration, lease_period_index)?;
+
+		let para = ParaId::from(0);
+		let new_para = ParaId::from(1_u32);
+
+		// Register the paras
+		let owner = account("owner", 0, 0);
+		CurrencyOf::<T>::make_free_balance_be(&owner, BalanceOf::<T>::max_value());
+		let worst_head_data = T::Registrar::worst_head_data();
+		let worst_validation_code = T::Registrar::worst_validation_code();
+		T::Registrar::register(
+			owner.clone(),
+			para,
+			worst_head_data.clone(),
+			worst_validation_code.clone(),
+		)?;
+		T::Registrar::register(owner, new_para, worst_head_data, worst_validation_code.clone())?;
+		assert_ok!(paras::Pallet::<T>::add_trusted_validation_code(
+			frame_system::Origin::<T>::Root.into(),
+			worst_validation_code,
+		));
+
+		T::Registrar::execute_pending_transitions();
+
+		// Make an existing bid
+		let auction_index = AuctionCounter::<T>::get();
+		let first_slot = AuctionInfo::<T>::get().unwrap().0;
+		let last_slot = first_slot + 3u32.into();
+		let first_amount = CurrencyOf::<T>::minimum_balance();
+		let first_bidder: T::AccountId = account("first_bidder", 0, 0);
+		CurrencyOf::<T>::make_free_balance_be(&first_bidder, BalanceOf::<T>::max_value());
+		Auctions::<T>::bid(
+			RawOrigin::Signed(first_bidder.clone()).into(),
+			para,
+			auction_index,
+			first_slot,
+			last_slot,
+			first_amount,
+		)?;
+
+		let caller: T::AccountId = whitelisted_caller();
+		CurrencyOf::<T>::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+		let bigger_amount = CurrencyOf::<T>::minimum_balance().saturating_mul(10u32.into());
+		assert_eq!(CurrencyOf::<T>::reserved_balance(&first_bidder), first_amount);
+
+		#[extrinsic_call]
+		_(
+			RawOrigin::Signed(caller.clone()),
+			new_para,
+			auction_index,
+			first_slot,
+			last_slot,
+			bigger_amount,
+		);
+
+		// Confirms that we unreserved funds from a previous bidder, which is worst case
+		// scenario.
+		assert_eq!(CurrencyOf::<T>::reserved_balance(&caller), bigger_amount);
+
+		Ok(())
+	}
+
+	// Worst case: 10 bidders taking all wining spots, and we need to calculate the winner for
+	// auction end. Entire winner map should be full and removed at the end of the benchmark.
+	#[benchmark]
+	fn on_initialize() -> Result<(), BenchmarkError> {
+		// If there is an offset, we need to be on that block to be able to do lease things.
+		let (lease_length, offset) = T::Leaser::lease_period_length();
+		frame_system::Pallet::<T>::set_block_number(offset + One::one());
+
+		// Create a new auction
+		let duration: BlockNumberFor<T> = lease_length / 2u32.into();
+		let lease_period_index = LeasePeriodOf::<T>::zero();
+		let now = frame_system::Pallet::<T>::block_number();
+		let origin = T::InitiateOrigin::try_successful_origin()
+			.expect("InitiateOrigin has no successful origin required for the benchmark");
+		Auctions::<T>::new_auction(origin, duration, lease_period_index)?;
+
+		fill_winners::<T>(lease_period_index);
+
+		for winner in Winning::<T>::get(BlockNumberFor::<T>::from(0u32)).unwrap().iter() {
+			assert!(winner.is_some());
+		}
+
+		let winning_data = Winning::<T>::get(BlockNumberFor::<T>::from(0u32)).unwrap();
+		// Make winning map full
+		for i in 0u32..(T::EndingPeriod::get() / T::SampleLength::get()).saturated_into() {
+			Winning::<T>::insert(BlockNumberFor::<T>::from(i), winning_data.clone());
+		}
+
+		// Move ahead to the block we want to initialize
+		frame_system::Pallet::<T>::set_block_number(duration + now + T::EndingPeriod::get());
+
+		// Trigger epoch change for new random number value:
+		{
+			pallet_babe::EpochStart::<T>::set((Zero::zero(), u32::MAX.into()));
+			pallet_babe::Pallet::<T>::on_initialize(duration + now + T::EndingPeriod::get());
+			let authorities = pallet_babe::Pallet::<T>::authorities();
+			// Check for non empty authority set since it otherwise emits a No-OP warning.
+			if !authorities.is_empty() {
+				pallet_babe::Pallet::<T>::enact_epoch_change(
+					authorities.clone(),
+					authorities,
+					None,
+				);
+			}
+		}
+
+		#[block]
+		{
+			Auctions::<T>::on_initialize(duration + now + T::EndingPeriod::get());
+		}
+
+		let auction_index = AuctionCounter::<T>::get();
+		assert_last_event::<T>(Event::<T>::AuctionClosed { auction_index }.into());
+		assert!(Winning::<T>::iter().count().is_zero());
+
+		Ok(())
+	}
+
+	// Worst case: 10 bidders taking all wining spots, and winning data is full.
+	#[benchmark]
+	fn cancel_auction() -> Result<(), BenchmarkError> {
+		// If there is an offset, we need to be on that block to be able to do lease things.
+		let (lease_length, offset) = T::Leaser::lease_period_length();
+		frame_system::Pallet::<T>::set_block_number(offset + One::one());
+
+		// Create a new auction
+		let duration: BlockNumberFor<T> = lease_length / 2u32.into();
+		let lease_period_index = LeasePeriodOf::<T>::zero();
+		let origin = T::InitiateOrigin::try_successful_origin()
+			.expect("InitiateOrigin has no successful origin required for the benchmark");
+		Auctions::<T>::new_auction(origin, duration, lease_period_index)?;
+
+		fill_winners::<T>(lease_period_index);
+
+		let winning_data = Winning::<T>::get(BlockNumberFor::<T>::from(0u32)).unwrap();
+		for winner in winning_data.iter() {
+			assert!(winner.is_some());
+		}
+
+		// Make winning map full
+		for i in 0u32..(T::EndingPeriod::get() / T::SampleLength::get()).saturated_into() {
+			Winning::<T>::insert(BlockNumberFor::<T>::from(i), winning_data.clone());
+		}
+		assert!(AuctionInfo::<T>::get().is_some());
+
+		#[extrinsic_call]
+		_(RawOrigin::Root);
+
+		assert!(AuctionInfo::<T>::get().is_none());
+		Ok(())
+	}
+
+	impl_benchmark_test_suite!(
+		Auctions,
+		crate::integration_tests::new_test_ext(),
+		crate::integration_tests::Test,
+	);
+}
diff --git a/polkadot/runtime/common/src/auctions/mock.rs b/polkadot/runtime/common/src/auctions/mock.rs
new file mode 100644
index 000000000000..9fe19e579cfa
--- /dev/null
+++ b/polkadot/runtime/common/src/auctions/mock.rs
@@ -0,0 +1,258 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Mocking utilities for testing in auctions pallet.
+
+#[cfg(test)]
+use super::*;
+use crate::{auctions, mock::TestRegistrar};
+use frame_support::{
+	assert_ok, derive_impl, ord_parameter_types, parameter_types,
+	traits::{EitherOfDiverse, OnFinalize, OnInitialize},
+};
+use frame_system::{EnsureRoot, EnsureSignedBy};
+use pallet_balances;
+use polkadot_primitives::{BlockNumber, Id as ParaId};
+use polkadot_primitives_test_helpers::{dummy_head_data, dummy_validation_code};
+use sp_core::H256;
+use sp_runtime::{
+	traits::{BlakeTwo256, IdentityLookup},
+	BuildStorage,
+};
+use std::{cell::RefCell, collections::BTreeMap};
+
+type Block = frame_system::mocking::MockBlockU32<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test
+	{
+		System: frame_system,
+		Balances: pallet_balances,
+		Auctions: auctions,
+	}
+);
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
+impl frame_system::Config for Test {
+	type BaseCallFilter = frame_support::traits::Everything;
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
+	type RuntimeOrigin = RuntimeOrigin;
+	type RuntimeCall = RuntimeCall;
+	type Nonce = u64;
+	type Hash = H256;
+	type Hashing = BlakeTwo256;
+	type AccountId = u64;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type Block = Block;
+	type RuntimeEvent = RuntimeEvent;
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = pallet_balances::AccountData<u64>;
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+	type SS58Prefix = ();
+	type OnSetCode = ();
+	type MaxConsumers = frame_support::traits::ConstU32<16>;
+}
+
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig)]
+impl pallet_balances::Config for Test {
+	type AccountStore = System;
+}
+
+#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Debug)]
+pub struct LeaseData {
+	pub leaser: u64,
+	pub amount: u64,
+}
+
+thread_local! {
+	pub static LEASES:
+		RefCell<BTreeMap<(ParaId, BlockNumber), LeaseData>> = RefCell::new(BTreeMap::new());
+}
+
+pub fn leases() -> Vec<((ParaId, BlockNumber), LeaseData)> {
+	LEASES.with(|p| (&*p.borrow()).clone().into_iter().collect::<Vec<_>>())
+}
+
+pub struct TestLeaser;
+impl Leaser<BlockNumber> for TestLeaser {
+	type AccountId = u64;
+	type LeasePeriod = BlockNumber;
+	type Currency = Balances;
+
+	fn lease_out(
+		para: ParaId,
+		leaser: &Self::AccountId,
+		amount: <Self::Currency as Currency<Self::AccountId>>::Balance,
+		period_begin: Self::LeasePeriod,
+		period_count: Self::LeasePeriod,
+	) -> Result<(), LeaseError> {
+		LEASES.with(|l| {
+			let mut leases = l.borrow_mut();
+			let now = System::block_number();
+			let (current_lease_period, _) =
+				Self::lease_period_index(now).ok_or(LeaseError::NoLeasePeriod)?;
+			if period_begin < current_lease_period {
+				return Err(LeaseError::AlreadyEnded);
+			}
+			for period in period_begin..(period_begin + period_count) {
+				if leases.contains_key(&(para, period)) {
+					return Err(LeaseError::AlreadyLeased);
+				}
+				leases.insert((para, period), LeaseData { leaser: *leaser, amount });
+			}
+			Ok(())
+		})
+	}
+
+	fn deposit_held(
+		para: ParaId,
+		leaser: &Self::AccountId,
+	) -> <Self::Currency as Currency<Self::AccountId>>::Balance {
+		leases()
+			.iter()
+			.filter_map(|((id, _period), data)| {
+				if id == &para && &data.leaser == leaser {
+					Some(data.amount)
+				} else {
+					None
+				}
+			})
+			.max()
+			.unwrap_or_default()
+	}
+
+	fn lease_period_length() -> (BlockNumber, BlockNumber) {
+		(10, 0)
+	}
+
+	fn lease_period_index(b: BlockNumber) -> Option<(Self::LeasePeriod, bool)> {
+		let (lease_period_length, offset) = Self::lease_period_length();
+		let b = b.checked_sub(offset)?;
+
+		let lease_period = b / lease_period_length;
+		let first_block = (b % lease_period_length).is_zero();
+
+		Some((lease_period, first_block))
+	}
+
+	fn already_leased(
+		para_id: ParaId,
+		first_period: Self::LeasePeriod,
+		last_period: Self::LeasePeriod,
+	) -> bool {
+		leases().into_iter().any(|((para, period), _data)| {
+			para == para_id && first_period <= period && period <= last_period
+		})
+	}
+}
+
+ord_parameter_types! {
+	pub const Six: u64 = 6;
+}
+
+type RootOrSix = EitherOfDiverse<EnsureRoot<u64>, EnsureSignedBy<Six, u64>>;
+
+thread_local! {
+	pub static LAST_RANDOM: RefCell<Option<(H256, u32)>> = RefCell::new(None);
+}
+pub fn set_last_random(output: H256, known_since: u32) {
+	LAST_RANDOM.with(|p| *p.borrow_mut() = Some((output, known_since)))
+}
+pub struct TestPastRandomness;
+impl Randomness<H256, BlockNumber> for TestPastRandomness {
+	fn random(_subject: &[u8]) -> (H256, u32) {
+		LAST_RANDOM.with(|p| {
+			if let Some((output, known_since)) = &*p.borrow() {
+				(*output, *known_since)
+			} else {
+				(H256::zero(), frame_system::Pallet::<Test>::block_number())
+			}
+		})
+	}
+}
+
+parameter_types! {
+	pub static EndingPeriod: BlockNumber = 3;
+	pub static SampleLength: BlockNumber = 1;
+}
+
+impl Config for Test {
+	type RuntimeEvent = RuntimeEvent;
+	type Leaser = TestLeaser;
+	type Registrar = TestRegistrar<Self>;
+	type EndingPeriod = EndingPeriod;
+	type SampleLength = SampleLength;
+	type Randomness = TestPastRandomness;
+	type InitiateOrigin = RootOrSix;
+	type WeightInfo = crate::auctions::TestWeightInfo;
+}
+
+// This function basically just builds a genesis storage key/value store according to
+// our desired mock up.
+pub fn new_test_ext() -> sp_io::TestExternalities {
+	let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
+	pallet_balances::GenesisConfig::<Test> {
+		balances: vec![(1, 10), (2, 20), (3, 30), (4, 40), (5, 50), (6, 60)],
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
+	let mut ext: sp_io::TestExternalities = t.into();
+	ext.execute_with(|| {
+		// Register para 0, 1, 2, and 3 for tests
+		assert_ok!(TestRegistrar::<Test>::register(
+			1,
+			0.into(),
+			dummy_head_data(),
+			dummy_validation_code()
+		));
+		assert_ok!(TestRegistrar::<Test>::register(
+			1,
+			1.into(),
+			dummy_head_data(),
+			dummy_validation_code()
+		));
+		assert_ok!(TestRegistrar::<Test>::register(
+			1,
+			2.into(),
+			dummy_head_data(),
+			dummy_validation_code()
+		));
+		assert_ok!(TestRegistrar::<Test>::register(
+			1,
+			3.into(),
+			dummy_head_data(),
+			dummy_validation_code()
+		));
+	});
+	ext
+}
+
+pub fn run_to_block(n: BlockNumber) {
+	while System::block_number() < n {
+		Auctions::on_finalize(System::block_number());
+		Balances::on_finalize(System::block_number());
+		System::on_finalize(System::block_number());
+		System::set_block_number(System::block_number() + 1);
+		System::on_initialize(System::block_number());
+		Balances::on_initialize(System::block_number());
+		Auctions::on_initialize(System::block_number());
+	}
+}
diff --git a/polkadot/runtime/common/src/auctions/mod.rs b/polkadot/runtime/common/src/auctions/mod.rs
new file mode 100644
index 000000000000..84d8a3846d40
--- /dev/null
+++ b/polkadot/runtime/common/src/auctions/mod.rs
@@ -0,0 +1,677 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Auctioning system to determine the set of Parachains in operation. This includes logic for the
+//! auctioning mechanism and for reserving balance as part of the "payment". Unreserving the balance
+//! happens elsewhere.
+
+use crate::{
+	slot_range::SlotRange,
+	traits::{AuctionStatus, Auctioneer, LeaseError, Leaser, Registrar},
+};
+use alloc::{vec, vec::Vec};
+use codec::Decode;
+use core::mem::swap;
+use frame_support::{
+	dispatch::DispatchResult,
+	ensure,
+	traits::{Currency, Get, Randomness, ReservableCurrency},
+	weights::Weight,
+};
+use frame_system::pallet_prelude::BlockNumberFor;
+pub use pallet::*;
+use polkadot_primitives::Id as ParaId;
+use sp_runtime::traits::{CheckedSub, One, Saturating, Zero};
+
+type CurrencyOf<T> = <<T as Config>::Leaser as Leaser<BlockNumberFor<T>>>::Currency;
+type BalanceOf<T> = <<<T as Config>::Leaser as Leaser<BlockNumberFor<T>>>::Currency as Currency<
+	<T as frame_system::Config>::AccountId,
+>>::Balance;
+
+pub trait WeightInfo {
+	fn new_auction() -> Weight;
+	fn bid() -> Weight;
+	fn cancel_auction() -> Weight;
+	fn on_initialize() -> Weight;
+}
+
+pub struct TestWeightInfo;
+impl WeightInfo for TestWeightInfo {
+	fn new_auction() -> Weight {
+		Weight::zero()
+	}
+	fn bid() -> Weight {
+		Weight::zero()
+	}
+	fn cancel_auction() -> Weight {
+		Weight::zero()
+	}
+	fn on_initialize() -> Weight {
+		Weight::zero()
+	}
+}
+
+/// An auction index. We count auctions in this type.
+pub type AuctionIndex = u32;
+
+type LeasePeriodOf<T> = <<T as Config>::Leaser as Leaser<BlockNumberFor<T>>>::LeasePeriod;
+
+// Winning data type. This encodes the top bidders of each range together with their bid.
+type WinningData<T> = [Option<(<T as frame_system::Config>::AccountId, ParaId, BalanceOf<T>)>;
+	SlotRange::SLOT_RANGE_COUNT];
+// Winners data type. This encodes each of the final winners of a parachain auction, the parachain
+// index assigned to them, their winning bid and the range that they won.
+type WinnersData<T> =
+	Vec<(<T as frame_system::Config>::AccountId, ParaId, BalanceOf<T>, SlotRange)>;
+
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+	use frame_support::{dispatch::DispatchClass, pallet_prelude::*, traits::EnsureOrigin};
+	use frame_system::{ensure_root, ensure_signed, pallet_prelude::*};
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	/// The module's configuration trait.
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
+
+		/// The type representing the leasing system.
+		type Leaser: Leaser<
+			BlockNumberFor<Self>,
+			AccountId = Self::AccountId,
+			LeasePeriod = BlockNumberFor<Self>,
+		>;
+
+		/// The parachain registrar type.
+		type Registrar: Registrar<AccountId = Self::AccountId>;
+
+		/// The number of blocks over which an auction may be retroactively ended.
+		#[pallet::constant]
+		type EndingPeriod: Get<BlockNumberFor<Self>>;
+
+		/// The length of each sample to take during the ending period.
+		///
+		/// `EndingPeriod` / `SampleLength` = Total # of Samples
+		#[pallet::constant]
+		type SampleLength: Get<BlockNumberFor<Self>>;
+
+		/// Something that provides randomness in the runtime.
+		type Randomness: Randomness<Self::Hash, BlockNumberFor<Self>>;
+
+		/// The origin which may initiate auctions.
+		type InitiateOrigin: EnsureOrigin<Self::RuntimeOrigin>;
+
+		/// Weight Information for the Extrinsics in the Pallet
+		type WeightInfo: WeightInfo;
+	}
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config> {
+		/// An auction started. Provides its index and the block number where it will begin to
+		/// close and the first lease period of the quadruplet that is auctioned.
+		AuctionStarted {
+			auction_index: AuctionIndex,
+			lease_period: LeasePeriodOf<T>,
+			ending: BlockNumberFor<T>,
+		},
+		/// An auction ended. All funds become unreserved.
+		AuctionClosed { auction_index: AuctionIndex },
+		/// Funds were reserved for a winning bid. First balance is the extra amount reserved.
+		/// Second is the total.
+		Reserved { bidder: T::AccountId, extra_reserved: BalanceOf<T>, total_amount: BalanceOf<T> },
+		/// Funds were unreserved since bidder is no longer active. `[bidder, amount]`
+		Unreserved { bidder: T::AccountId, amount: BalanceOf<T> },
+		/// Someone attempted to lease the same slot twice for a parachain. The amount is held in
+		/// reserve but no parachain slot has been leased.
+		ReserveConfiscated { para_id: ParaId, leaser: T::AccountId, amount: BalanceOf<T> },
+		/// A new bid has been accepted as the current winner.
+		BidAccepted {
+			bidder: T::AccountId,
+			para_id: ParaId,
+			amount: BalanceOf<T>,
+			first_slot: LeasePeriodOf<T>,
+			last_slot: LeasePeriodOf<T>,
+		},
+		/// The winning offset was chosen for an auction. This will map into the `Winning` storage
+		/// map.
+		WinningOffset { auction_index: AuctionIndex, block_number: BlockNumberFor<T> },
+	}
+
+	#[pallet::error]
+	pub enum Error<T> {
+		/// This auction is already in progress.
+		AuctionInProgress,
+		/// The lease period is in the past.
+		LeasePeriodInPast,
+		/// Para is not registered
+		ParaNotRegistered,
+		/// Not a current auction.
+		NotCurrentAuction,
+		/// Not an auction.
+		NotAuction,
+		/// Auction has already ended.
+		AuctionEnded,
+		/// The para is already leased out for part of this range.
+		AlreadyLeasedOut,
+	}
+
+	/// Number of auctions started so far.
+	#[pallet::storage]
+	pub type AuctionCounter<T> = StorageValue<_, AuctionIndex, ValueQuery>;
+
+	/// Information relating to the current auction, if there is one.
+	///
+	/// The first item in the tuple is the lease period index that the first of the four
+	/// contiguous lease periods on auction is for. The second is the block number when the
+	/// auction will "begin to end", i.e. the first block of the Ending Period of the auction.
+	#[pallet::storage]
+	pub type AuctionInfo<T: Config> = StorageValue<_, (LeasePeriodOf<T>, BlockNumberFor<T>)>;
+
+	/// Amounts currently reserved in the accounts of the bidders currently winning
+	/// (sub-)ranges.
+	#[pallet::storage]
+	pub type ReservedAmounts<T: Config> =
+		StorageMap<_, Twox64Concat, (T::AccountId, ParaId), BalanceOf<T>>;
+
+	/// The winning bids for each of the 10 ranges at each sample in the final Ending Period of
+	/// the current auction. The map's key is the 0-based index into the Sample Size. The
+	/// first sample of the ending period is 0; the last is `Sample Size - 1`.
+	#[pallet::storage]
+	pub type Winning<T: Config> = StorageMap<_, Twox64Concat, BlockNumberFor<T>, WinningData<T>>;
+
+	#[pallet::extra_constants]
+	impl<T: Config> Pallet<T> {
+		#[pallet::constant_name(SlotRangeCount)]
+		fn slot_range_count() -> u32 {
+			SlotRange::SLOT_RANGE_COUNT as u32
+		}
+
+		#[pallet::constant_name(LeasePeriodsPerSlot)]
+		fn lease_periods_per_slot() -> u32 {
+			SlotRange::LEASE_PERIODS_PER_SLOT as u32
+		}
+	}
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn on_initialize(n: BlockNumberFor<T>) -> Weight {
+			let mut weight = T::DbWeight::get().reads(1);
+
+			// If the current auction was in its ending period last block, then ensure that the
+			// (sub-)range winner information is duplicated from the previous block in case no bids
+			// happened in the last block.
+			if let AuctionStatus::EndingPeriod(offset, _sub_sample) = Self::auction_status(n) {
+				weight = weight.saturating_add(T::DbWeight::get().reads(1));
+				if !Winning::<T>::contains_key(&offset) {
+					weight = weight.saturating_add(T::DbWeight::get().writes(1));
+					let winning_data = offset
+						.checked_sub(&One::one())
+						.and_then(Winning::<T>::get)
+						.unwrap_or([Self::EMPTY; SlotRange::SLOT_RANGE_COUNT]);
+					Winning::<T>::insert(offset, winning_data);
+				}
+			}
+
+			// Check to see if an auction just ended.
+			if let Some((winning_ranges, auction_lease_period_index)) = Self::check_auction_end(n) {
+				// Auction is ended now. We have the winning ranges and the lease period index which
+				// acts as the offset. Handle it.
+				Self::manage_auction_end(auction_lease_period_index, winning_ranges);
+				weight = weight.saturating_add(T::WeightInfo::on_initialize());
+			}
+
+			weight
+		}
+	}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		/// Create a new auction.
+		///
+		/// This can only happen when there isn't already an auction in progress and may only be
+		/// called by the root origin. Accepts the `duration` of this auction and the
+		/// `lease_period_index` of the initial lease period of the four that are to be auctioned.
+		#[pallet::call_index(0)]
+		#[pallet::weight((T::WeightInfo::new_auction(), DispatchClass::Operational))]
+		pub fn new_auction(
+			origin: OriginFor<T>,
+			#[pallet::compact] duration: BlockNumberFor<T>,
+			#[pallet::compact] lease_period_index: LeasePeriodOf<T>,
+		) -> DispatchResult {
+			T::InitiateOrigin::ensure_origin(origin)?;
+			Self::do_new_auction(duration, lease_period_index)
+		}
+
+		/// Make a new bid from an account (including a parachain account) for deploying a new
+		/// parachain.
+		///
+		/// Multiple simultaneous bids from the same bidder are allowed only as long as all active
+		/// bids overlap each other (i.e. are mutually exclusive). Bids cannot be redacted.
+		///
+		/// - `sub` is the sub-bidder ID, allowing for multiple competing bids to be made by (and
+		/// funded by) the same account.
+		/// - `auction_index` is the index of the auction to bid on. Should just be the present
+		/// value of `AuctionCounter`.
+		/// - `first_slot` is the first lease period index of the range to bid on. This is the
+		/// absolute lease period index value, not an auction-specific offset.
+		/// - `last_slot` is the last lease period index of the range to bid on. This is the
+		/// absolute lease period index value, not an auction-specific offset.
+		/// - `amount` is the amount to bid to be held as deposit for the parachain should the
+		/// bid win. This amount is held throughout the range.
+		#[pallet::call_index(1)]
+		#[pallet::weight(T::WeightInfo::bid())]
+		pub fn bid(
+			origin: OriginFor<T>,
+			#[pallet::compact] para: ParaId,
+			#[pallet::compact] auction_index: AuctionIndex,
+			#[pallet::compact] first_slot: LeasePeriodOf<T>,
+			#[pallet::compact] last_slot: LeasePeriodOf<T>,
+			#[pallet::compact] amount: BalanceOf<T>,
+		) -> DispatchResult {
+			let who = ensure_signed(origin)?;
+			Self::handle_bid(who, para, auction_index, first_slot, last_slot, amount)?;
+			Ok(())
+		}
+
+		/// Cancel an in-progress auction.
+		///
+		/// Can only be called by Root origin.
+		#[pallet::call_index(2)]
+		#[pallet::weight(T::WeightInfo::cancel_auction())]
+		pub fn cancel_auction(origin: OriginFor<T>) -> DispatchResult {
+			ensure_root(origin)?;
+			// Unreserve all bids.
+			for ((bidder, _), amount) in ReservedAmounts::<T>::drain() {
+				CurrencyOf::<T>::unreserve(&bidder, amount);
+			}
+			#[allow(deprecated)]
+			Winning::<T>::remove_all(None);
+			AuctionInfo::<T>::kill();
+			Ok(())
+		}
+	}
+}
+
+impl<T: Config> Auctioneer<BlockNumberFor<T>> for Pallet<T> {
+	type AccountId = T::AccountId;
+	type LeasePeriod = BlockNumberFor<T>;
+	type Currency = CurrencyOf<T>;
+
+	fn new_auction(
+		duration: BlockNumberFor<T>,
+		lease_period_index: LeasePeriodOf<T>,
+	) -> DispatchResult {
+		Self::do_new_auction(duration, lease_period_index)
+	}
+
+	// Returns the status of the auction given the current block number.
+	fn auction_status(now: BlockNumberFor<T>) -> AuctionStatus<BlockNumberFor<T>> {
+		let early_end = match AuctionInfo::<T>::get() {
+			Some((_, early_end)) => early_end,
+			None => return AuctionStatus::NotStarted,
+		};
+
+		let after_early_end = match now.checked_sub(&early_end) {
+			Some(after_early_end) => after_early_end,
+			None => return AuctionStatus::StartingPeriod,
+		};
+
+		let ending_period = T::EndingPeriod::get();
+		if after_early_end < ending_period {
+			let sample_length = T::SampleLength::get().max(One::one());
+			let sample = after_early_end / sample_length;
+			let sub_sample = after_early_end % sample_length;
+			return AuctionStatus::EndingPeriod(sample, sub_sample)
+		} else {
+			// This is safe because of the comparison operator above
+			return AuctionStatus::VrfDelay(after_early_end - ending_period)
+		}
+	}
+
+	fn place_bid(
+		bidder: T::AccountId,
+		para: ParaId,
+		first_slot: LeasePeriodOf<T>,
+		last_slot: LeasePeriodOf<T>,
+		amount: BalanceOf<T>,
+	) -> DispatchResult {
+		Self::handle_bid(bidder, para, AuctionCounter::<T>::get(), first_slot, last_slot, amount)
+	}
+
+	fn lease_period_index(b: BlockNumberFor<T>) -> Option<(Self::LeasePeriod, bool)> {
+		T::Leaser::lease_period_index(b)
+	}
+
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn lease_period_length() -> (BlockNumberFor<T>, BlockNumberFor<T>) {
+		T::Leaser::lease_period_length()
+	}
+
+	fn has_won_an_auction(para: ParaId, bidder: &T::AccountId) -> bool {
+		!T::Leaser::deposit_held(para, bidder).is_zero()
+	}
+}
+
+impl<T: Config> Pallet<T> {
+	// A trick to allow me to initialize large arrays with nothing in them.
+	const EMPTY: Option<(<T as frame_system::Config>::AccountId, ParaId, BalanceOf<T>)> = None;
+
+	/// Create a new auction.
+	///
+	/// This can only happen when there isn't already an auction in progress. Accepts the `duration`
+	/// of this auction and the `lease_period_index` of the initial lease period of the four that
+	/// are to be auctioned.
+	fn do_new_auction(
+		duration: BlockNumberFor<T>,
+		lease_period_index: LeasePeriodOf<T>,
+	) -> DispatchResult {
+		let maybe_auction = AuctionInfo::<T>::get();
+		ensure!(maybe_auction.is_none(), Error::<T>::AuctionInProgress);
+		let now = frame_system::Pallet::<T>::block_number();
+		if let Some((current_lease_period, _)) = T::Leaser::lease_period_index(now) {
+			// If there is no active lease period, then we don't need to make this check.
+			ensure!(lease_period_index >= current_lease_period, Error::<T>::LeasePeriodInPast);
+		}
+
+		// Bump the counter.
+		let n = AuctionCounter::<T>::mutate(|n| {
+			*n += 1;
+			*n
+		});
+
+		// Set the information.
+		let ending = frame_system::Pallet::<T>::block_number().saturating_add(duration);
+		AuctionInfo::<T>::put((lease_period_index, ending));
+
+		Self::deposit_event(Event::<T>::AuctionStarted {
+			auction_index: n,
+			lease_period: lease_period_index,
+			ending,
+		});
+		Ok(())
+	}
+
+	/// Actually place a bid in the current auction.
+	///
+	/// - `bidder`: The account that will be funding this bid.
+	/// - `auction_index`: The auction index of the bid. For this to succeed, must equal
+	/// the current value of `AuctionCounter`.
+	/// - `first_slot`: The first lease period index of the range to be bid on.
+	/// - `last_slot`: The last lease period index of the range to be bid on (inclusive).
+	/// - `amount`: The total amount to be the bid for deposit over the range.
+	pub fn handle_bid(
+		bidder: T::AccountId,
+		para: ParaId,
+		auction_index: u32,
+		first_slot: LeasePeriodOf<T>,
+		last_slot: LeasePeriodOf<T>,
+		amount: BalanceOf<T>,
+	) -> DispatchResult {
+		// Ensure para is registered before placing a bid on it.
+		ensure!(T::Registrar::is_registered(para), Error::<T>::ParaNotRegistered);
+		// Bidding on latest auction.
+		ensure!(auction_index == AuctionCounter::<T>::get(), Error::<T>::NotCurrentAuction);
+		// Assume it's actually an auction (this should never fail because of above).
+		let (first_lease_period, _) = AuctionInfo::<T>::get().ok_or(Error::<T>::NotAuction)?;
+
+		// Get the auction status and the current sample block. For the starting period, the sample
+		// block is zero.
+		let auction_status = Self::auction_status(frame_system::Pallet::<T>::block_number());
+		// The offset into the ending samples of the auction.
+		let offset = match auction_status {
+			AuctionStatus::NotStarted => return Err(Error::<T>::AuctionEnded.into()),
+			AuctionStatus::StartingPeriod => Zero::zero(),
+			AuctionStatus::EndingPeriod(o, _) => o,
+			AuctionStatus::VrfDelay(_) => return Err(Error::<T>::AuctionEnded.into()),
+		};
+
+		// We also make sure that the bid is not for any existing leases the para already has.
+		ensure!(
+			!T::Leaser::already_leased(para, first_slot, last_slot),
+			Error::<T>::AlreadyLeasedOut
+		);
+
+		// Our range.
+		let range = SlotRange::new_bounded(first_lease_period, first_slot, last_slot)?;
+		// Range as an array index.
+		let range_index = range as u8 as usize;
+
+		// The current winning ranges.
+		let mut current_winning = Winning::<T>::get(offset)
+			.or_else(|| offset.checked_sub(&One::one()).and_then(Winning::<T>::get))
+			.unwrap_or([Self::EMPTY; SlotRange::SLOT_RANGE_COUNT]);
+
+		// If this bid beat the previous winner of our range.
+		if current_winning[range_index].as_ref().map_or(true, |last| amount > last.2) {
+			// Ok; we are the new winner of this range - reserve the additional amount and record.
+
+			// Get the amount already held on deposit if this is a renewal bid (i.e. there's
+			// an existing lease on the same para by the same leaser).
+			let existing_lease_deposit = T::Leaser::deposit_held(para, &bidder);
+			let reserve_required = amount.saturating_sub(existing_lease_deposit);
+
+			// Get the amount already reserved in any prior and still active bids by us.
+			let bidder_para = (bidder.clone(), para);
+			let already_reserved = ReservedAmounts::<T>::get(&bidder_para).unwrap_or_default();
+
+			// If these don't already cover the bid...
+			if let Some(additional) = reserve_required.checked_sub(&already_reserved) {
+				// ...then reserve some more funds from their account, failing if there's not
+				// enough funds.
+				CurrencyOf::<T>::reserve(&bidder, additional)?;
+				// ...and record the amount reserved.
+				ReservedAmounts::<T>::insert(&bidder_para, reserve_required);
+
+				Self::deposit_event(Event::<T>::Reserved {
+					bidder: bidder.clone(),
+					extra_reserved: additional,
+					total_amount: reserve_required,
+				});
+			}
+
+			// Return any funds reserved for the previous winner if we are not in the ending period
+			// and they no longer have any active bids.
+			let mut outgoing_winner = Some((bidder.clone(), para, amount));
+			swap(&mut current_winning[range_index], &mut outgoing_winner);
+			if let Some((who, para, _amount)) = outgoing_winner {
+				if auction_status.is_starting() &&
+					current_winning
+						.iter()
+						.filter_map(Option::as_ref)
+						.all(|&(ref other, other_para, _)| other != &who || other_para != para)
+				{
+					// Previous bidder is no longer winning any ranges: unreserve their funds.
+					if let Some(amount) = ReservedAmounts::<T>::take(&(who.clone(), para)) {
+						// It really should be reserved; there's not much we can do here on fail.
+						let err_amt = CurrencyOf::<T>::unreserve(&who, amount);
+						debug_assert!(err_amt.is_zero());
+						Self::deposit_event(Event::<T>::Unreserved { bidder: who, amount });
+					}
+				}
+			}
+
+			// Update the range winner.
+			Winning::<T>::insert(offset, &current_winning);
+			Self::deposit_event(Event::<T>::BidAccepted {
+				bidder,
+				para_id: para,
+				amount,
+				first_slot,
+				last_slot,
+			});
+		}
+		Ok(())
+	}
+
+	/// Some when the auction's end is known (with the end block number). None if it is unknown.
+	/// If `Some` then the block number must be at most the previous block and at least the
+	/// previous block minus `T::EndingPeriod::get()`.
+	///
+	/// This mutates the state, cleaning up `AuctionInfo` and `Winning` in the case of an auction
+	/// ending. An immediately subsequent call with the same argument will always return `None`.
+	fn check_auction_end(now: BlockNumberFor<T>) -> Option<(WinningData<T>, LeasePeriodOf<T>)> {
+		if let Some((lease_period_index, early_end)) = AuctionInfo::<T>::get() {
+			let ending_period = T::EndingPeriod::get();
+			let late_end = early_end.saturating_add(ending_period);
+			let is_ended = now >= late_end;
+			if is_ended {
+				// auction definitely ended.
+				// check to see if we can determine the actual ending point.
+				let (raw_offset, known_since) = T::Randomness::random(&b"para_auction"[..]);
+
+				if late_end <= known_since {
+					// Our random seed was known only after the auction ended. Good to use.
+					let raw_offset_block_number = <BlockNumberFor<T>>::decode(
+						&mut raw_offset.as_ref(),
+					)
+					.expect("secure hashes should always be bigger than the block number; qed");
+					let offset = (raw_offset_block_number % ending_period) /
+						T::SampleLength::get().max(One::one());
+
+					let auction_counter = AuctionCounter::<T>::get();
+					Self::deposit_event(Event::<T>::WinningOffset {
+						auction_index: auction_counter,
+						block_number: offset,
+					});
+					let res = Winning::<T>::get(offset)
+						.unwrap_or([Self::EMPTY; SlotRange::SLOT_RANGE_COUNT]);
+					// This `remove_all` statement should remove at most `EndingPeriod` /
+					// `SampleLength` items, which should be bounded and sensibly configured in the
+					// runtime.
+					#[allow(deprecated)]
+					Winning::<T>::remove_all(None);
+					AuctionInfo::<T>::kill();
+					return Some((res, lease_period_index))
+				}
+			}
+		}
+		None
+	}
+
+	/// Auction just ended. We have the current lease period, the auction's lease period (which
+	/// is guaranteed to be at least the current period) and the bidders that were winning each
+	/// range at the time of the auction's close.
+	fn manage_auction_end(
+		auction_lease_period_index: LeasePeriodOf<T>,
+		winning_ranges: WinningData<T>,
+	) {
+		// First, unreserve all amounts that were reserved for the bids. We will later re-reserve
+		// the amounts from the bidders that ended up being assigned the slot so there's no need to
+		// special-case them here.
+		for ((bidder, _), amount) in ReservedAmounts::<T>::drain() {
+			CurrencyOf::<T>::unreserve(&bidder, amount);
+		}
+
+		// Next, calculate the winning combination of slots and thus the final winners of the
+		// auction.
+		let winners = Self::calculate_winners(winning_ranges);
+
+		// Go through those winners and re-reserve their bid, updating our table of deposits
+		// accordingly.
+		for (leaser, para, amount, range) in winners.into_iter() {
+			let begin_offset = LeasePeriodOf::<T>::from(range.as_pair().0 as u32);
+			let period_begin = auction_lease_period_index + begin_offset;
+			let period_count = LeasePeriodOf::<T>::from(range.len() as u32);
+
+			match T::Leaser::lease_out(para, &leaser, amount, period_begin, period_count) {
+				Err(LeaseError::ReserveFailed) |
+				Err(LeaseError::AlreadyEnded) |
+				Err(LeaseError::NoLeasePeriod) => {
+					// Should never happen since we just unreserved this amount (and our offset is
+					// from the present period). But if it does, there's not much we can do.
+				},
+				Err(LeaseError::AlreadyLeased) => {
+					// The leaser attempted to get a second lease on the same para ID, possibly
+					// griefing us. Let's keep the amount reserved and let governance sort it out.
+					if CurrencyOf::<T>::reserve(&leaser, amount).is_ok() {
+						Self::deposit_event(Event::<T>::ReserveConfiscated {
+							para_id: para,
+							leaser,
+							amount,
+						});
+					}
+				},
+				Ok(()) => {}, // Nothing to report.
+			}
+		}
+
+		Self::deposit_event(Event::<T>::AuctionClosed {
+			auction_index: AuctionCounter::<T>::get(),
+		});
+	}
+
+	/// Calculate the final winners from the winning slots.
+	///
+	/// This is a simple dynamic programming algorithm designed by Al, the original code is at:
+	/// `https://github.com/w3f/consensus/blob/master/NPoS/auctiondynamicthing.py`
+	fn calculate_winners(mut winning: WinningData<T>) -> WinnersData<T> {
+		let winning_ranges = {
+			let mut best_winners_ending_at: [(Vec<SlotRange>, BalanceOf<T>);
+				SlotRange::LEASE_PERIODS_PER_SLOT] = Default::default();
+			let best_bid = |range: SlotRange| {
+				winning[range as u8 as usize]
+					.as_ref()
+					.map(|(_, _, amount)| *amount * (range.len() as u32).into())
+			};
+			for i in 0..SlotRange::LEASE_PERIODS_PER_SLOT {
+				let r = SlotRange::new_bounded(0, 0, i as u32).expect("`i < LPPS`; qed");
+				if let Some(bid) = best_bid(r) {
+					best_winners_ending_at[i] = (vec![r], bid);
+				}
+				for j in 0..i {
+					let r = SlotRange::new_bounded(0, j as u32 + 1, i as u32)
+						.expect("`i < LPPS`; `j < i`; `j + 1 < LPPS`; qed");
+					if let Some(mut bid) = best_bid(r) {
+						bid += best_winners_ending_at[j].1;
+						if bid > best_winners_ending_at[i].1 {
+							let mut new_winners = best_winners_ending_at[j].0.clone();
+							new_winners.push(r);
+							best_winners_ending_at[i] = (new_winners, bid);
+						}
+					} else {
+						if best_winners_ending_at[j].1 > best_winners_ending_at[i].1 {
+							best_winners_ending_at[i] = best_winners_ending_at[j].clone();
+						}
+					}
+				}
+			}
+			best_winners_ending_at[SlotRange::LEASE_PERIODS_PER_SLOT - 1].0.clone()
+		};
+
+		winning_ranges
+			.into_iter()
+			.filter_map(|range| {
+				winning[range as u8 as usize]
+					.take()
+					.map(|(bidder, para, amount)| (bidder, para, amount, range))
+			})
+			.collect::<Vec<_>>()
+	}
+}
+
+#[cfg(test)]
+mod mock;
+
+#[cfg(test)]
+mod tests;
+
+#[cfg(feature = "runtime-benchmarks")]
+mod benchmarking;
diff --git a/polkadot/runtime/common/src/auctions/tests.rs b/polkadot/runtime/common/src/auctions/tests.rs
new file mode 100644
index 000000000000..07574eeb295d
--- /dev/null
+++ b/polkadot/runtime/common/src/auctions/tests.rs
@@ -0,0 +1,821 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Tests for the auctions pallet.
+
+#[cfg(test)]
+use super::*;
+use crate::{auctions::mock::*, mock::TestRegistrar};
+use frame_support::{assert_noop, assert_ok, assert_storage_noop};
+use pallet_balances;
+use polkadot_primitives::Id as ParaId;
+use polkadot_primitives_test_helpers::{dummy_hash, dummy_head_data, dummy_validation_code};
+use sp_core::H256;
+use sp_runtime::DispatchError::BadOrigin;
+
+#[test]
+fn basic_setup_works() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(AuctionCounter::<Test>::get(), 0);
+		assert_eq!(TestLeaser::deposit_held(0u32.into(), &1), 0);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::NotStarted
+		);
+
+		run_to_block(10);
+
+		assert_eq!(AuctionCounter::<Test>::get(), 0);
+		assert_eq!(TestLeaser::deposit_held(0u32.into(), &1), 0);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::NotStarted
+		);
+	});
+}
+
+#[test]
+fn can_start_auction() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+
+		assert_noop!(Auctions::new_auction(RuntimeOrigin::signed(1), 5, 1), BadOrigin);
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
+
+		assert_eq!(AuctionCounter::<Test>::get(), 1);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::StartingPeriod
+		);
+	});
+}
+
+#[test]
+fn bidding_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 4, 5));
+
+		assert_eq!(Balances::reserved_balance(1), 5);
+		assert_eq!(Balances::free_balance(1), 5);
+		assert_eq!(
+			Winning::<Test>::get(0).unwrap()[SlotRange::ZeroThree as u8 as usize],
+			Some((1, 0.into(), 5))
+		);
+	});
+}
+
+#[test]
+fn under_bidding_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
+
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 4, 5));
+
+		assert_storage_noop!({
+			assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), 0.into(), 1, 1, 4, 1));
+		});
+	});
+}
+
+#[test]
+fn over_bidding_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 4, 5));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), 0.into(), 1, 1, 4, 6));
+
+		assert_eq!(Balances::reserved_balance(1), 0);
+		assert_eq!(Balances::free_balance(1), 10);
+		assert_eq!(Balances::reserved_balance(2), 6);
+		assert_eq!(Balances::free_balance(2), 14);
+		assert_eq!(
+			Winning::<Test>::get(0).unwrap()[SlotRange::ZeroThree as u8 as usize],
+			Some((2, 0.into(), 6))
+		);
+	});
+}
+
+#[test]
+fn auction_proceeds_correctly() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
+
+		assert_eq!(AuctionCounter::<Test>::get(), 1);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::StartingPeriod
+		);
+
+		run_to_block(2);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::StartingPeriod
+		);
+
+		run_to_block(3);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::StartingPeriod
+		);
+
+		run_to_block(4);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::StartingPeriod
+		);
+
+		run_to_block(5);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::StartingPeriod
+		);
+
+		run_to_block(6);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::EndingPeriod(0, 0)
+		);
+
+		run_to_block(7);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::EndingPeriod(1, 0)
+		);
+
+		run_to_block(8);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::EndingPeriod(2, 0)
+		);
+
+		run_to_block(9);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::NotStarted
+		);
+	});
+}
+
+#[test]
+fn can_win_auction() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 4, 1));
+		assert_eq!(Balances::reserved_balance(1), 1);
+		assert_eq!(Balances::free_balance(1), 9);
+		run_to_block(9);
+
+		assert_eq!(
+			leases(),
+			vec![
+				((0.into(), 1), LeaseData { leaser: 1, amount: 1 }),
+				((0.into(), 2), LeaseData { leaser: 1, amount: 1 }),
+				((0.into(), 3), LeaseData { leaser: 1, amount: 1 }),
+				((0.into(), 4), LeaseData { leaser: 1, amount: 1 }),
+			]
+		);
+		assert_eq!(TestLeaser::deposit_held(0.into(), &1), 1);
+	});
+}
+
+#[test]
+fn can_win_auction_with_late_randomness() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 4, 1));
+		assert_eq!(Balances::reserved_balance(1), 1);
+		assert_eq!(Balances::free_balance(1), 9);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::StartingPeriod
+		);
+		run_to_block(8);
+		// Auction has not yet ended.
+		assert_eq!(leases(), vec![]);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::EndingPeriod(2, 0)
+		);
+		// This will prevent the auction's winner from being decided in the next block, since
+		// the random seed was known before the final bids were made.
+		set_last_random(H256::zero(), 8);
+		// Auction definitely ended now, but we don't know exactly when in the last 3 blocks yet
+		// since no randomness available yet.
+		run_to_block(9);
+		// Auction has now ended... But auction winner still not yet decided, so no leases yet.
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::VrfDelay(0)
+		);
+		assert_eq!(leases(), vec![]);
+
+		// Random seed now updated to a value known at block 9, when the auction ended. This
+		// means that the winner can now be chosen.
+		set_last_random(H256::zero(), 9);
+		run_to_block(10);
+		// Auction ended and winner selected
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::NotStarted
+		);
+		assert_eq!(
+			leases(),
+			vec![
+				((0.into(), 1), LeaseData { leaser: 1, amount: 1 }),
+				((0.into(), 2), LeaseData { leaser: 1, amount: 1 }),
+				((0.into(), 3), LeaseData { leaser: 1, amount: 1 }),
+				((0.into(), 4), LeaseData { leaser: 1, amount: 1 }),
+			]
+		);
+		assert_eq!(TestLeaser::deposit_held(0.into(), &1), 1);
+	});
+}
+
+#[test]
+fn can_win_incomplete_auction() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 4, 4, 5));
+		run_to_block(9);
+
+		assert_eq!(leases(), vec![((0.into(), 4), LeaseData { leaser: 1, amount: 5 }),]);
+		assert_eq!(TestLeaser::deposit_held(0.into(), &1), 5);
+	});
+}
+
+#[test]
+fn should_choose_best_combination() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 1, 1));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), 0.into(), 1, 2, 3, 4));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(3), 0.into(), 1, 4, 4, 2));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 1.into(), 1, 1, 4, 2));
+		run_to_block(9);
+
+		assert_eq!(
+			leases(),
+			vec![
+				((0.into(), 1), LeaseData { leaser: 1, amount: 1 }),
+				((0.into(), 2), LeaseData { leaser: 2, amount: 4 }),
+				((0.into(), 3), LeaseData { leaser: 2, amount: 4 }),
+				((0.into(), 4), LeaseData { leaser: 3, amount: 2 }),
+			]
+		);
+		assert_eq!(TestLeaser::deposit_held(0.into(), &1), 1);
+		assert_eq!(TestLeaser::deposit_held(1.into(), &1), 0);
+		assert_eq!(TestLeaser::deposit_held(0.into(), &2), 4);
+		assert_eq!(TestLeaser::deposit_held(0.into(), &3), 2);
+	});
+}
+
+#[test]
+fn gap_bid_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
+
+		// User 1 will make a bid for period 1 and 4 for the same Para 0
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 1, 1));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 4, 4, 4));
+
+		// User 2 and 3 will make a bid for para 1 on period 2 and 3 respectively
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), 1.into(), 1, 2, 2, 2));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(3), 1.into(), 1, 3, 3, 3));
+
+		// Total reserved should be the max of the two
+		assert_eq!(Balances::reserved_balance(1), 4);
+
+		// Other people are reserved correctly too
+		assert_eq!(Balances::reserved_balance(2), 2);
+		assert_eq!(Balances::reserved_balance(3), 3);
+
+		// End the auction.
+		run_to_block(9);
+
+		assert_eq!(
+			leases(),
+			vec![
+				((0.into(), 1), LeaseData { leaser: 1, amount: 1 }),
+				((0.into(), 4), LeaseData { leaser: 1, amount: 4 }),
+				((1.into(), 2), LeaseData { leaser: 2, amount: 2 }),
+				((1.into(), 3), LeaseData { leaser: 3, amount: 3 }),
+			]
+		);
+		assert_eq!(TestLeaser::deposit_held(0.into(), &1), 4);
+		assert_eq!(TestLeaser::deposit_held(1.into(), &2), 2);
+		assert_eq!(TestLeaser::deposit_held(1.into(), &3), 3);
+	});
+}
+
+#[test]
+fn deposit_credit_should_work() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 1, 5));
+		assert_eq!(Balances::reserved_balance(1), 5);
+		run_to_block(10);
+
+		assert_eq!(leases(), vec![((0.into(), 1), LeaseData { leaser: 1, amount: 5 }),]);
+		assert_eq!(TestLeaser::deposit_held(0.into(), &1), 5);
+
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 2));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 2, 2, 2, 6));
+		// Only 1 reserved since we have a deposit credit of 5.
+		assert_eq!(Balances::reserved_balance(1), 1);
+		run_to_block(20);
+
+		assert_eq!(
+			leases(),
+			vec![
+				((0.into(), 1), LeaseData { leaser: 1, amount: 5 }),
+				((0.into(), 2), LeaseData { leaser: 1, amount: 6 }),
+			]
+		);
+		assert_eq!(TestLeaser::deposit_held(0.into(), &1), 6);
+	});
+}
+
+#[test]
+fn deposit_credit_on_alt_para_should_not_count() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 1, 5));
+		assert_eq!(Balances::reserved_balance(1), 5);
+		run_to_block(10);
+
+		assert_eq!(leases(), vec![((0.into(), 1), LeaseData { leaser: 1, amount: 5 }),]);
+		assert_eq!(TestLeaser::deposit_held(0.into(), &1), 5);
+
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 2));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 1.into(), 2, 2, 2, 6));
+		// 6 reserved since we are bidding on a new para; only works because we don't
+		assert_eq!(Balances::reserved_balance(1), 6);
+		run_to_block(20);
+
+		assert_eq!(
+			leases(),
+			vec![
+				((0.into(), 1), LeaseData { leaser: 1, amount: 5 }),
+				((1.into(), 2), LeaseData { leaser: 1, amount: 6 }),
+			]
+		);
+		assert_eq!(TestLeaser::deposit_held(0.into(), &1), 5);
+		assert_eq!(TestLeaser::deposit_held(1.into(), &1), 6);
+	});
+}
+
+#[test]
+fn multiple_bids_work_pre_ending() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
+
+		for i in 1..6u64 {
+			run_to_block(i as _);
+			assert_ok!(Auctions::bid(RuntimeOrigin::signed(i), 0.into(), 1, 1, 4, i));
+			for j in 1..6 {
+				assert_eq!(Balances::reserved_balance(j), if j == i { j } else { 0 });
+				assert_eq!(Balances::free_balance(j), if j == i { j * 9 } else { j * 10 });
+			}
+		}
+
+		run_to_block(9);
+		assert_eq!(
+			leases(),
+			vec![
+				((0.into(), 1), LeaseData { leaser: 5, amount: 5 }),
+				((0.into(), 2), LeaseData { leaser: 5, amount: 5 }),
+				((0.into(), 3), LeaseData { leaser: 5, amount: 5 }),
+				((0.into(), 4), LeaseData { leaser: 5, amount: 5 }),
+			]
+		);
+	});
+}
+
+#[test]
+fn multiple_bids_work_post_ending() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 0, 1));
+
+		for i in 1..6u64 {
+			run_to_block(((i - 1) / 2 + 1) as _);
+			assert_ok!(Auctions::bid(RuntimeOrigin::signed(i), 0.into(), 1, 1, 4, i));
+			for j in 1..6 {
+				assert_eq!(Balances::reserved_balance(j), if j <= i { j } else { 0 });
+				assert_eq!(Balances::free_balance(j), if j <= i { j * 9 } else { j * 10 });
+			}
+		}
+		for i in 1..6u64 {
+			assert_eq!(ReservedAmounts::<Test>::get((i, ParaId::from(0))).unwrap(), i);
+		}
+
+		run_to_block(5);
+		assert_eq!(
+			leases(),
+			(1..=4)
+				.map(|i| ((0.into(), i), LeaseData { leaser: 2, amount: 2 }))
+				.collect::<Vec<_>>()
+		);
+	});
+}
+
+#[test]
+fn incomplete_calculate_winners_works() {
+	let mut winning = [None; SlotRange::SLOT_RANGE_COUNT];
+	winning[SlotRange::ThreeThree as u8 as usize] = Some((1, 0.into(), 1));
+
+	let winners = vec![(1, 0.into(), 1, SlotRange::ThreeThree)];
+
+	assert_eq!(Auctions::calculate_winners(winning), winners);
+}
+
+#[test]
+fn first_incomplete_calculate_winners_works() {
+	let mut winning = [None; SlotRange::SLOT_RANGE_COUNT];
+	winning[0] = Some((1, 0.into(), 1));
+
+	let winners = vec![(1, 0.into(), 1, SlotRange::ZeroZero)];
+
+	assert_eq!(Auctions::calculate_winners(winning), winners);
+}
+
+#[test]
+fn calculate_winners_works() {
+	let mut winning = [None; SlotRange::SLOT_RANGE_COUNT];
+	winning[SlotRange::ZeroZero as u8 as usize] = Some((2, 0.into(), 2));
+	winning[SlotRange::ZeroThree as u8 as usize] = Some((1, 100.into(), 1));
+	winning[SlotRange::OneOne as u8 as usize] = Some((3, 1.into(), 1));
+	winning[SlotRange::TwoTwo as u8 as usize] = Some((1, 2.into(), 53));
+	winning[SlotRange::ThreeThree as u8 as usize] = Some((5, 3.into(), 1));
+
+	let winners = vec![
+		(2, 0.into(), 2, SlotRange::ZeroZero),
+		(3, 1.into(), 1, SlotRange::OneOne),
+		(1, 2.into(), 53, SlotRange::TwoTwo),
+		(5, 3.into(), 1, SlotRange::ThreeThree),
+	];
+	assert_eq!(Auctions::calculate_winners(winning), winners);
+
+	winning[SlotRange::ZeroOne as u8 as usize] = Some((4, 10.into(), 3));
+	let winners = vec![
+		(4, 10.into(), 3, SlotRange::ZeroOne),
+		(1, 2.into(), 53, SlotRange::TwoTwo),
+		(5, 3.into(), 1, SlotRange::ThreeThree),
+	];
+	assert_eq!(Auctions::calculate_winners(winning), winners);
+
+	winning[SlotRange::ZeroThree as u8 as usize] = Some((1, 100.into(), 100));
+	let winners = vec![(1, 100.into(), 100, SlotRange::ZeroThree)];
+	assert_eq!(Auctions::calculate_winners(winning), winners);
+}
+
+#[test]
+fn lower_bids_are_correctly_refunded() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 1, 1));
+		let para_1 = ParaId::from(1_u32);
+		let para_2 = ParaId::from(2_u32);
+
+		// Make a bid and reserve a balance
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), para_1, 1, 1, 4, 9));
+		assert_eq!(Balances::reserved_balance(1), 9);
+		assert_eq!(ReservedAmounts::<Test>::get((1, para_1)), Some(9));
+		assert_eq!(Balances::reserved_balance(2), 0);
+		assert_eq!(ReservedAmounts::<Test>::get((2, para_2)), None);
+
+		// Bigger bid, reserves new balance and returns funds
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), para_2, 1, 1, 4, 19));
+		assert_eq!(Balances::reserved_balance(1), 0);
+		assert_eq!(ReservedAmounts::<Test>::get((1, para_1)), None);
+		assert_eq!(Balances::reserved_balance(2), 19);
+		assert_eq!(ReservedAmounts::<Test>::get((2, para_2)), Some(19));
+	});
+}
+
+#[test]
+fn initialize_winners_in_ending_period_works() {
+	new_test_ext().execute_with(|| {
+		let ed: u64 = <Test as pallet_balances::Config>::ExistentialDeposit::get();
+		assert_eq!(ed, 1);
+		run_to_block(1);
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 9, 1));
+		let para_1 = ParaId::from(1_u32);
+		let para_2 = ParaId::from(2_u32);
+		let para_3 = ParaId::from(3_u32);
+
+		// Make bids
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), para_1, 1, 1, 4, 9));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), para_2, 1, 3, 4, 19));
+
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::StartingPeriod
+		);
+		let mut winning = [None; SlotRange::SLOT_RANGE_COUNT];
+		winning[SlotRange::ZeroThree as u8 as usize] = Some((1, para_1, 9));
+		winning[SlotRange::TwoThree as u8 as usize] = Some((2, para_2, 19));
+		assert_eq!(Winning::<Test>::get(0), Some(winning));
+
+		run_to_block(9);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::StartingPeriod
+		);
+
+		run_to_block(10);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::EndingPeriod(0, 0)
+		);
+		assert_eq!(Winning::<Test>::get(0), Some(winning));
+
+		run_to_block(11);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::EndingPeriod(1, 0)
+		);
+		assert_eq!(Winning::<Test>::get(1), Some(winning));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(3), para_3, 1, 3, 4, 29));
+
+		run_to_block(12);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::EndingPeriod(2, 0)
+		);
+		winning[SlotRange::TwoThree as u8 as usize] = Some((3, para_3, 29));
+		assert_eq!(Winning::<Test>::get(2), Some(winning));
+	});
+}
+
+#[test]
+fn handle_bid_requires_registered_para() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
+		assert_noop!(
+			Auctions::bid(RuntimeOrigin::signed(1), 1337.into(), 1, 1, 4, 1),
+			Error::<Test>::ParaNotRegistered
+		);
+		assert_ok!(TestRegistrar::<Test>::register(
+			1,
+			1337.into(),
+			dummy_head_data(),
+			dummy_validation_code()
+		));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 1337.into(), 1, 1, 4, 1));
+	});
+}
+
+#[test]
+fn handle_bid_checks_existing_lease_periods() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 2, 3, 1));
+		assert_eq!(Balances::reserved_balance(1), 1);
+		assert_eq!(Balances::free_balance(1), 9);
+		run_to_block(9);
+
+		assert_eq!(
+			leases(),
+			vec![
+				((0.into(), 2), LeaseData { leaser: 1, amount: 1 }),
+				((0.into(), 3), LeaseData { leaser: 1, amount: 1 }),
+			]
+		);
+		assert_eq!(TestLeaser::deposit_held(0.into(), &1), 1);
+
+		// Para 1 just won an auction above and won some lease periods.
+		// No bids can work which overlap these periods.
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
+		assert_noop!(
+			Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 2, 1, 4, 1),
+			Error::<Test>::AlreadyLeasedOut,
+		);
+		assert_noop!(
+			Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 2, 1, 2, 1),
+			Error::<Test>::AlreadyLeasedOut,
+		);
+		assert_noop!(
+			Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 2, 3, 4, 1),
+			Error::<Test>::AlreadyLeasedOut,
+		);
+		// This is okay, not an overlapping bid.
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 2, 1, 1, 1));
+	});
+}
+
+// Here we will test that taking only 10 samples during the ending period works as expected.
+#[test]
+fn less_winning_samples_work() {
+	new_test_ext().execute_with(|| {
+		let ed: u64 = <Test as pallet_balances::Config>::ExistentialDeposit::get();
+		assert_eq!(ed, 1);
+		EndingPeriod::set(30);
+		SampleLength::set(10);
+
+		run_to_block(1);
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 9, 11));
+		let para_1 = ParaId::from(1_u32);
+		let para_2 = ParaId::from(2_u32);
+		let para_3 = ParaId::from(3_u32);
+
+		// Make bids
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), para_1, 1, 11, 14, 9));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), para_2, 1, 13, 14, 19));
+
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::StartingPeriod
+		);
+		let mut winning = [None; SlotRange::SLOT_RANGE_COUNT];
+		winning[SlotRange::ZeroThree as u8 as usize] = Some((1, para_1, 9));
+		winning[SlotRange::TwoThree as u8 as usize] = Some((2, para_2, 19));
+		assert_eq!(Winning::<Test>::get(0), Some(winning));
+
+		run_to_block(9);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::StartingPeriod
+		);
+
+		run_to_block(10);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::EndingPeriod(0, 0)
+		);
+		assert_eq!(Winning::<Test>::get(0), Some(winning));
+
+		// New bids update the current winning
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(3), para_3, 1, 14, 14, 29));
+		winning[SlotRange::ThreeThree as u8 as usize] = Some((3, para_3, 29));
+		assert_eq!(Winning::<Test>::get(0), Some(winning));
+
+		run_to_block(20);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::EndingPeriod(1, 0)
+		);
+		assert_eq!(Winning::<Test>::get(1), Some(winning));
+		run_to_block(25);
+		// Overbid mid sample
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(3), para_3, 1, 13, 14, 29));
+		winning[SlotRange::TwoThree as u8 as usize] = Some((3, para_3, 29));
+		assert_eq!(Winning::<Test>::get(1), Some(winning));
+
+		run_to_block(30);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::EndingPeriod(2, 0)
+		);
+		assert_eq!(Winning::<Test>::get(2), Some(winning));
+
+		set_last_random(H256::from([254; 32]), 40);
+		run_to_block(40);
+		// Auction ended and winner selected
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::NotStarted
+		);
+		assert_eq!(
+			leases(),
+			vec![
+				((3.into(), 13), LeaseData { leaser: 3, amount: 29 }),
+				((3.into(), 14), LeaseData { leaser: 3, amount: 29 }),
+			]
+		);
+	});
+}
+
+#[test]
+fn auction_status_works() {
+	new_test_ext().execute_with(|| {
+		EndingPeriod::set(30);
+		SampleLength::set(10);
+		set_last_random(dummy_hash(), 0);
+
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::NotStarted
+		);
+
+		run_to_block(1);
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 9, 11));
+
+		run_to_block(9);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::StartingPeriod
+		);
+
+		run_to_block(10);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::EndingPeriod(0, 0)
+		);
+
+		run_to_block(11);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::EndingPeriod(0, 1)
+		);
+
+		run_to_block(19);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::EndingPeriod(0, 9)
+		);
+
+		run_to_block(20);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::EndingPeriod(1, 0)
+		);
+
+		run_to_block(25);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::EndingPeriod(1, 5)
+		);
+
+		run_to_block(30);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::EndingPeriod(2, 0)
+		);
+
+		run_to_block(39);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::EndingPeriod(2, 9)
+		);
+
+		run_to_block(40);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::VrfDelay(0)
+		);
+
+		run_to_block(44);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::VrfDelay(4)
+		);
+
+		set_last_random(dummy_hash(), 45);
+		run_to_block(45);
+		assert_eq!(
+			Auctions::auction_status(System::block_number()),
+			AuctionStatus::<u32>::NotStarted
+		);
+	});
+}
+
+#[test]
+fn can_cancel_auction() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 5, 1));
+		assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), 0.into(), 1, 1, 4, 1));
+		assert_eq!(Balances::reserved_balance(1), 1);
+		assert_eq!(Balances::free_balance(1), 9);
+
+		assert_noop!(Auctions::cancel_auction(RuntimeOrigin::signed(6)), BadOrigin);
+		assert_ok!(Auctions::cancel_auction(RuntimeOrigin::root()));
+
+		assert!(AuctionInfo::<Test>::get().is_none());
+		assert_eq!(Balances::reserved_balance(1), 0);
+		assert_eq!(ReservedAmounts::<Test>::iter().count(), 0);
+		assert_eq!(Winning::<Test>::iter().count(), 0);
+	});
+}
diff --git a/polkadot/runtime/common/src/claims.rs b/polkadot/runtime/common/src/claims.rs
deleted file mode 100644
index 1ee80dd76e2d..000000000000
--- a/polkadot/runtime/common/src/claims.rs
+++ /dev/null
@@ -1,1758 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Pallet to process claims from Ethereum addresses.
-
-#[cfg(not(feature = "std"))]
-use alloc::{format, string::String};
-use alloc::{vec, vec::Vec};
-use codec::{Decode, Encode, MaxEncodedLen};
-use core::fmt::Debug;
-use frame_support::{
-	ensure,
-	traits::{Currency, Get, IsSubType, VestingSchedule},
-	weights::Weight,
-	DefaultNoBound,
-};
-pub use pallet::*;
-use polkadot_primitives::ValidityError;
-use scale_info::TypeInfo;
-use serde::{self, Deserialize, Deserializer, Serialize, Serializer};
-use sp_io::{crypto::secp256k1_ecdsa_recover, hashing::keccak_256};
-use sp_runtime::{
-	impl_tx_ext_default,
-	traits::{
-		AsSystemOriginSigner, AsTransactionAuthorizedOrigin, CheckedSub, DispatchInfoOf,
-		Dispatchable, TransactionExtension, Zero,
-	},
-	transaction_validity::{
-		InvalidTransaction, TransactionSource, TransactionValidity, TransactionValidityError,
-		ValidTransaction,
-	},
-	RuntimeDebug,
-};
-
-type CurrencyOf<T> = <<T as Config>::VestingSchedule as VestingSchedule<
-	<T as frame_system::Config>::AccountId,
->>::Currency;
-type BalanceOf<T> = <CurrencyOf<T> as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-
-pub trait WeightInfo {
-	fn claim() -> Weight;
-	fn mint_claim() -> Weight;
-	fn claim_attest() -> Weight;
-	fn attest() -> Weight;
-	fn move_claim() -> Weight;
-	fn prevalidate_attests() -> Weight;
-}
-
-pub struct TestWeightInfo;
-impl WeightInfo for TestWeightInfo {
-	fn claim() -> Weight {
-		Weight::zero()
-	}
-	fn mint_claim() -> Weight {
-		Weight::zero()
-	}
-	fn claim_attest() -> Weight {
-		Weight::zero()
-	}
-	fn attest() -> Weight {
-		Weight::zero()
-	}
-	fn move_claim() -> Weight {
-		Weight::zero()
-	}
-	fn prevalidate_attests() -> Weight {
-		Weight::zero()
-	}
-}
-
-/// The kind of statement an account needs to make for a claim to be valid.
-#[derive(
-	Encode,
-	Decode,
-	Clone,
-	Copy,
-	Eq,
-	PartialEq,
-	RuntimeDebug,
-	TypeInfo,
-	Serialize,
-	Deserialize,
-	MaxEncodedLen,
-)]
-pub enum StatementKind {
-	/// Statement required to be made by non-SAFT holders.
-	Regular,
-	/// Statement required to be made by SAFT holders.
-	Saft,
-}
-
-impl StatementKind {
-	/// Convert this to the (English) statement it represents.
-	fn to_text(self) -> &'static [u8] {
-		match self {
-			StatementKind::Regular =>
-				&b"I hereby agree to the terms of the statement whose SHA-256 multihash is \
-				Qmc1XYqT6S39WNp2UeiRUrZichUWUPpGEThDE6dAb3f6Ny. (This may be found at the URL: \
-				https://statement.polkadot.network/regular.html)"[..],
-			StatementKind::Saft =>
-				&b"I hereby agree to the terms of the statement whose SHA-256 multihash is \
-				QmXEkMahfhHJPzT3RjkXiZVFi77ZeVeuxtAjhojGRNYckz. (This may be found at the URL: \
-				https://statement.polkadot.network/saft.html)"[..],
-		}
-	}
-}
-
-impl Default for StatementKind {
-	fn default() -> Self {
-		StatementKind::Regular
-	}
-}
-
-/// An Ethereum address (i.e. 20 bytes, used to represent an Ethereum account).
-///
-/// This gets serialized to the 0x-prefixed hex representation.
-#[derive(
-	Clone, Copy, PartialEq, Eq, Encode, Decode, Default, RuntimeDebug, TypeInfo, MaxEncodedLen,
-)]
-pub struct EthereumAddress([u8; 20]);
-
-impl Serialize for EthereumAddress {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where
-		S: Serializer,
-	{
-		let hex: String = rustc_hex::ToHex::to_hex(&self.0[..]);
-		serializer.serialize_str(&format!("0x{}", hex))
-	}
-}
-
-impl<'de> Deserialize<'de> for EthereumAddress {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-	where
-		D: Deserializer<'de>,
-	{
-		let base_string = String::deserialize(deserializer)?;
-		let offset = if base_string.starts_with("0x") { 2 } else { 0 };
-		let s = &base_string[offset..];
-		if s.len() != 40 {
-			Err(serde::de::Error::custom(
-				"Bad length of Ethereum address (should be 42 including '0x')",
-			))?;
-		}
-		let raw: Vec<u8> = rustc_hex::FromHex::from_hex(s)
-			.map_err(|e| serde::de::Error::custom(format!("{:?}", e)))?;
-		let mut r = Self::default();
-		r.0.copy_from_slice(&raw);
-		Ok(r)
-	}
-}
-
-#[derive(Encode, Decode, Clone, TypeInfo, MaxEncodedLen)]
-pub struct EcdsaSignature(pub [u8; 65]);
-
-impl PartialEq for EcdsaSignature {
-	fn eq(&self, other: &Self) -> bool {
-		&self.0[..] == &other.0[..]
-	}
-}
-
-impl core::fmt::Debug for EcdsaSignature {
-	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-		write!(f, "EcdsaSignature({:?})", &self.0[..])
-	}
-}
-
-#[frame_support::pallet]
-pub mod pallet {
-	use super::*;
-	use frame_support::pallet_prelude::*;
-	use frame_system::pallet_prelude::*;
-
-	#[pallet::pallet]
-	pub struct Pallet<T>(_);
-
-	/// Configuration trait.
-	#[pallet::config]
-	pub trait Config: frame_system::Config {
-		/// The overarching event type.
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-		type VestingSchedule: VestingSchedule<Self::AccountId, Moment = BlockNumberFor<Self>>;
-		#[pallet::constant]
-		type Prefix: Get<&'static [u8]>;
-		type MoveClaimOrigin: EnsureOrigin<Self::RuntimeOrigin>;
-		type WeightInfo: WeightInfo;
-	}
-
-	#[pallet::event]
-	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	pub enum Event<T: Config> {
-		/// Someone claimed some DOTs.
-		Claimed { who: T::AccountId, ethereum_address: EthereumAddress, amount: BalanceOf<T> },
-	}
-
-	#[pallet::error]
-	pub enum Error<T> {
-		/// Invalid Ethereum signature.
-		InvalidEthereumSignature,
-		/// Ethereum address has no claim.
-		SignerHasNoClaim,
-		/// Account ID sending transaction has no claim.
-		SenderHasNoClaim,
-		/// There's not enough in the pot to pay out some unvested amount. Generally implies a
-		/// logic error.
-		PotUnderflow,
-		/// A needed statement was not included.
-		InvalidStatement,
-		/// The account already has a vested balance.
-		VestedBalanceExists,
-	}
-
-	#[pallet::storage]
-	pub type Claims<T: Config> = StorageMap<_, Identity, EthereumAddress, BalanceOf<T>>;
-
-	#[pallet::storage]
-	pub type Total<T: Config> = StorageValue<_, BalanceOf<T>, ValueQuery>;
-
-	/// Vesting schedule for a claim.
-	/// First balance is the total amount that should be held for vesting.
-	/// Second balance is how much should be unlocked per block.
-	/// The block number is when the vesting should start.
-	#[pallet::storage]
-	pub type Vesting<T: Config> =
-		StorageMap<_, Identity, EthereumAddress, (BalanceOf<T>, BalanceOf<T>, BlockNumberFor<T>)>;
-
-	/// The statement kind that must be signed, if any.
-	#[pallet::storage]
-	pub(super) type Signing<T> = StorageMap<_, Identity, EthereumAddress, StatementKind>;
-
-	/// Pre-claimed Ethereum accounts, by the Account ID that they are claimed to.
-	#[pallet::storage]
-	pub(super) type Preclaims<T: Config> = StorageMap<_, Identity, T::AccountId, EthereumAddress>;
-
-	#[pallet::genesis_config]
-	#[derive(DefaultNoBound)]
-	pub struct GenesisConfig<T: Config> {
-		pub claims:
-			Vec<(EthereumAddress, BalanceOf<T>, Option<T::AccountId>, Option<StatementKind>)>,
-		pub vesting: Vec<(EthereumAddress, (BalanceOf<T>, BalanceOf<T>, BlockNumberFor<T>))>,
-	}
-
-	#[pallet::genesis_build]
-	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
-		fn build(&self) {
-			// build `Claims`
-			self.claims.iter().map(|(a, b, _, _)| (*a, *b)).for_each(|(a, b)| {
-				Claims::<T>::insert(a, b);
-			});
-			// build `Total`
-			Total::<T>::put(
-				self.claims
-					.iter()
-					.fold(Zero::zero(), |acc: BalanceOf<T>, &(_, b, _, _)| acc + b),
-			);
-			// build `Vesting`
-			self.vesting.iter().for_each(|(k, v)| {
-				Vesting::<T>::insert(k, v);
-			});
-			// build `Signing`
-			self.claims
-				.iter()
-				.filter_map(|(a, _, _, s)| Some((*a, (*s)?)))
-				.for_each(|(a, s)| {
-					Signing::<T>::insert(a, s);
-				});
-			// build `Preclaims`
-			self.claims.iter().filter_map(|(a, _, i, _)| Some((i.clone()?, *a))).for_each(
-				|(i, a)| {
-					Preclaims::<T>::insert(i, a);
-				},
-			);
-		}
-	}
-
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
-	#[pallet::call]
-	impl<T: Config> Pallet<T> {
-		/// Make a claim to collect your DOTs.
-		///
-		/// The dispatch origin for this call must be _None_.
-		///
-		/// Unsigned Validation:
-		/// A call to claim is deemed valid if the signature provided matches
-		/// the expected signed message of:
-		///
-		/// > Ethereum Signed Message:
-		/// > (configured prefix string)(address)
-		///
-		/// and `address` matches the `dest` account.
-		///
-		/// Parameters:
-		/// - `dest`: The destination account to payout the claim.
-		/// - `ethereum_signature`: The signature of an ethereum signed message matching the format
-		///   described above.
-		///
-		/// <weight>
-		/// The weight of this call is invariant over the input parameters.
-		/// Weight includes logic to validate unsigned `claim` call.
-		///
-		/// Total Complexity: O(1)
-		/// </weight>
-		#[pallet::call_index(0)]
-		#[pallet::weight(T::WeightInfo::claim())]
-		pub fn claim(
-			origin: OriginFor<T>,
-			dest: T::AccountId,
-			ethereum_signature: EcdsaSignature,
-		) -> DispatchResult {
-			ensure_none(origin)?;
-
-			let data = dest.using_encoded(to_ascii_hex);
-			let signer = Self::eth_recover(&ethereum_signature, &data, &[][..])
-				.ok_or(Error::<T>::InvalidEthereumSignature)?;
-			ensure!(Signing::<T>::get(&signer).is_none(), Error::<T>::InvalidStatement);
-
-			Self::process_claim(signer, dest)?;
-			Ok(())
-		}
-
-		/// Mint a new claim to collect DOTs.
-		///
-		/// The dispatch origin for this call must be _Root_.
-		///
-		/// Parameters:
-		/// - `who`: The Ethereum address allowed to collect this claim.
-		/// - `value`: The number of DOTs that will be claimed.
-		/// - `vesting_schedule`: An optional vesting schedule for these DOTs.
-		///
-		/// <weight>
-		/// The weight of this call is invariant over the input parameters.
-		/// We assume worst case that both vesting and statement is being inserted.
-		///
-		/// Total Complexity: O(1)
-		/// </weight>
-		#[pallet::call_index(1)]
-		#[pallet::weight(T::WeightInfo::mint_claim())]
-		pub fn mint_claim(
-			origin: OriginFor<T>,
-			who: EthereumAddress,
-			value: BalanceOf<T>,
-			vesting_schedule: Option<(BalanceOf<T>, BalanceOf<T>, BlockNumberFor<T>)>,
-			statement: Option<StatementKind>,
-		) -> DispatchResult {
-			ensure_root(origin)?;
-
-			Total::<T>::mutate(|t| *t += value);
-			Claims::<T>::insert(who, value);
-			if let Some(vs) = vesting_schedule {
-				Vesting::<T>::insert(who, vs);
-			}
-			if let Some(s) = statement {
-				Signing::<T>::insert(who, s);
-			}
-			Ok(())
-		}
-
-		/// Make a claim to collect your DOTs by signing a statement.
-		///
-		/// The dispatch origin for this call must be _None_.
-		///
-		/// Unsigned Validation:
-		/// A call to `claim_attest` is deemed valid if the signature provided matches
-		/// the expected signed message of:
-		///
-		/// > Ethereum Signed Message:
-		/// > (configured prefix string)(address)(statement)
-		///
-		/// and `address` matches the `dest` account; the `statement` must match that which is
-		/// expected according to your purchase arrangement.
-		///
-		/// Parameters:
-		/// - `dest`: The destination account to payout the claim.
-		/// - `ethereum_signature`: The signature of an ethereum signed message matching the format
-		///   described above.
-		/// - `statement`: The identity of the statement which is being attested to in the
-		///   signature.
-		///
-		/// <weight>
-		/// The weight of this call is invariant over the input parameters.
-		/// Weight includes logic to validate unsigned `claim_attest` call.
-		///
-		/// Total Complexity: O(1)
-		/// </weight>
-		#[pallet::call_index(2)]
-		#[pallet::weight(T::WeightInfo::claim_attest())]
-		pub fn claim_attest(
-			origin: OriginFor<T>,
-			dest: T::AccountId,
-			ethereum_signature: EcdsaSignature,
-			statement: Vec<u8>,
-		) -> DispatchResult {
-			ensure_none(origin)?;
-
-			let data = dest.using_encoded(to_ascii_hex);
-			let signer = Self::eth_recover(&ethereum_signature, &data, &statement)
-				.ok_or(Error::<T>::InvalidEthereumSignature)?;
-			if let Some(s) = Signing::<T>::get(signer) {
-				ensure!(s.to_text() == &statement[..], Error::<T>::InvalidStatement);
-			}
-			Self::process_claim(signer, dest)?;
-			Ok(())
-		}
-
-		/// Attest to a statement, needed to finalize the claims process.
-		///
-		/// WARNING: Insecure unless your chain includes `PrevalidateAttests` as a
-		/// `TransactionExtension`.
-		///
-		/// Unsigned Validation:
-		/// A call to attest is deemed valid if the sender has a `Preclaim` registered
-		/// and provides a `statement` which is expected for the account.
-		///
-		/// Parameters:
-		/// - `statement`: The identity of the statement which is being attested to in the
-		///   signature.
-		///
-		/// <weight>
-		/// The weight of this call is invariant over the input parameters.
-		/// Weight includes logic to do pre-validation on `attest` call.
-		///
-		/// Total Complexity: O(1)
-		/// </weight>
-		#[pallet::call_index(3)]
-		#[pallet::weight((
-			T::WeightInfo::attest(),
-			DispatchClass::Normal,
-			Pays::No
-		))]
-		pub fn attest(origin: OriginFor<T>, statement: Vec<u8>) -> DispatchResult {
-			let who = ensure_signed(origin)?;
-			let signer = Preclaims::<T>::get(&who).ok_or(Error::<T>::SenderHasNoClaim)?;
-			if let Some(s) = Signing::<T>::get(signer) {
-				ensure!(s.to_text() == &statement[..], Error::<T>::InvalidStatement);
-			}
-			Self::process_claim(signer, who.clone())?;
-			Preclaims::<T>::remove(&who);
-			Ok(())
-		}
-
-		#[pallet::call_index(4)]
-		#[pallet::weight(T::WeightInfo::move_claim())]
-		pub fn move_claim(
-			origin: OriginFor<T>,
-			old: EthereumAddress,
-			new: EthereumAddress,
-			maybe_preclaim: Option<T::AccountId>,
-		) -> DispatchResultWithPostInfo {
-			T::MoveClaimOrigin::try_origin(origin).map(|_| ()).or_else(ensure_root)?;
-
-			Claims::<T>::take(&old).map(|c| Claims::<T>::insert(&new, c));
-			Vesting::<T>::take(&old).map(|c| Vesting::<T>::insert(&new, c));
-			Signing::<T>::take(&old).map(|c| Signing::<T>::insert(&new, c));
-			maybe_preclaim.map(|preclaim| {
-				Preclaims::<T>::mutate(&preclaim, |maybe_o| {
-					if maybe_o.as_ref().map_or(false, |o| o == &old) {
-						*maybe_o = Some(new)
-					}
-				})
-			});
-			Ok(Pays::No.into())
-		}
-	}
-
-	#[pallet::validate_unsigned]
-	impl<T: Config> ValidateUnsigned for Pallet<T> {
-		type Call = Call<T>;
-
-		fn validate_unsigned(_source: TransactionSource, call: &Self::Call) -> TransactionValidity {
-			const PRIORITY: u64 = 100;
-
-			let (maybe_signer, maybe_statement) = match call {
-				// <weight>
-				// The weight of this logic is included in the `claim` dispatchable.
-				// </weight>
-				Call::claim { dest: account, ethereum_signature } => {
-					let data = account.using_encoded(to_ascii_hex);
-					(Self::eth_recover(&ethereum_signature, &data, &[][..]), None)
-				},
-				// <weight>
-				// The weight of this logic is included in the `claim_attest` dispatchable.
-				// </weight>
-				Call::claim_attest { dest: account, ethereum_signature, statement } => {
-					let data = account.using_encoded(to_ascii_hex);
-					(
-						Self::eth_recover(&ethereum_signature, &data, &statement),
-						Some(statement.as_slice()),
-					)
-				},
-				_ => return Err(InvalidTransaction::Call.into()),
-			};
-
-			let signer = maybe_signer.ok_or(InvalidTransaction::Custom(
-				ValidityError::InvalidEthereumSignature.into(),
-			))?;
-
-			let e = InvalidTransaction::Custom(ValidityError::SignerHasNoClaim.into());
-			ensure!(Claims::<T>::contains_key(&signer), e);
-
-			let e = InvalidTransaction::Custom(ValidityError::InvalidStatement.into());
-			match Signing::<T>::get(signer) {
-				None => ensure!(maybe_statement.is_none(), e),
-				Some(s) => ensure!(Some(s.to_text()) == maybe_statement, e),
-			}
-
-			Ok(ValidTransaction {
-				priority: PRIORITY,
-				requires: vec![],
-				provides: vec![("claims", signer).encode()],
-				longevity: TransactionLongevity::max_value(),
-				propagate: true,
-			})
-		}
-	}
-}
-
-/// Converts the given binary data into ASCII-encoded hex. It will be twice the length.
-fn to_ascii_hex(data: &[u8]) -> Vec<u8> {
-	let mut r = Vec::with_capacity(data.len() * 2);
-	let mut push_nibble = |n| r.push(if n < 10 { b'0' + n } else { b'a' - 10 + n });
-	for &b in data.iter() {
-		push_nibble(b / 16);
-		push_nibble(b % 16);
-	}
-	r
-}
-
-impl<T: Config> Pallet<T> {
-	// Constructs the message that Ethereum RPC's `personal_sign` and `eth_sign` would sign.
-	fn ethereum_signable_message(what: &[u8], extra: &[u8]) -> Vec<u8> {
-		let prefix = T::Prefix::get();
-		let mut l = prefix.len() + what.len() + extra.len();
-		let mut rev = Vec::new();
-		while l > 0 {
-			rev.push(b'0' + (l % 10) as u8);
-			l /= 10;
-		}
-		let mut v = b"\x19Ethereum Signed Message:\n".to_vec();
-		v.extend(rev.into_iter().rev());
-		v.extend_from_slice(prefix);
-		v.extend_from_slice(what);
-		v.extend_from_slice(extra);
-		v
-	}
-
-	// Attempts to recover the Ethereum address from a message signature signed by using
-	// the Ethereum RPC's `personal_sign` and `eth_sign`.
-	fn eth_recover(s: &EcdsaSignature, what: &[u8], extra: &[u8]) -> Option<EthereumAddress> {
-		let msg = keccak_256(&Self::ethereum_signable_message(what, extra));
-		let mut res = EthereumAddress::default();
-		res.0
-			.copy_from_slice(&keccak_256(&secp256k1_ecdsa_recover(&s.0, &msg).ok()?[..])[12..]);
-		Some(res)
-	}
-
-	fn process_claim(signer: EthereumAddress, dest: T::AccountId) -> sp_runtime::DispatchResult {
-		let balance_due = Claims::<T>::get(&signer).ok_or(Error::<T>::SignerHasNoClaim)?;
-
-		let new_total =
-			Total::<T>::get().checked_sub(&balance_due).ok_or(Error::<T>::PotUnderflow)?;
-
-		let vesting = Vesting::<T>::get(&signer);
-		if vesting.is_some() && T::VestingSchedule::vesting_balance(&dest).is_some() {
-			return Err(Error::<T>::VestedBalanceExists.into())
-		}
-
-		// We first need to deposit the balance to ensure that the account exists.
-		let _ = CurrencyOf::<T>::deposit_creating(&dest, balance_due);
-
-		// Check if this claim should have a vesting schedule.
-		if let Some(vs) = vesting {
-			// This can only fail if the account already has a vesting schedule,
-			// but this is checked above.
-			T::VestingSchedule::add_vesting_schedule(&dest, vs.0, vs.1, vs.2)
-				.expect("No other vesting schedule exists, as checked above; qed");
-		}
-
-		Total::<T>::put(new_total);
-		Claims::<T>::remove(&signer);
-		Vesting::<T>::remove(&signer);
-		Signing::<T>::remove(&signer);
-
-		// Let's deposit an event to let the outside world know this happened.
-		Self::deposit_event(Event::<T>::Claimed {
-			who: dest,
-			ethereum_address: signer,
-			amount: balance_due,
-		});
-
-		Ok(())
-	}
-}
-
-/// Validate `attest` calls prior to execution. Needed to avoid a DoS attack since they are
-/// otherwise free to place on chain.
-#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)]
-#[scale_info(skip_type_params(T))]
-pub struct PrevalidateAttests<T>(core::marker::PhantomData<fn(T)>);
-
-impl<T: Config> Debug for PrevalidateAttests<T>
-where
-	<T as frame_system::Config>::RuntimeCall: IsSubType<Call<T>>,
-{
-	#[cfg(feature = "std")]
-	fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
-		write!(f, "PrevalidateAttests")
-	}
-
-	#[cfg(not(feature = "std"))]
-	fn fmt(&self, _: &mut core::fmt::Formatter) -> core::fmt::Result {
-		Ok(())
-	}
-}
-
-impl<T: Config> PrevalidateAttests<T>
-where
-	<T as frame_system::Config>::RuntimeCall: IsSubType<Call<T>>,
-{
-	/// Create new `TransactionExtension` to check runtime version.
-	pub fn new() -> Self {
-		Self(core::marker::PhantomData)
-	}
-}
-
-impl<T: Config> TransactionExtension<T::RuntimeCall> for PrevalidateAttests<T>
-where
-	<T as frame_system::Config>::RuntimeCall: IsSubType<Call<T>>,
-	<<T as frame_system::Config>::RuntimeCall as Dispatchable>::RuntimeOrigin:
-		AsSystemOriginSigner<T::AccountId> + AsTransactionAuthorizedOrigin + Clone,
-{
-	const IDENTIFIER: &'static str = "PrevalidateAttests";
-	type Implicit = ();
-	type Pre = ();
-	type Val = ();
-
-	fn weight(&self, call: &T::RuntimeCall) -> Weight {
-		if let Some(Call::attest { .. }) = call.is_sub_type() {
-			T::WeightInfo::prevalidate_attests()
-		} else {
-			Weight::zero()
-		}
-	}
-
-	fn validate(
-		&self,
-		origin: <T::RuntimeCall as Dispatchable>::RuntimeOrigin,
-		call: &T::RuntimeCall,
-		_info: &DispatchInfoOf<T::RuntimeCall>,
-		_len: usize,
-		_self_implicit: Self::Implicit,
-		_inherited_implication: &impl Encode,
-		_source: TransactionSource,
-	) -> Result<
-		(ValidTransaction, Self::Val, <T::RuntimeCall as Dispatchable>::RuntimeOrigin),
-		TransactionValidityError,
-	> {
-		if let Some(Call::attest { statement: attested_statement }) = call.is_sub_type() {
-			let who = origin.as_system_origin_signer().ok_or(InvalidTransaction::BadSigner)?;
-			let signer = Preclaims::<T>::get(who)
-				.ok_or(InvalidTransaction::Custom(ValidityError::SignerHasNoClaim.into()))?;
-			if let Some(s) = Signing::<T>::get(signer) {
-				let e = InvalidTransaction::Custom(ValidityError::InvalidStatement.into());
-				ensure!(&attested_statement[..] == s.to_text(), e);
-			}
-		}
-		Ok((ValidTransaction::default(), (), origin))
-	}
-
-	impl_tx_ext_default!(T::RuntimeCall; prepare);
-}
-
-#[cfg(any(test, feature = "runtime-benchmarks"))]
-mod secp_utils {
-	use super::*;
-
-	pub fn public(secret: &libsecp256k1::SecretKey) -> libsecp256k1::PublicKey {
-		libsecp256k1::PublicKey::from_secret_key(secret)
-	}
-	pub fn eth(secret: &libsecp256k1::SecretKey) -> EthereumAddress {
-		let mut res = EthereumAddress::default();
-		res.0.copy_from_slice(&keccak_256(&public(secret).serialize()[1..65])[12..]);
-		res
-	}
-	pub fn sig<T: Config>(
-		secret: &libsecp256k1::SecretKey,
-		what: &[u8],
-		extra: &[u8],
-	) -> EcdsaSignature {
-		let msg = keccak_256(&super::Pallet::<T>::ethereum_signable_message(
-			&to_ascii_hex(what)[..],
-			extra,
-		));
-		let (sig, recovery_id) = libsecp256k1::sign(&libsecp256k1::Message::parse(&msg), secret);
-		let mut r = [0u8; 65];
-		r[0..64].copy_from_slice(&sig.serialize()[..]);
-		r[64] = recovery_id.serialize();
-		EcdsaSignature(r)
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use hex_literal::hex;
-	use secp_utils::*;
-	use sp_runtime::transaction_validity::TransactionSource::External;
-
-	use codec::Encode;
-	// The testing primitives are very useful for avoiding having to work with signatures
-	// or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
-	use crate::claims;
-	use claims::Call as ClaimsCall;
-	use frame_support::{
-		assert_err, assert_noop, assert_ok, derive_impl,
-		dispatch::{GetDispatchInfo, Pays},
-		ord_parameter_types, parameter_types,
-		traits::{ExistenceRequirement, WithdrawReasons},
-	};
-	use pallet_balances;
-	use sp_runtime::{
-		traits::{DispatchTransaction, Identity},
-		transaction_validity::TransactionLongevity,
-		BuildStorage,
-		DispatchError::BadOrigin,
-		TokenError,
-	};
-
-	type Block = frame_system::mocking::MockBlock<Test>;
-
-	frame_support::construct_runtime!(
-		pub enum Test
-		{
-			System: frame_system,
-			Balances: pallet_balances,
-			Vesting: pallet_vesting,
-			Claims: claims,
-		}
-	);
-
-	#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
-	impl frame_system::Config for Test {
-		type RuntimeOrigin = RuntimeOrigin;
-		type RuntimeCall = RuntimeCall;
-		type Block = Block;
-		type RuntimeEvent = RuntimeEvent;
-		type AccountData = pallet_balances::AccountData<u64>;
-		type MaxConsumers = frame_support::traits::ConstU32<16>;
-	}
-
-	#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig)]
-	impl pallet_balances::Config for Test {
-		type AccountStore = System;
-	}
-
-	parameter_types! {
-		pub const MinVestedTransfer: u64 = 1;
-		pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons =
-			WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
-	}
-
-	impl pallet_vesting::Config for Test {
-		type RuntimeEvent = RuntimeEvent;
-		type Currency = Balances;
-		type BlockNumberToBalance = Identity;
-		type MinVestedTransfer = MinVestedTransfer;
-		type WeightInfo = ();
-		type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
-		type BlockNumberProvider = System;
-		const MAX_VESTING_SCHEDULES: u32 = 28;
-	}
-
-	parameter_types! {
-		pub Prefix: &'static [u8] = b"Pay RUSTs to the TEST account:";
-	}
-	ord_parameter_types! {
-		pub const Six: u64 = 6;
-	}
-
-	impl Config for Test {
-		type RuntimeEvent = RuntimeEvent;
-		type VestingSchedule = Vesting;
-		type Prefix = Prefix;
-		type MoveClaimOrigin = frame_system::EnsureSignedBy<Six, u64>;
-		type WeightInfo = TestWeightInfo;
-	}
-
-	fn alice() -> libsecp256k1::SecretKey {
-		libsecp256k1::SecretKey::parse(&keccak_256(b"Alice")).unwrap()
-	}
-	fn bob() -> libsecp256k1::SecretKey {
-		libsecp256k1::SecretKey::parse(&keccak_256(b"Bob")).unwrap()
-	}
-	fn dave() -> libsecp256k1::SecretKey {
-		libsecp256k1::SecretKey::parse(&keccak_256(b"Dave")).unwrap()
-	}
-	fn eve() -> libsecp256k1::SecretKey {
-		libsecp256k1::SecretKey::parse(&keccak_256(b"Eve")).unwrap()
-	}
-	fn frank() -> libsecp256k1::SecretKey {
-		libsecp256k1::SecretKey::parse(&keccak_256(b"Frank")).unwrap()
-	}
-
-	// This function basically just builds a genesis storage key/value store according to
-	// our desired mockup.
-	pub fn new_test_ext() -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
-		// We use default for brevity, but you can configure as desired if needed.
-		pallet_balances::GenesisConfig::<Test>::default()
-			.assimilate_storage(&mut t)
-			.unwrap();
-		claims::GenesisConfig::<Test> {
-			claims: vec![
-				(eth(&alice()), 100, None, None),
-				(eth(&dave()), 200, None, Some(StatementKind::Regular)),
-				(eth(&eve()), 300, Some(42), Some(StatementKind::Saft)),
-				(eth(&frank()), 400, Some(43), None),
-			],
-			vesting: vec![(eth(&alice()), (50, 10, 1))],
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-		t.into()
-	}
-
-	fn total_claims() -> u64 {
-		100 + 200 + 300 + 400
-	}
-
-	#[test]
-	fn basic_setup_works() {
-		new_test_ext().execute_with(|| {
-			assert_eq!(claims::Total::<Test>::get(), total_claims());
-			assert_eq!(claims::Claims::<Test>::get(&eth(&alice())), Some(100));
-			assert_eq!(claims::Claims::<Test>::get(&eth(&dave())), Some(200));
-			assert_eq!(claims::Claims::<Test>::get(&eth(&eve())), Some(300));
-			assert_eq!(claims::Claims::<Test>::get(&eth(&frank())), Some(400));
-			assert_eq!(claims::Claims::<Test>::get(&EthereumAddress::default()), None);
-			assert_eq!(claims::Vesting::<Test>::get(&eth(&alice())), Some((50, 10, 1)));
-		});
-	}
-
-	#[test]
-	fn serde_works() {
-		let x = EthereumAddress(hex!["0123456789abcdef0123456789abcdef01234567"]);
-		let y = serde_json::to_string(&x).unwrap();
-		assert_eq!(y, "\"0x0123456789abcdef0123456789abcdef01234567\"");
-		let z: EthereumAddress = serde_json::from_str(&y).unwrap();
-		assert_eq!(x, z);
-	}
-
-	#[test]
-	fn claiming_works() {
-		new_test_ext().execute_with(|| {
-			assert_eq!(Balances::free_balance(42), 0);
-			assert_ok!(Claims::claim(
-				RuntimeOrigin::none(),
-				42,
-				sig::<Test>(&alice(), &42u64.encode(), &[][..])
-			));
-			assert_eq!(Balances::free_balance(&42), 100);
-			assert_eq!(Vesting::vesting_balance(&42), Some(50));
-			assert_eq!(claims::Total::<Test>::get(), total_claims() - 100);
-		});
-	}
-
-	#[test]
-	fn basic_claim_moving_works() {
-		new_test_ext().execute_with(|| {
-			assert_eq!(Balances::free_balance(42), 0);
-			assert_noop!(
-				Claims::move_claim(RuntimeOrigin::signed(1), eth(&alice()), eth(&bob()), None),
-				BadOrigin
-			);
-			assert_ok!(Claims::move_claim(
-				RuntimeOrigin::signed(6),
-				eth(&alice()),
-				eth(&bob()),
-				None
-			));
-			assert_noop!(
-				Claims::claim(
-					RuntimeOrigin::none(),
-					42,
-					sig::<Test>(&alice(), &42u64.encode(), &[][..])
-				),
-				Error::<Test>::SignerHasNoClaim
-			);
-			assert_ok!(Claims::claim(
-				RuntimeOrigin::none(),
-				42,
-				sig::<Test>(&bob(), &42u64.encode(), &[][..])
-			));
-			assert_eq!(Balances::free_balance(&42), 100);
-			assert_eq!(Vesting::vesting_balance(&42), Some(50));
-			assert_eq!(claims::Total::<Test>::get(), total_claims() - 100);
-		});
-	}
-
-	#[test]
-	fn claim_attest_moving_works() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Claims::move_claim(
-				RuntimeOrigin::signed(6),
-				eth(&dave()),
-				eth(&bob()),
-				None
-			));
-			let s = sig::<Test>(&bob(), &42u64.encode(), StatementKind::Regular.to_text());
-			assert_ok!(Claims::claim_attest(
-				RuntimeOrigin::none(),
-				42,
-				s,
-				StatementKind::Regular.to_text().to_vec()
-			));
-			assert_eq!(Balances::free_balance(&42), 200);
-		});
-	}
-
-	#[test]
-	fn attest_moving_works() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Claims::move_claim(
-				RuntimeOrigin::signed(6),
-				eth(&eve()),
-				eth(&bob()),
-				Some(42)
-			));
-			assert_ok!(Claims::attest(
-				RuntimeOrigin::signed(42),
-				StatementKind::Saft.to_text().to_vec()
-			));
-			assert_eq!(Balances::free_balance(&42), 300);
-		});
-	}
-
-	#[test]
-	fn claiming_does_not_bypass_signing() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Claims::claim(
-				RuntimeOrigin::none(),
-				42,
-				sig::<Test>(&alice(), &42u64.encode(), &[][..])
-			));
-			assert_noop!(
-				Claims::claim(
-					RuntimeOrigin::none(),
-					42,
-					sig::<Test>(&dave(), &42u64.encode(), &[][..])
-				),
-				Error::<Test>::InvalidStatement,
-			);
-			assert_noop!(
-				Claims::claim(
-					RuntimeOrigin::none(),
-					42,
-					sig::<Test>(&eve(), &42u64.encode(), &[][..])
-				),
-				Error::<Test>::InvalidStatement,
-			);
-			assert_ok!(Claims::claim(
-				RuntimeOrigin::none(),
-				42,
-				sig::<Test>(&frank(), &42u64.encode(), &[][..])
-			));
-		});
-	}
-
-	#[test]
-	fn attest_claiming_works() {
-		new_test_ext().execute_with(|| {
-			assert_eq!(Balances::free_balance(42), 0);
-			let s = sig::<Test>(&dave(), &42u64.encode(), StatementKind::Saft.to_text());
-			let r = Claims::claim_attest(
-				RuntimeOrigin::none(),
-				42,
-				s.clone(),
-				StatementKind::Saft.to_text().to_vec(),
-			);
-			assert_noop!(r, Error::<Test>::InvalidStatement);
-
-			let r = Claims::claim_attest(
-				RuntimeOrigin::none(),
-				42,
-				s,
-				StatementKind::Regular.to_text().to_vec(),
-			);
-			assert_noop!(r, Error::<Test>::SignerHasNoClaim);
-			// ^^^ we use ecdsa_recover, so an invalid signature just results in a random signer id
-			// being recovered, which realistically will never have a claim.
-
-			let s = sig::<Test>(&dave(), &42u64.encode(), StatementKind::Regular.to_text());
-			assert_ok!(Claims::claim_attest(
-				RuntimeOrigin::none(),
-				42,
-				s,
-				StatementKind::Regular.to_text().to_vec()
-			));
-			assert_eq!(Balances::free_balance(&42), 200);
-			assert_eq!(claims::Total::<Test>::get(), total_claims() - 200);
-
-			let s = sig::<Test>(&dave(), &42u64.encode(), StatementKind::Regular.to_text());
-			let r = Claims::claim_attest(
-				RuntimeOrigin::none(),
-				42,
-				s,
-				StatementKind::Regular.to_text().to_vec(),
-			);
-			assert_noop!(r, Error::<Test>::SignerHasNoClaim);
-		});
-	}
-
-	#[test]
-	fn attesting_works() {
-		new_test_ext().execute_with(|| {
-			assert_eq!(Balances::free_balance(42), 0);
-			assert_noop!(
-				Claims::attest(RuntimeOrigin::signed(69), StatementKind::Saft.to_text().to_vec()),
-				Error::<Test>::SenderHasNoClaim
-			);
-			assert_noop!(
-				Claims::attest(
-					RuntimeOrigin::signed(42),
-					StatementKind::Regular.to_text().to_vec()
-				),
-				Error::<Test>::InvalidStatement
-			);
-			assert_ok!(Claims::attest(
-				RuntimeOrigin::signed(42),
-				StatementKind::Saft.to_text().to_vec()
-			));
-			assert_eq!(Balances::free_balance(&42), 300);
-			assert_eq!(claims::Total::<Test>::get(), total_claims() - 300);
-		});
-	}
-
-	#[test]
-	fn claim_cannot_clobber_preclaim() {
-		new_test_ext().execute_with(|| {
-			assert_eq!(Balances::free_balance(42), 0);
-			// Alice's claim is 100
-			assert_ok!(Claims::claim(
-				RuntimeOrigin::none(),
-				42,
-				sig::<Test>(&alice(), &42u64.encode(), &[][..])
-			));
-			assert_eq!(Balances::free_balance(&42), 100);
-			// Eve's claim is 300 through Account 42
-			assert_ok!(Claims::attest(
-				RuntimeOrigin::signed(42),
-				StatementKind::Saft.to_text().to_vec()
-			));
-			assert_eq!(Balances::free_balance(&42), 100 + 300);
-			assert_eq!(claims::Total::<Test>::get(), total_claims() - 400);
-		});
-	}
-
-	#[test]
-	fn valid_attest_transactions_are_free() {
-		new_test_ext().execute_with(|| {
-			let p = PrevalidateAttests::<Test>::new();
-			let c = RuntimeCall::Claims(ClaimsCall::attest {
-				statement: StatementKind::Saft.to_text().to_vec(),
-			});
-			let di = c.get_dispatch_info();
-			assert_eq!(di.pays_fee, Pays::No);
-			let r = p.validate_only(Some(42).into(), &c, &di, 20, External, 0);
-			assert_eq!(r.unwrap().0, ValidTransaction::default());
-		});
-	}
-
-	#[test]
-	fn invalid_attest_transactions_are_recognized() {
-		new_test_ext().execute_with(|| {
-			let p = PrevalidateAttests::<Test>::new();
-			let c = RuntimeCall::Claims(ClaimsCall::attest {
-				statement: StatementKind::Regular.to_text().to_vec(),
-			});
-			let di = c.get_dispatch_info();
-			let r = p.validate_only(Some(42).into(), &c, &di, 20, External, 0);
-			assert!(r.is_err());
-			let c = RuntimeCall::Claims(ClaimsCall::attest {
-				statement: StatementKind::Saft.to_text().to_vec(),
-			});
-			let di = c.get_dispatch_info();
-			let r = p.validate_only(Some(69).into(), &c, &di, 20, External, 0);
-			assert!(r.is_err());
-		});
-	}
-
-	#[test]
-	fn cannot_bypass_attest_claiming() {
-		new_test_ext().execute_with(|| {
-			assert_eq!(Balances::free_balance(42), 0);
-			let s = sig::<Test>(&dave(), &42u64.encode(), &[]);
-			let r = Claims::claim(RuntimeOrigin::none(), 42, s.clone());
-			assert_noop!(r, Error::<Test>::InvalidStatement);
-		});
-	}
-
-	#[test]
-	fn add_claim_works() {
-		new_test_ext().execute_with(|| {
-			assert_noop!(
-				Claims::mint_claim(RuntimeOrigin::signed(42), eth(&bob()), 200, None, None),
-				sp_runtime::traits::BadOrigin,
-			);
-			assert_eq!(Balances::free_balance(42), 0);
-			assert_noop!(
-				Claims::claim(
-					RuntimeOrigin::none(),
-					69,
-					sig::<Test>(&bob(), &69u64.encode(), &[][..])
-				),
-				Error::<Test>::SignerHasNoClaim,
-			);
-			assert_ok!(Claims::mint_claim(RuntimeOrigin::root(), eth(&bob()), 200, None, None));
-			assert_eq!(claims::Total::<Test>::get(), total_claims() + 200);
-			assert_ok!(Claims::claim(
-				RuntimeOrigin::none(),
-				69,
-				sig::<Test>(&bob(), &69u64.encode(), &[][..])
-			));
-			assert_eq!(Balances::free_balance(&69), 200);
-			assert_eq!(Vesting::vesting_balance(&69), None);
-			assert_eq!(claims::Total::<Test>::get(), total_claims());
-		});
-	}
-
-	#[test]
-	fn add_claim_with_vesting_works() {
-		new_test_ext().execute_with(|| {
-			assert_noop!(
-				Claims::mint_claim(
-					RuntimeOrigin::signed(42),
-					eth(&bob()),
-					200,
-					Some((50, 10, 1)),
-					None
-				),
-				sp_runtime::traits::BadOrigin,
-			);
-			assert_eq!(Balances::free_balance(42), 0);
-			assert_noop!(
-				Claims::claim(
-					RuntimeOrigin::none(),
-					69,
-					sig::<Test>(&bob(), &69u64.encode(), &[][..])
-				),
-				Error::<Test>::SignerHasNoClaim,
-			);
-			assert_ok!(Claims::mint_claim(
-				RuntimeOrigin::root(),
-				eth(&bob()),
-				200,
-				Some((50, 10, 1)),
-				None
-			));
-			assert_ok!(Claims::claim(
-				RuntimeOrigin::none(),
-				69,
-				sig::<Test>(&bob(), &69u64.encode(), &[][..])
-			));
-			assert_eq!(Balances::free_balance(&69), 200);
-			assert_eq!(Vesting::vesting_balance(&69), Some(50));
-
-			// Make sure we can not transfer the vested balance.
-			assert_err!(
-				<Balances as Currency<_>>::transfer(
-					&69,
-					&80,
-					180,
-					ExistenceRequirement::AllowDeath
-				),
-				TokenError::Frozen,
-			);
-		});
-	}
-
-	#[test]
-	fn add_claim_with_statement_works() {
-		new_test_ext().execute_with(|| {
-			assert_noop!(
-				Claims::mint_claim(
-					RuntimeOrigin::signed(42),
-					eth(&bob()),
-					200,
-					None,
-					Some(StatementKind::Regular)
-				),
-				sp_runtime::traits::BadOrigin,
-			);
-			assert_eq!(Balances::free_balance(42), 0);
-			let signature = sig::<Test>(&bob(), &69u64.encode(), StatementKind::Regular.to_text());
-			assert_noop!(
-				Claims::claim_attest(
-					RuntimeOrigin::none(),
-					69,
-					signature.clone(),
-					StatementKind::Regular.to_text().to_vec()
-				),
-				Error::<Test>::SignerHasNoClaim
-			);
-			assert_ok!(Claims::mint_claim(
-				RuntimeOrigin::root(),
-				eth(&bob()),
-				200,
-				None,
-				Some(StatementKind::Regular)
-			));
-			assert_noop!(
-				Claims::claim_attest(RuntimeOrigin::none(), 69, signature.clone(), vec![],),
-				Error::<Test>::SignerHasNoClaim
-			);
-			assert_ok!(Claims::claim_attest(
-				RuntimeOrigin::none(),
-				69,
-				signature.clone(),
-				StatementKind::Regular.to_text().to_vec()
-			));
-			assert_eq!(Balances::free_balance(&69), 200);
-		});
-	}
-
-	#[test]
-	fn origin_signed_claiming_fail() {
-		new_test_ext().execute_with(|| {
-			assert_eq!(Balances::free_balance(42), 0);
-			assert_err!(
-				Claims::claim(
-					RuntimeOrigin::signed(42),
-					42,
-					sig::<Test>(&alice(), &42u64.encode(), &[][..])
-				),
-				sp_runtime::traits::BadOrigin,
-			);
-		});
-	}
-
-	#[test]
-	fn double_claiming_doesnt_work() {
-		new_test_ext().execute_with(|| {
-			assert_eq!(Balances::free_balance(42), 0);
-			assert_ok!(Claims::claim(
-				RuntimeOrigin::none(),
-				42,
-				sig::<Test>(&alice(), &42u64.encode(), &[][..])
-			));
-			assert_noop!(
-				Claims::claim(
-					RuntimeOrigin::none(),
-					42,
-					sig::<Test>(&alice(), &42u64.encode(), &[][..])
-				),
-				Error::<Test>::SignerHasNoClaim
-			);
-		});
-	}
-
-	#[test]
-	fn claiming_while_vested_doesnt_work() {
-		new_test_ext().execute_with(|| {
-			CurrencyOf::<Test>::make_free_balance_be(&69, total_claims());
-			assert_eq!(Balances::free_balance(69), total_claims());
-			// A user is already vested
-			assert_ok!(<Test as Config>::VestingSchedule::add_vesting_schedule(
-				&69,
-				total_claims(),
-				100,
-				10
-			));
-			assert_ok!(Claims::mint_claim(
-				RuntimeOrigin::root(),
-				eth(&bob()),
-				200,
-				Some((50, 10, 1)),
-				None
-			));
-			// New total
-			assert_eq!(claims::Total::<Test>::get(), total_claims() + 200);
-
-			// They should not be able to claim
-			assert_noop!(
-				Claims::claim(
-					RuntimeOrigin::none(),
-					69,
-					sig::<Test>(&bob(), &69u64.encode(), &[][..])
-				),
-				Error::<Test>::VestedBalanceExists,
-			);
-		});
-	}
-
-	#[test]
-	fn non_sender_sig_doesnt_work() {
-		new_test_ext().execute_with(|| {
-			assert_eq!(Balances::free_balance(42), 0);
-			assert_noop!(
-				Claims::claim(
-					RuntimeOrigin::none(),
-					42,
-					sig::<Test>(&alice(), &69u64.encode(), &[][..])
-				),
-				Error::<Test>::SignerHasNoClaim
-			);
-		});
-	}
-
-	#[test]
-	fn non_claimant_doesnt_work() {
-		new_test_ext().execute_with(|| {
-			assert_eq!(Balances::free_balance(42), 0);
-			assert_noop!(
-				Claims::claim(
-					RuntimeOrigin::none(),
-					42,
-					sig::<Test>(&bob(), &69u64.encode(), &[][..])
-				),
-				Error::<Test>::SignerHasNoClaim
-			);
-		});
-	}
-
-	#[test]
-	fn real_eth_sig_works() {
-		new_test_ext().execute_with(|| {
-			// "Pay RUSTs to the TEST account:2a00000000000000"
-			let sig = hex!["444023e89b67e67c0562ed0305d252a5dd12b2af5ac51d6d3cb69a0b486bc4b3191401802dc29d26d586221f7256cd3329fe82174bdf659baea149a40e1c495d1c"];
-			let sig = EcdsaSignature(sig);
-			let who = 42u64.using_encoded(to_ascii_hex);
-			let signer = Claims::eth_recover(&sig, &who, &[][..]).unwrap();
-			assert_eq!(signer.0, hex!["6d31165d5d932d571f3b44695653b46dcc327e84"]);
-		});
-	}
-
-	#[test]
-	fn validate_unsigned_works() {
-		use sp_runtime::traits::ValidateUnsigned;
-		let source = sp_runtime::transaction_validity::TransactionSource::External;
-
-		new_test_ext().execute_with(|| {
-			assert_eq!(
-				Pallet::<Test>::validate_unsigned(
-					source,
-					&ClaimsCall::claim {
-						dest: 1,
-						ethereum_signature: sig::<Test>(&alice(), &1u64.encode(), &[][..])
-					}
-				),
-				Ok(ValidTransaction {
-					priority: 100,
-					requires: vec![],
-					provides: vec![("claims", eth(&alice())).encode()],
-					longevity: TransactionLongevity::max_value(),
-					propagate: true,
-				})
-			);
-			assert_eq!(
-				Pallet::<Test>::validate_unsigned(
-					source,
-					&ClaimsCall::claim { dest: 0, ethereum_signature: EcdsaSignature([0; 65]) }
-				),
-				InvalidTransaction::Custom(ValidityError::InvalidEthereumSignature.into()).into(),
-			);
-			assert_eq!(
-				Pallet::<Test>::validate_unsigned(
-					source,
-					&ClaimsCall::claim {
-						dest: 1,
-						ethereum_signature: sig::<Test>(&bob(), &1u64.encode(), &[][..])
-					}
-				),
-				InvalidTransaction::Custom(ValidityError::SignerHasNoClaim.into()).into(),
-			);
-			let s = sig::<Test>(&dave(), &1u64.encode(), StatementKind::Regular.to_text());
-			let call = ClaimsCall::claim_attest {
-				dest: 1,
-				ethereum_signature: s,
-				statement: StatementKind::Regular.to_text().to_vec(),
-			};
-			assert_eq!(
-				Pallet::<Test>::validate_unsigned(source, &call),
-				Ok(ValidTransaction {
-					priority: 100,
-					requires: vec![],
-					provides: vec![("claims", eth(&dave())).encode()],
-					longevity: TransactionLongevity::max_value(),
-					propagate: true,
-				})
-			);
-			assert_eq!(
-				Pallet::<Test>::validate_unsigned(
-					source,
-					&ClaimsCall::claim_attest {
-						dest: 1,
-						ethereum_signature: EcdsaSignature([0; 65]),
-						statement: StatementKind::Regular.to_text().to_vec()
-					}
-				),
-				InvalidTransaction::Custom(ValidityError::InvalidEthereumSignature.into()).into(),
-			);
-
-			let s = sig::<Test>(&bob(), &1u64.encode(), StatementKind::Regular.to_text());
-			let call = ClaimsCall::claim_attest {
-				dest: 1,
-				ethereum_signature: s,
-				statement: StatementKind::Regular.to_text().to_vec(),
-			};
-			assert_eq!(
-				Pallet::<Test>::validate_unsigned(source, &call),
-				InvalidTransaction::Custom(ValidityError::SignerHasNoClaim.into()).into(),
-			);
-
-			let s = sig::<Test>(&dave(), &1u64.encode(), StatementKind::Saft.to_text());
-			let call = ClaimsCall::claim_attest {
-				dest: 1,
-				ethereum_signature: s,
-				statement: StatementKind::Regular.to_text().to_vec(),
-			};
-			assert_eq!(
-				Pallet::<Test>::validate_unsigned(source, &call),
-				InvalidTransaction::Custom(ValidityError::SignerHasNoClaim.into()).into(),
-			);
-
-			let s = sig::<Test>(&dave(), &1u64.encode(), StatementKind::Saft.to_text());
-			let call = ClaimsCall::claim_attest {
-				dest: 1,
-				ethereum_signature: s,
-				statement: StatementKind::Saft.to_text().to_vec(),
-			};
-			assert_eq!(
-				Pallet::<Test>::validate_unsigned(source, &call),
-				InvalidTransaction::Custom(ValidityError::InvalidStatement.into()).into(),
-			);
-		});
-	}
-}
-
-#[cfg(feature = "runtime-benchmarks")]
-mod benchmarking {
-	use super::*;
-	use crate::claims::Call;
-	use frame_benchmarking::v2::*;
-	use frame_support::{
-		dispatch::{DispatchInfo, GetDispatchInfo},
-		traits::UnfilteredDispatchable,
-	};
-	use frame_system::RawOrigin;
-	use secp_utils::*;
-	use sp_runtime::{
-		traits::{DispatchTransaction, ValidateUnsigned},
-		DispatchResult,
-	};
-
-	const SEED: u32 = 0;
-
-	const MAX_CLAIMS: u32 = 10_000;
-	const VALUE: u32 = 1_000_000;
-
-	fn create_claim<T: Config>(input: u32) -> DispatchResult {
-		let secret_key = libsecp256k1::SecretKey::parse(&keccak_256(&input.encode())).unwrap();
-		let eth_address = eth(&secret_key);
-		let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into()));
-		super::Pallet::<T>::mint_claim(
-			RawOrigin::Root.into(),
-			eth_address,
-			VALUE.into(),
-			vesting,
-			None,
-		)?;
-		Ok(())
-	}
-
-	fn create_claim_attest<T: Config>(input: u32) -> DispatchResult {
-		let secret_key = libsecp256k1::SecretKey::parse(&keccak_256(&input.encode())).unwrap();
-		let eth_address = eth(&secret_key);
-		let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into()));
-		super::Pallet::<T>::mint_claim(
-			RawOrigin::Root.into(),
-			eth_address,
-			VALUE.into(),
-			vesting,
-			Some(Default::default()),
-		)?;
-		Ok(())
-	}
-
-	#[benchmarks(
-		where
-			<T as frame_system::Config>::RuntimeCall: IsSubType<Call<T>> + From<Call<T>>,
-			<T as frame_system::Config>::RuntimeCall: Dispatchable<Info = DispatchInfo> + GetDispatchInfo,
-			<<T as frame_system::Config>::RuntimeCall as Dispatchable>::RuntimeOrigin: AsSystemOriginSigner<T::AccountId> + AsTransactionAuthorizedOrigin + Clone,
-			<<T as frame_system::Config>::RuntimeCall as Dispatchable>::PostInfo: Default,
-	)]
-	mod benchmarks {
-		use super::*;
-
-		// Benchmark `claim` including `validate_unsigned` logic.
-		#[benchmark]
-		fn claim() -> Result<(), BenchmarkError> {
-			let c = MAX_CLAIMS;
-			for _ in 0..c / 2 {
-				create_claim::<T>(c)?;
-				create_claim_attest::<T>(u32::MAX - c)?;
-			}
-			let secret_key = libsecp256k1::SecretKey::parse(&keccak_256(&c.encode())).unwrap();
-			let eth_address = eth(&secret_key);
-			let account: T::AccountId = account("user", c, SEED);
-			let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into()));
-			let signature = sig::<T>(&secret_key, &account.encode(), &[][..]);
-			super::Pallet::<T>::mint_claim(
-				RawOrigin::Root.into(),
-				eth_address,
-				VALUE.into(),
-				vesting,
-				None,
-			)?;
-			assert_eq!(Claims::<T>::get(eth_address), Some(VALUE.into()));
-			let source = sp_runtime::transaction_validity::TransactionSource::External;
-			let call_enc =
-				Call::<T>::claim { dest: account.clone(), ethereum_signature: signature.clone() }
-					.encode();
-
-			#[block]
-			{
-				let call = <Call<T> as Decode>::decode(&mut &*call_enc)
-					.expect("call is encoded above, encoding must be correct");
-				super::Pallet::<T>::validate_unsigned(source, &call)
-					.map_err(|e| -> &'static str { e.into() })?;
-				call.dispatch_bypass_filter(RawOrigin::None.into())?;
-			}
-
-			assert_eq!(Claims::<T>::get(eth_address), None);
-			Ok(())
-		}
-
-		// Benchmark `mint_claim` when there already exists `c` claims in storage.
-		#[benchmark]
-		fn mint_claim() -> Result<(), BenchmarkError> {
-			let c = MAX_CLAIMS;
-			for _ in 0..c / 2 {
-				create_claim::<T>(c)?;
-				create_claim_attest::<T>(u32::MAX - c)?;
-			}
-			let eth_address = account("eth_address", 0, SEED);
-			let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into()));
-			let statement = StatementKind::Regular;
-
-			#[extrinsic_call]
-			_(RawOrigin::Root, eth_address, VALUE.into(), vesting, Some(statement));
-
-			assert_eq!(Claims::<T>::get(eth_address), Some(VALUE.into()));
-			Ok(())
-		}
-
-		// Benchmark `claim_attest` including `validate_unsigned` logic.
-		#[benchmark]
-		fn claim_attest() -> Result<(), BenchmarkError> {
-			let c = MAX_CLAIMS;
-			for _ in 0..c / 2 {
-				create_claim::<T>(c)?;
-				create_claim_attest::<T>(u32::MAX - c)?;
-			}
-			// Crate signature
-			let attest_c = u32::MAX - c;
-			let secret_key =
-				libsecp256k1::SecretKey::parse(&keccak_256(&attest_c.encode())).unwrap();
-			let eth_address = eth(&secret_key);
-			let account: T::AccountId = account("user", c, SEED);
-			let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into()));
-			let statement = StatementKind::Regular;
-			let signature = sig::<T>(&secret_key, &account.encode(), statement.to_text());
-			super::Pallet::<T>::mint_claim(
-				RawOrigin::Root.into(),
-				eth_address,
-				VALUE.into(),
-				vesting,
-				Some(statement),
-			)?;
-			assert_eq!(Claims::<T>::get(eth_address), Some(VALUE.into()));
-			let call_enc = Call::<T>::claim_attest {
-				dest: account.clone(),
-				ethereum_signature: signature.clone(),
-				statement: StatementKind::Regular.to_text().to_vec(),
-			}
-			.encode();
-			let source = sp_runtime::transaction_validity::TransactionSource::External;
-
-			#[block]
-			{
-				let call = <Call<T> as Decode>::decode(&mut &*call_enc)
-					.expect("call is encoded above, encoding must be correct");
-				super::Pallet::<T>::validate_unsigned(source, &call)
-					.map_err(|e| -> &'static str { e.into() })?;
-				call.dispatch_bypass_filter(RawOrigin::None.into())?;
-			}
-
-			assert_eq!(Claims::<T>::get(eth_address), None);
-			Ok(())
-		}
-
-		// Benchmark `attest` including prevalidate logic.
-		#[benchmark]
-		fn attest() -> Result<(), BenchmarkError> {
-			let c = MAX_CLAIMS;
-			for _ in 0..c / 2 {
-				create_claim::<T>(c)?;
-				create_claim_attest::<T>(u32::MAX - c)?;
-			}
-			let attest_c = u32::MAX - c;
-			let secret_key =
-				libsecp256k1::SecretKey::parse(&keccak_256(&attest_c.encode())).unwrap();
-			let eth_address = eth(&secret_key);
-			let account: T::AccountId = account("user", c, SEED);
-			let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into()));
-			let statement = StatementKind::Regular;
-			super::Pallet::<T>::mint_claim(
-				RawOrigin::Root.into(),
-				eth_address,
-				VALUE.into(),
-				vesting,
-				Some(statement),
-			)?;
-			Preclaims::<T>::insert(&account, eth_address);
-			assert_eq!(Claims::<T>::get(eth_address), Some(VALUE.into()));
-
-			let stmt = StatementKind::Regular.to_text().to_vec();
-
-			#[extrinsic_call]
-			_(RawOrigin::Signed(account), stmt);
-
-			assert_eq!(Claims::<T>::get(eth_address), None);
-			Ok(())
-		}
-
-		#[benchmark]
-		fn move_claim() -> Result<(), BenchmarkError> {
-			let c = MAX_CLAIMS;
-			for _ in 0..c / 2 {
-				create_claim::<T>(c)?;
-				create_claim_attest::<T>(u32::MAX - c)?;
-			}
-			let attest_c = u32::MAX - c;
-			let secret_key =
-				libsecp256k1::SecretKey::parse(&keccak_256(&attest_c.encode())).unwrap();
-			let eth_address = eth(&secret_key);
-
-			let new_secret_key =
-				libsecp256k1::SecretKey::parse(&keccak_256(&(u32::MAX / 2).encode())).unwrap();
-			let new_eth_address = eth(&new_secret_key);
-
-			let account: T::AccountId = account("user", c, SEED);
-			Preclaims::<T>::insert(&account, eth_address);
-
-			assert!(Claims::<T>::contains_key(eth_address));
-			assert!(!Claims::<T>::contains_key(new_eth_address));
-
-			#[extrinsic_call]
-			_(RawOrigin::Root, eth_address, new_eth_address, Some(account));
-
-			assert!(!Claims::<T>::contains_key(eth_address));
-			assert!(Claims::<T>::contains_key(new_eth_address));
-			Ok(())
-		}
-
-		// Benchmark the time it takes to do `repeat` number of keccak256 hashes
-		#[benchmark(extra)]
-		fn keccak256(i: Linear<0, 10_000>) {
-			let bytes = (i).encode();
-
-			#[block]
-			{
-				for _ in 0..i {
-					let _hash = keccak_256(&bytes);
-				}
-			}
-		}
-
-		// Benchmark the time it takes to do `repeat` number of `eth_recover`
-		#[benchmark(extra)]
-		fn eth_recover(i: Linear<0, 1_000>) {
-			// Crate signature
-			let secret_key = libsecp256k1::SecretKey::parse(&keccak_256(&i.encode())).unwrap();
-			let account: T::AccountId = account("user", i, SEED);
-			let signature = sig::<T>(&secret_key, &account.encode(), &[][..]);
-			let data = account.using_encoded(to_ascii_hex);
-			let extra = StatementKind::default().to_text();
-
-			#[block]
-			{
-				for _ in 0..i {
-					assert!(super::Pallet::<T>::eth_recover(&signature, &data, extra).is_some());
-				}
-			}
-		}
-
-		#[benchmark]
-		fn prevalidate_attests() -> Result<(), BenchmarkError> {
-			let c = MAX_CLAIMS;
-			for _ in 0..c / 2 {
-				create_claim::<T>(c)?;
-				create_claim_attest::<T>(u32::MAX - c)?;
-			}
-			let ext = PrevalidateAttests::<T>::new();
-			let call = super::Call::attest { statement: StatementKind::Regular.to_text().to_vec() };
-			let call: <T as frame_system::Config>::RuntimeCall = call.into();
-			let info = call.get_dispatch_info();
-			let attest_c = u32::MAX - c;
-			let secret_key =
-				libsecp256k1::SecretKey::parse(&keccak_256(&attest_c.encode())).unwrap();
-			let eth_address = eth(&secret_key);
-			let account: T::AccountId = account("user", c, SEED);
-			let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into()));
-			let statement = StatementKind::Regular;
-			super::Pallet::<T>::mint_claim(
-				RawOrigin::Root.into(),
-				eth_address,
-				VALUE.into(),
-				vesting,
-				Some(statement),
-			)?;
-			Preclaims::<T>::insert(&account, eth_address);
-			assert_eq!(Claims::<T>::get(eth_address), Some(VALUE.into()));
-
-			#[block]
-			{
-				assert!(ext
-					.test_run(RawOrigin::Signed(account).into(), &call, &info, 0, 0, |_| {
-						Ok(Default::default())
-					})
-					.unwrap()
-					.is_ok());
-			}
-
-			Ok(())
-		}
-
-		impl_benchmark_test_suite!(
-			Pallet,
-			crate::claims::tests::new_test_ext(),
-			crate::claims::tests::Test,
-		);
-	}
-}
diff --git a/polkadot/runtime/common/src/claims/benchmarking.rs b/polkadot/runtime/common/src/claims/benchmarking.rs
new file mode 100644
index 000000000000..f9150f7980e5
--- /dev/null
+++ b/polkadot/runtime/common/src/claims/benchmarking.rs
@@ -0,0 +1,318 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Benchmarking for claims pallet
+
+#[cfg(feature = "runtime-benchmarks")]
+use super::*;
+use crate::claims::Call;
+use frame_benchmarking::v2::*;
+use frame_support::{
+	dispatch::{DispatchInfo, GetDispatchInfo},
+	traits::UnfilteredDispatchable,
+};
+use frame_system::RawOrigin;
+use secp_utils::*;
+use sp_runtime::{
+	traits::{DispatchTransaction, ValidateUnsigned},
+	DispatchResult,
+};
+
+const SEED: u32 = 0;
+
+const MAX_CLAIMS: u32 = 10_000;
+const VALUE: u32 = 1_000_000;
+
+fn create_claim<T: Config>(input: u32) -> DispatchResult {
+	let secret_key = libsecp256k1::SecretKey::parse(&keccak_256(&input.encode())).unwrap();
+	let eth_address = eth(&secret_key);
+	let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into()));
+	super::Pallet::<T>::mint_claim(
+		RawOrigin::Root.into(),
+		eth_address,
+		VALUE.into(),
+		vesting,
+		None,
+	)?;
+	Ok(())
+}
+
+fn create_claim_attest<T: Config>(input: u32) -> DispatchResult {
+	let secret_key = libsecp256k1::SecretKey::parse(&keccak_256(&input.encode())).unwrap();
+	let eth_address = eth(&secret_key);
+	let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into()));
+	super::Pallet::<T>::mint_claim(
+		RawOrigin::Root.into(),
+		eth_address,
+		VALUE.into(),
+		vesting,
+		Some(Default::default()),
+	)?;
+	Ok(())
+}
+
+#[benchmarks(
+		where
+			<T as frame_system::Config>::RuntimeCall: IsSubType<Call<T>> + From<Call<T>>,
+			<T as frame_system::Config>::RuntimeCall: Dispatchable<Info = DispatchInfo> + GetDispatchInfo,
+			<<T as frame_system::Config>::RuntimeCall as Dispatchable>::RuntimeOrigin: AsSystemOriginSigner<T::AccountId> + AsTransactionAuthorizedOrigin + Clone,
+			<<T as frame_system::Config>::RuntimeCall as Dispatchable>::PostInfo: Default,
+	)]
+mod benchmarks {
+	use super::*;
+
+	// Benchmark `claim` including `validate_unsigned` logic.
+	#[benchmark]
+	fn claim() -> Result<(), BenchmarkError> {
+		let c = MAX_CLAIMS;
+		for _ in 0..c / 2 {
+			create_claim::<T>(c)?;
+			create_claim_attest::<T>(u32::MAX - c)?;
+		}
+		let secret_key = libsecp256k1::SecretKey::parse(&keccak_256(&c.encode())).unwrap();
+		let eth_address = eth(&secret_key);
+		let account: T::AccountId = account("user", c, SEED);
+		let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into()));
+		let signature = sig::<T>(&secret_key, &account.encode(), &[][..]);
+		super::Pallet::<T>::mint_claim(
+			RawOrigin::Root.into(),
+			eth_address,
+			VALUE.into(),
+			vesting,
+			None,
+		)?;
+		assert_eq!(Claims::<T>::get(eth_address), Some(VALUE.into()));
+		let source = sp_runtime::transaction_validity::TransactionSource::External;
+		let call_enc =
+			Call::<T>::claim { dest: account.clone(), ethereum_signature: signature.clone() }
+				.encode();
+
+		#[block]
+		{
+			let call = <Call<T> as Decode>::decode(&mut &*call_enc)
+				.expect("call is encoded above, encoding must be correct");
+			super::Pallet::<T>::validate_unsigned(source, &call)
+				.map_err(|e| -> &'static str { e.into() })?;
+			call.dispatch_bypass_filter(RawOrigin::None.into())?;
+		}
+
+		assert_eq!(Claims::<T>::get(eth_address), None);
+		Ok(())
+	}
+
+	// Benchmark `mint_claim` when there already exists `c` claims in storage.
+	#[benchmark]
+	fn mint_claim() -> Result<(), BenchmarkError> {
+		let c = MAX_CLAIMS;
+		for _ in 0..c / 2 {
+			create_claim::<T>(c)?;
+			create_claim_attest::<T>(u32::MAX - c)?;
+		}
+		let eth_address = account("eth_address", 0, SEED);
+		let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into()));
+		let statement = StatementKind::Regular;
+
+		#[extrinsic_call]
+		_(RawOrigin::Root, eth_address, VALUE.into(), vesting, Some(statement));
+
+		assert_eq!(Claims::<T>::get(eth_address), Some(VALUE.into()));
+		Ok(())
+	}
+
+	// Benchmark `claim_attest` including `validate_unsigned` logic.
+	#[benchmark]
+	fn claim_attest() -> Result<(), BenchmarkError> {
+		let c = MAX_CLAIMS;
+		for _ in 0..c / 2 {
+			create_claim::<T>(c)?;
+			create_claim_attest::<T>(u32::MAX - c)?;
+		}
+		// Crate signature
+		let attest_c = u32::MAX - c;
+		let secret_key = libsecp256k1::SecretKey::parse(&keccak_256(&attest_c.encode())).unwrap();
+		let eth_address = eth(&secret_key);
+		let account: T::AccountId = account("user", c, SEED);
+		let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into()));
+		let statement = StatementKind::Regular;
+		let signature = sig::<T>(&secret_key, &account.encode(), statement.to_text());
+		super::Pallet::<T>::mint_claim(
+			RawOrigin::Root.into(),
+			eth_address,
+			VALUE.into(),
+			vesting,
+			Some(statement),
+		)?;
+		assert_eq!(Claims::<T>::get(eth_address), Some(VALUE.into()));
+		let call_enc = Call::<T>::claim_attest {
+			dest: account.clone(),
+			ethereum_signature: signature.clone(),
+			statement: StatementKind::Regular.to_text().to_vec(),
+		}
+		.encode();
+		let source = sp_runtime::transaction_validity::TransactionSource::External;
+
+		#[block]
+		{
+			let call = <Call<T> as Decode>::decode(&mut &*call_enc)
+				.expect("call is encoded above, encoding must be correct");
+			super::Pallet::<T>::validate_unsigned(source, &call)
+				.map_err(|e| -> &'static str { e.into() })?;
+			call.dispatch_bypass_filter(RawOrigin::None.into())?;
+		}
+
+		assert_eq!(Claims::<T>::get(eth_address), None);
+		Ok(())
+	}
+
+	// Benchmark `attest` including prevalidate logic.
+	#[benchmark]
+	fn attest() -> Result<(), BenchmarkError> {
+		let c = MAX_CLAIMS;
+		for _ in 0..c / 2 {
+			create_claim::<T>(c)?;
+			create_claim_attest::<T>(u32::MAX - c)?;
+		}
+		let attest_c = u32::MAX - c;
+		let secret_key = libsecp256k1::SecretKey::parse(&keccak_256(&attest_c.encode())).unwrap();
+		let eth_address = eth(&secret_key);
+		let account: T::AccountId = account("user", c, SEED);
+		let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into()));
+		let statement = StatementKind::Regular;
+		super::Pallet::<T>::mint_claim(
+			RawOrigin::Root.into(),
+			eth_address,
+			VALUE.into(),
+			vesting,
+			Some(statement),
+		)?;
+		Preclaims::<T>::insert(&account, eth_address);
+		assert_eq!(Claims::<T>::get(eth_address), Some(VALUE.into()));
+
+		let stmt = StatementKind::Regular.to_text().to_vec();
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(account), stmt);
+
+		assert_eq!(Claims::<T>::get(eth_address), None);
+		Ok(())
+	}
+
+	#[benchmark]
+	fn move_claim() -> Result<(), BenchmarkError> {
+		let c = MAX_CLAIMS;
+		for _ in 0..c / 2 {
+			create_claim::<T>(c)?;
+			create_claim_attest::<T>(u32::MAX - c)?;
+		}
+		let attest_c = u32::MAX - c;
+		let secret_key = libsecp256k1::SecretKey::parse(&keccak_256(&attest_c.encode())).unwrap();
+		let eth_address = eth(&secret_key);
+
+		let new_secret_key =
+			libsecp256k1::SecretKey::parse(&keccak_256(&(u32::MAX / 2).encode())).unwrap();
+		let new_eth_address = eth(&new_secret_key);
+
+		let account: T::AccountId = account("user", c, SEED);
+		Preclaims::<T>::insert(&account, eth_address);
+
+		assert!(Claims::<T>::contains_key(eth_address));
+		assert!(!Claims::<T>::contains_key(new_eth_address));
+
+		#[extrinsic_call]
+		_(RawOrigin::Root, eth_address, new_eth_address, Some(account));
+
+		assert!(!Claims::<T>::contains_key(eth_address));
+		assert!(Claims::<T>::contains_key(new_eth_address));
+		Ok(())
+	}
+
+	// Benchmark the time it takes to do `repeat` number of keccak256 hashes
+	#[benchmark(extra)]
+	fn keccak256(i: Linear<0, 10_000>) {
+		let bytes = (i).encode();
+
+		#[block]
+		{
+			for _ in 0..i {
+				let _hash = keccak_256(&bytes);
+			}
+		}
+	}
+
+	// Benchmark the time it takes to do `repeat` number of `eth_recover`
+	#[benchmark(extra)]
+	fn eth_recover(i: Linear<0, 1_000>) {
+		// Crate signature
+		let secret_key = libsecp256k1::SecretKey::parse(&keccak_256(&i.encode())).unwrap();
+		let account: T::AccountId = account("user", i, SEED);
+		let signature = sig::<T>(&secret_key, &account.encode(), &[][..]);
+		let data = account.using_encoded(to_ascii_hex);
+		let extra = StatementKind::default().to_text();
+
+		#[block]
+		{
+			for _ in 0..i {
+				assert!(super::Pallet::<T>::eth_recover(&signature, &data, extra).is_some());
+			}
+		}
+	}
+
+	#[benchmark]
+	fn prevalidate_attests() -> Result<(), BenchmarkError> {
+		let c = MAX_CLAIMS;
+		for _ in 0..c / 2 {
+			create_claim::<T>(c)?;
+			create_claim_attest::<T>(u32::MAX - c)?;
+		}
+		let ext = PrevalidateAttests::<T>::new();
+		let call = super::Call::attest { statement: StatementKind::Regular.to_text().to_vec() };
+		let call: <T as frame_system::Config>::RuntimeCall = call.into();
+		let info = call.get_dispatch_info();
+		let attest_c = u32::MAX - c;
+		let secret_key = libsecp256k1::SecretKey::parse(&keccak_256(&attest_c.encode())).unwrap();
+		let eth_address = eth(&secret_key);
+		let account: T::AccountId = account("user", c, SEED);
+		let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into()));
+		let statement = StatementKind::Regular;
+		super::Pallet::<T>::mint_claim(
+			RawOrigin::Root.into(),
+			eth_address,
+			VALUE.into(),
+			vesting,
+			Some(statement),
+		)?;
+		Preclaims::<T>::insert(&account, eth_address);
+		assert_eq!(Claims::<T>::get(eth_address), Some(VALUE.into()));
+
+		#[block]
+		{
+			assert!(ext
+				.test_run(RawOrigin::Signed(account).into(), &call, &info, 0, 0, |_| {
+					Ok(Default::default())
+				})
+				.unwrap()
+				.is_ok());
+		}
+
+		Ok(())
+	}
+
+	impl_benchmark_test_suite!(
+		Pallet,
+		crate::claims::mock::new_test_ext(),
+		crate::claims::mock::Test,
+	);
+}
diff --git a/polkadot/runtime/common/src/claims/mock.rs b/polkadot/runtime/common/src/claims/mock.rs
new file mode 100644
index 000000000000..640df6ec6a8a
--- /dev/null
+++ b/polkadot/runtime/common/src/claims/mock.rs
@@ -0,0 +1,129 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Mocking utilities for testing in claims pallet.
+
+#[cfg(test)]
+use super::*;
+use secp_utils::*;
+
+// The testing primitives are very useful for avoiding having to work with signatures
+// or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
+use crate::claims;
+use frame_support::{derive_impl, ord_parameter_types, parameter_types, traits::WithdrawReasons};
+use pallet_balances;
+use sp_runtime::{traits::Identity, BuildStorage};
+
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test
+	{
+		System: frame_system,
+		Balances: pallet_balances,
+		Vesting: pallet_vesting,
+		Claims: claims,
+	}
+);
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
+impl frame_system::Config for Test {
+	type RuntimeOrigin = RuntimeOrigin;
+	type RuntimeCall = RuntimeCall;
+	type Block = Block;
+	type RuntimeEvent = RuntimeEvent;
+	type AccountData = pallet_balances::AccountData<u64>;
+	type MaxConsumers = frame_support::traits::ConstU32<16>;
+}
+
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig)]
+impl pallet_balances::Config for Test {
+	type AccountStore = System;
+}
+
+parameter_types! {
+	pub const MinVestedTransfer: u64 = 1;
+	pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons =
+		WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
+}
+
+impl pallet_vesting::Config for Test {
+	type RuntimeEvent = RuntimeEvent;
+	type Currency = Balances;
+	type BlockNumberToBalance = Identity;
+	type MinVestedTransfer = MinVestedTransfer;
+	type WeightInfo = ();
+	type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
+	type BlockNumberProvider = System;
+	const MAX_VESTING_SCHEDULES: u32 = 28;
+}
+
+parameter_types! {
+	pub Prefix: &'static [u8] = b"Pay RUSTs to the TEST account:";
+}
+ord_parameter_types! {
+	pub const Six: u64 = 6;
+}
+
+impl Config for Test {
+	type RuntimeEvent = RuntimeEvent;
+	type VestingSchedule = Vesting;
+	type Prefix = Prefix;
+	type MoveClaimOrigin = frame_system::EnsureSignedBy<Six, u64>;
+	type WeightInfo = TestWeightInfo;
+}
+
+pub fn alice() -> libsecp256k1::SecretKey {
+	libsecp256k1::SecretKey::parse(&keccak_256(b"Alice")).unwrap()
+}
+pub fn bob() -> libsecp256k1::SecretKey {
+	libsecp256k1::SecretKey::parse(&keccak_256(b"Bob")).unwrap()
+}
+pub fn dave() -> libsecp256k1::SecretKey {
+	libsecp256k1::SecretKey::parse(&keccak_256(b"Dave")).unwrap()
+}
+pub fn eve() -> libsecp256k1::SecretKey {
+	libsecp256k1::SecretKey::parse(&keccak_256(b"Eve")).unwrap()
+}
+pub fn frank() -> libsecp256k1::SecretKey {
+	libsecp256k1::SecretKey::parse(&keccak_256(b"Frank")).unwrap()
+}
+
+// This function basically just builds a genesis storage key/value store according to
+// our desired mockup.
+pub fn new_test_ext() -> sp_io::TestExternalities {
+	let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
+	// We use default for brevity, but you can configure as desired if needed.
+	pallet_balances::GenesisConfig::<Test>::default()
+		.assimilate_storage(&mut t)
+		.unwrap();
+	claims::GenesisConfig::<Test> {
+		claims: vec![
+			(eth(&alice()), 100, None, None),
+			(eth(&dave()), 200, None, Some(StatementKind::Regular)),
+			(eth(&eve()), 300, Some(42), Some(StatementKind::Saft)),
+			(eth(&frank()), 400, Some(43), None),
+		],
+		vesting: vec![(eth(&alice()), (50, 10, 1))],
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
+	t.into()
+}
+
+pub fn total_claims() -> u64 {
+	100 + 200 + 300 + 400
+}
diff --git a/polkadot/runtime/common/src/claims/mod.rs b/polkadot/runtime/common/src/claims/mod.rs
new file mode 100644
index 000000000000..f48e40ee1887
--- /dev/null
+++ b/polkadot/runtime/common/src/claims/mod.rs
@@ -0,0 +1,723 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Pallet to process claims from Ethereum addresses.
+
+#[cfg(not(feature = "std"))]
+use alloc::{format, string::String};
+use alloc::{vec, vec::Vec};
+use codec::{Decode, Encode, MaxEncodedLen};
+use core::fmt::Debug;
+use frame_support::{
+	ensure,
+	traits::{Currency, Get, IsSubType, VestingSchedule},
+	weights::Weight,
+	DefaultNoBound,
+};
+pub use pallet::*;
+use polkadot_primitives::ValidityError;
+use scale_info::TypeInfo;
+use serde::{self, Deserialize, Deserializer, Serialize, Serializer};
+use sp_io::{crypto::secp256k1_ecdsa_recover, hashing::keccak_256};
+use sp_runtime::{
+	impl_tx_ext_default,
+	traits::{
+		AsSystemOriginSigner, AsTransactionAuthorizedOrigin, CheckedSub, DispatchInfoOf,
+		Dispatchable, TransactionExtension, Zero,
+	},
+	transaction_validity::{
+		InvalidTransaction, TransactionSource, TransactionValidity, TransactionValidityError,
+		ValidTransaction,
+	},
+	RuntimeDebug,
+};
+
+type CurrencyOf<T> = <<T as Config>::VestingSchedule as VestingSchedule<
+	<T as frame_system::Config>::AccountId,
+>>::Currency;
+type BalanceOf<T> = <CurrencyOf<T> as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+
+pub trait WeightInfo {
+	fn claim() -> Weight;
+	fn mint_claim() -> Weight;
+	fn claim_attest() -> Weight;
+	fn attest() -> Weight;
+	fn move_claim() -> Weight;
+	fn prevalidate_attests() -> Weight;
+}
+
+pub struct TestWeightInfo;
+impl WeightInfo for TestWeightInfo {
+	fn claim() -> Weight {
+		Weight::zero()
+	}
+	fn mint_claim() -> Weight {
+		Weight::zero()
+	}
+	fn claim_attest() -> Weight {
+		Weight::zero()
+	}
+	fn attest() -> Weight {
+		Weight::zero()
+	}
+	fn move_claim() -> Weight {
+		Weight::zero()
+	}
+	fn prevalidate_attests() -> Weight {
+		Weight::zero()
+	}
+}
+
+/// The kind of statement an account needs to make for a claim to be valid.
+#[derive(
+	Encode,
+	Decode,
+	Clone,
+	Copy,
+	Eq,
+	PartialEq,
+	RuntimeDebug,
+	TypeInfo,
+	Serialize,
+	Deserialize,
+	MaxEncodedLen,
+)]
+pub enum StatementKind {
+	/// Statement required to be made by non-SAFT holders.
+	Regular,
+	/// Statement required to be made by SAFT holders.
+	Saft,
+}
+
+impl StatementKind {
+	/// Convert this to the (English) statement it represents.
+	fn to_text(self) -> &'static [u8] {
+		match self {
+			StatementKind::Regular =>
+				&b"I hereby agree to the terms of the statement whose SHA-256 multihash is \
+				Qmc1XYqT6S39WNp2UeiRUrZichUWUPpGEThDE6dAb3f6Ny. (This may be found at the URL: \
+				https://statement.polkadot.network/regular.html)"[..],
+			StatementKind::Saft =>
+				&b"I hereby agree to the terms of the statement whose SHA-256 multihash is \
+				QmXEkMahfhHJPzT3RjkXiZVFi77ZeVeuxtAjhojGRNYckz. (This may be found at the URL: \
+				https://statement.polkadot.network/saft.html)"[..],
+		}
+	}
+}
+
+impl Default for StatementKind {
+	fn default() -> Self {
+		StatementKind::Regular
+	}
+}
+
+/// An Ethereum address (i.e. 20 bytes, used to represent an Ethereum account).
+///
+/// This gets serialized to the 0x-prefixed hex representation.
+#[derive(
+	Clone, Copy, PartialEq, Eq, Encode, Decode, Default, RuntimeDebug, TypeInfo, MaxEncodedLen,
+)]
+pub struct EthereumAddress([u8; 20]);
+
+impl Serialize for EthereumAddress {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where
+		S: Serializer,
+	{
+		let hex: String = rustc_hex::ToHex::to_hex(&self.0[..]);
+		serializer.serialize_str(&format!("0x{}", hex))
+	}
+}
+
+impl<'de> Deserialize<'de> for EthereumAddress {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where
+		D: Deserializer<'de>,
+	{
+		let base_string = String::deserialize(deserializer)?;
+		let offset = if base_string.starts_with("0x") { 2 } else { 0 };
+		let s = &base_string[offset..];
+		if s.len() != 40 {
+			Err(serde::de::Error::custom(
+				"Bad length of Ethereum address (should be 42 including '0x')",
+			))?;
+		}
+		let raw: Vec<u8> = rustc_hex::FromHex::from_hex(s)
+			.map_err(|e| serde::de::Error::custom(format!("{:?}", e)))?;
+		let mut r = Self::default();
+		r.0.copy_from_slice(&raw);
+		Ok(r)
+	}
+}
+
+#[derive(Encode, Decode, Clone, TypeInfo, MaxEncodedLen)]
+pub struct EcdsaSignature(pub [u8; 65]);
+
+impl PartialEq for EcdsaSignature {
+	fn eq(&self, other: &Self) -> bool {
+		&self.0[..] == &other.0[..]
+	}
+}
+
+impl core::fmt::Debug for EcdsaSignature {
+	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+		write!(f, "EcdsaSignature({:?})", &self.0[..])
+	}
+}
+
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	/// Configuration trait.
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
+		type VestingSchedule: VestingSchedule<Self::AccountId, Moment = BlockNumberFor<Self>>;
+		#[pallet::constant]
+		type Prefix: Get<&'static [u8]>;
+		type MoveClaimOrigin: EnsureOrigin<Self::RuntimeOrigin>;
+		type WeightInfo: WeightInfo;
+	}
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config> {
+		/// Someone claimed some DOTs.
+		Claimed { who: T::AccountId, ethereum_address: EthereumAddress, amount: BalanceOf<T> },
+	}
+
+	#[pallet::error]
+	pub enum Error<T> {
+		/// Invalid Ethereum signature.
+		InvalidEthereumSignature,
+		/// Ethereum address has no claim.
+		SignerHasNoClaim,
+		/// Account ID sending transaction has no claim.
+		SenderHasNoClaim,
+		/// There's not enough in the pot to pay out some unvested amount. Generally implies a
+		/// logic error.
+		PotUnderflow,
+		/// A needed statement was not included.
+		InvalidStatement,
+		/// The account already has a vested balance.
+		VestedBalanceExists,
+	}
+
+	#[pallet::storage]
+	pub type Claims<T: Config> = StorageMap<_, Identity, EthereumAddress, BalanceOf<T>>;
+
+	#[pallet::storage]
+	pub type Total<T: Config> = StorageValue<_, BalanceOf<T>, ValueQuery>;
+
+	/// Vesting schedule for a claim.
+	/// First balance is the total amount that should be held for vesting.
+	/// Second balance is how much should be unlocked per block.
+	/// The block number is when the vesting should start.
+	#[pallet::storage]
+	pub type Vesting<T: Config> =
+		StorageMap<_, Identity, EthereumAddress, (BalanceOf<T>, BalanceOf<T>, BlockNumberFor<T>)>;
+
+	/// The statement kind that must be signed, if any.
+	#[pallet::storage]
+	pub(super) type Signing<T> = StorageMap<_, Identity, EthereumAddress, StatementKind>;
+
+	/// Pre-claimed Ethereum accounts, by the Account ID that they are claimed to.
+	#[pallet::storage]
+	pub(super) type Preclaims<T: Config> = StorageMap<_, Identity, T::AccountId, EthereumAddress>;
+
+	#[pallet::genesis_config]
+	#[derive(DefaultNoBound)]
+	pub struct GenesisConfig<T: Config> {
+		pub claims:
+			Vec<(EthereumAddress, BalanceOf<T>, Option<T::AccountId>, Option<StatementKind>)>,
+		pub vesting: Vec<(EthereumAddress, (BalanceOf<T>, BalanceOf<T>, BlockNumberFor<T>))>,
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
+		fn build(&self) {
+			// build `Claims`
+			self.claims.iter().map(|(a, b, _, _)| (*a, *b)).for_each(|(a, b)| {
+				Claims::<T>::insert(a, b);
+			});
+			// build `Total`
+			Total::<T>::put(
+				self.claims
+					.iter()
+					.fold(Zero::zero(), |acc: BalanceOf<T>, &(_, b, _, _)| acc + b),
+			);
+			// build `Vesting`
+			self.vesting.iter().for_each(|(k, v)| {
+				Vesting::<T>::insert(k, v);
+			});
+			// build `Signing`
+			self.claims
+				.iter()
+				.filter_map(|(a, _, _, s)| Some((*a, (*s)?)))
+				.for_each(|(a, s)| {
+					Signing::<T>::insert(a, s);
+				});
+			// build `Preclaims`
+			self.claims.iter().filter_map(|(a, _, i, _)| Some((i.clone()?, *a))).for_each(
+				|(i, a)| {
+					Preclaims::<T>::insert(i, a);
+				},
+			);
+		}
+	}
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		/// Make a claim to collect your DOTs.
+		///
+		/// The dispatch origin for this call must be _None_.
+		///
+		/// Unsigned Validation:
+		/// A call to claim is deemed valid if the signature provided matches
+		/// the expected signed message of:
+		///
+		/// > Ethereum Signed Message:
+		/// > (configured prefix string)(address)
+		///
+		/// and `address` matches the `dest` account.
+		///
+		/// Parameters:
+		/// - `dest`: The destination account to payout the claim.
+		/// - `ethereum_signature`: The signature of an ethereum signed message matching the format
+		///   described above.
+		///
+		/// <weight>
+		/// The weight of this call is invariant over the input parameters.
+		/// Weight includes logic to validate unsigned `claim` call.
+		///
+		/// Total Complexity: O(1)
+		/// </weight>
+		#[pallet::call_index(0)]
+		#[pallet::weight(T::WeightInfo::claim())]
+		pub fn claim(
+			origin: OriginFor<T>,
+			dest: T::AccountId,
+			ethereum_signature: EcdsaSignature,
+		) -> DispatchResult {
+			ensure_none(origin)?;
+
+			let data = dest.using_encoded(to_ascii_hex);
+			let signer = Self::eth_recover(&ethereum_signature, &data, &[][..])
+				.ok_or(Error::<T>::InvalidEthereumSignature)?;
+			ensure!(Signing::<T>::get(&signer).is_none(), Error::<T>::InvalidStatement);
+
+			Self::process_claim(signer, dest)?;
+			Ok(())
+		}
+
+		/// Mint a new claim to collect DOTs.
+		///
+		/// The dispatch origin for this call must be _Root_.
+		///
+		/// Parameters:
+		/// - `who`: The Ethereum address allowed to collect this claim.
+		/// - `value`: The number of DOTs that will be claimed.
+		/// - `vesting_schedule`: An optional vesting schedule for these DOTs.
+		///
+		/// <weight>
+		/// The weight of this call is invariant over the input parameters.
+		/// We assume worst case that both vesting and statement is being inserted.
+		///
+		/// Total Complexity: O(1)
+		/// </weight>
+		#[pallet::call_index(1)]
+		#[pallet::weight(T::WeightInfo::mint_claim())]
+		pub fn mint_claim(
+			origin: OriginFor<T>,
+			who: EthereumAddress,
+			value: BalanceOf<T>,
+			vesting_schedule: Option<(BalanceOf<T>, BalanceOf<T>, BlockNumberFor<T>)>,
+			statement: Option<StatementKind>,
+		) -> DispatchResult {
+			ensure_root(origin)?;
+
+			Total::<T>::mutate(|t| *t += value);
+			Claims::<T>::insert(who, value);
+			if let Some(vs) = vesting_schedule {
+				Vesting::<T>::insert(who, vs);
+			}
+			if let Some(s) = statement {
+				Signing::<T>::insert(who, s);
+			}
+			Ok(())
+		}
+
+		/// Make a claim to collect your DOTs by signing a statement.
+		///
+		/// The dispatch origin for this call must be _None_.
+		///
+		/// Unsigned Validation:
+		/// A call to `claim_attest` is deemed valid if the signature provided matches
+		/// the expected signed message of:
+		///
+		/// > Ethereum Signed Message:
+		/// > (configured prefix string)(address)(statement)
+		///
+		/// and `address` matches the `dest` account; the `statement` must match that which is
+		/// expected according to your purchase arrangement.
+		///
+		/// Parameters:
+		/// - `dest`: The destination account to payout the claim.
+		/// - `ethereum_signature`: The signature of an ethereum signed message matching the format
+		///   described above.
+		/// - `statement`: The identity of the statement which is being attested to in the
+		///   signature.
+		///
+		/// <weight>
+		/// The weight of this call is invariant over the input parameters.
+		/// Weight includes logic to validate unsigned `claim_attest` call.
+		///
+		/// Total Complexity: O(1)
+		/// </weight>
+		#[pallet::call_index(2)]
+		#[pallet::weight(T::WeightInfo::claim_attest())]
+		pub fn claim_attest(
+			origin: OriginFor<T>,
+			dest: T::AccountId,
+			ethereum_signature: EcdsaSignature,
+			statement: Vec<u8>,
+		) -> DispatchResult {
+			ensure_none(origin)?;
+
+			let data = dest.using_encoded(to_ascii_hex);
+			let signer = Self::eth_recover(&ethereum_signature, &data, &statement)
+				.ok_or(Error::<T>::InvalidEthereumSignature)?;
+			if let Some(s) = Signing::<T>::get(signer) {
+				ensure!(s.to_text() == &statement[..], Error::<T>::InvalidStatement);
+			}
+			Self::process_claim(signer, dest)?;
+			Ok(())
+		}
+
+		/// Attest to a statement, needed to finalize the claims process.
+		///
+		/// WARNING: Insecure unless your chain includes `PrevalidateAttests` as a
+		/// `TransactionExtension`.
+		///
+		/// Unsigned Validation:
+		/// A call to attest is deemed valid if the sender has a `Preclaim` registered
+		/// and provides a `statement` which is expected for the account.
+		///
+		/// Parameters:
+		/// - `statement`: The identity of the statement which is being attested to in the
+		///   signature.
+		///
+		/// <weight>
+		/// The weight of this call is invariant over the input parameters.
+		/// Weight includes logic to do pre-validation on `attest` call.
+		///
+		/// Total Complexity: O(1)
+		/// </weight>
+		#[pallet::call_index(3)]
+		#[pallet::weight((
+			T::WeightInfo::attest(),
+			DispatchClass::Normal,
+			Pays::No
+		))]
+		pub fn attest(origin: OriginFor<T>, statement: Vec<u8>) -> DispatchResult {
+			let who = ensure_signed(origin)?;
+			let signer = Preclaims::<T>::get(&who).ok_or(Error::<T>::SenderHasNoClaim)?;
+			if let Some(s) = Signing::<T>::get(signer) {
+				ensure!(s.to_text() == &statement[..], Error::<T>::InvalidStatement);
+			}
+			Self::process_claim(signer, who.clone())?;
+			Preclaims::<T>::remove(&who);
+			Ok(())
+		}
+
+		#[pallet::call_index(4)]
+		#[pallet::weight(T::WeightInfo::move_claim())]
+		pub fn move_claim(
+			origin: OriginFor<T>,
+			old: EthereumAddress,
+			new: EthereumAddress,
+			maybe_preclaim: Option<T::AccountId>,
+		) -> DispatchResultWithPostInfo {
+			T::MoveClaimOrigin::try_origin(origin).map(|_| ()).or_else(ensure_root)?;
+
+			Claims::<T>::take(&old).map(|c| Claims::<T>::insert(&new, c));
+			Vesting::<T>::take(&old).map(|c| Vesting::<T>::insert(&new, c));
+			Signing::<T>::take(&old).map(|c| Signing::<T>::insert(&new, c));
+			maybe_preclaim.map(|preclaim| {
+				Preclaims::<T>::mutate(&preclaim, |maybe_o| {
+					if maybe_o.as_ref().map_or(false, |o| o == &old) {
+						*maybe_o = Some(new)
+					}
+				})
+			});
+			Ok(Pays::No.into())
+		}
+	}
+
+	#[pallet::validate_unsigned]
+	impl<T: Config> ValidateUnsigned for Pallet<T> {
+		type Call = Call<T>;
+
+		fn validate_unsigned(_source: TransactionSource, call: &Self::Call) -> TransactionValidity {
+			const PRIORITY: u64 = 100;
+
+			let (maybe_signer, maybe_statement) = match call {
+				// <weight>
+				// The weight of this logic is included in the `claim` dispatchable.
+				// </weight>
+				Call::claim { dest: account, ethereum_signature } => {
+					let data = account.using_encoded(to_ascii_hex);
+					(Self::eth_recover(&ethereum_signature, &data, &[][..]), None)
+				},
+				// <weight>
+				// The weight of this logic is included in the `claim_attest` dispatchable.
+				// </weight>
+				Call::claim_attest { dest: account, ethereum_signature, statement } => {
+					let data = account.using_encoded(to_ascii_hex);
+					(
+						Self::eth_recover(&ethereum_signature, &data, &statement),
+						Some(statement.as_slice()),
+					)
+				},
+				_ => return Err(InvalidTransaction::Call.into()),
+			};
+
+			let signer = maybe_signer.ok_or(InvalidTransaction::Custom(
+				ValidityError::InvalidEthereumSignature.into(),
+			))?;
+
+			let e = InvalidTransaction::Custom(ValidityError::SignerHasNoClaim.into());
+			ensure!(Claims::<T>::contains_key(&signer), e);
+
+			let e = InvalidTransaction::Custom(ValidityError::InvalidStatement.into());
+			match Signing::<T>::get(signer) {
+				None => ensure!(maybe_statement.is_none(), e),
+				Some(s) => ensure!(Some(s.to_text()) == maybe_statement, e),
+			}
+
+			Ok(ValidTransaction {
+				priority: PRIORITY,
+				requires: vec![],
+				provides: vec![("claims", signer).encode()],
+				longevity: TransactionLongevity::max_value(),
+				propagate: true,
+			})
+		}
+	}
+}
+
+/// Converts the given binary data into ASCII-encoded hex. It will be twice the length.
+fn to_ascii_hex(data: &[u8]) -> Vec<u8> {
+	let mut r = Vec::with_capacity(data.len() * 2);
+	let mut push_nibble = |n| r.push(if n < 10 { b'0' + n } else { b'a' - 10 + n });
+	for &b in data.iter() {
+		push_nibble(b / 16);
+		push_nibble(b % 16);
+	}
+	r
+}
+
+impl<T: Config> Pallet<T> {
+	// Constructs the message that Ethereum RPC's `personal_sign` and `eth_sign` would sign.
+	fn ethereum_signable_message(what: &[u8], extra: &[u8]) -> Vec<u8> {
+		let prefix = T::Prefix::get();
+		let mut l = prefix.len() + what.len() + extra.len();
+		let mut rev = Vec::new();
+		while l > 0 {
+			rev.push(b'0' + (l % 10) as u8);
+			l /= 10;
+		}
+		let mut v = b"\x19Ethereum Signed Message:\n".to_vec();
+		v.extend(rev.into_iter().rev());
+		v.extend_from_slice(prefix);
+		v.extend_from_slice(what);
+		v.extend_from_slice(extra);
+		v
+	}
+
+	// Attempts to recover the Ethereum address from a message signature signed by using
+	// the Ethereum RPC's `personal_sign` and `eth_sign`.
+	fn eth_recover(s: &EcdsaSignature, what: &[u8], extra: &[u8]) -> Option<EthereumAddress> {
+		let msg = keccak_256(&Self::ethereum_signable_message(what, extra));
+		let mut res = EthereumAddress::default();
+		res.0
+			.copy_from_slice(&keccak_256(&secp256k1_ecdsa_recover(&s.0, &msg).ok()?[..])[12..]);
+		Some(res)
+	}
+
+	fn process_claim(signer: EthereumAddress, dest: T::AccountId) -> sp_runtime::DispatchResult {
+		let balance_due = Claims::<T>::get(&signer).ok_or(Error::<T>::SignerHasNoClaim)?;
+
+		let new_total =
+			Total::<T>::get().checked_sub(&balance_due).ok_or(Error::<T>::PotUnderflow)?;
+
+		let vesting = Vesting::<T>::get(&signer);
+		if vesting.is_some() && T::VestingSchedule::vesting_balance(&dest).is_some() {
+			return Err(Error::<T>::VestedBalanceExists.into())
+		}
+
+		// We first need to deposit the balance to ensure that the account exists.
+		let _ = CurrencyOf::<T>::deposit_creating(&dest, balance_due);
+
+		// Check if this claim should have a vesting schedule.
+		if let Some(vs) = vesting {
+			// This can only fail if the account already has a vesting schedule,
+			// but this is checked above.
+			T::VestingSchedule::add_vesting_schedule(&dest, vs.0, vs.1, vs.2)
+				.expect("No other vesting schedule exists, as checked above; qed");
+		}
+
+		Total::<T>::put(new_total);
+		Claims::<T>::remove(&signer);
+		Vesting::<T>::remove(&signer);
+		Signing::<T>::remove(&signer);
+
+		// Let's deposit an event to let the outside world know this happened.
+		Self::deposit_event(Event::<T>::Claimed {
+			who: dest,
+			ethereum_address: signer,
+			amount: balance_due,
+		});
+
+		Ok(())
+	}
+}
+
+/// Validate `attest` calls prior to execution. Needed to avoid a DoS attack since they are
+/// otherwise free to place on chain.
+#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)]
+#[scale_info(skip_type_params(T))]
+pub struct PrevalidateAttests<T>(core::marker::PhantomData<fn(T)>);
+
+impl<T: Config> Debug for PrevalidateAttests<T>
+where
+	<T as frame_system::Config>::RuntimeCall: IsSubType<Call<T>>,
+{
+	#[cfg(feature = "std")]
+	fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
+		write!(f, "PrevalidateAttests")
+	}
+
+	#[cfg(not(feature = "std"))]
+	fn fmt(&self, _: &mut core::fmt::Formatter) -> core::fmt::Result {
+		Ok(())
+	}
+}
+
+impl<T: Config> PrevalidateAttests<T>
+where
+	<T as frame_system::Config>::RuntimeCall: IsSubType<Call<T>>,
+{
+	/// Create new `TransactionExtension` to check runtime version.
+	pub fn new() -> Self {
+		Self(core::marker::PhantomData)
+	}
+}
+
+impl<T: Config> TransactionExtension<T::RuntimeCall> for PrevalidateAttests<T>
+where
+	<T as frame_system::Config>::RuntimeCall: IsSubType<Call<T>>,
+	<<T as frame_system::Config>::RuntimeCall as Dispatchable>::RuntimeOrigin:
+		AsSystemOriginSigner<T::AccountId> + AsTransactionAuthorizedOrigin + Clone,
+{
+	const IDENTIFIER: &'static str = "PrevalidateAttests";
+	type Implicit = ();
+	type Pre = ();
+	type Val = ();
+
+	fn weight(&self, call: &T::RuntimeCall) -> Weight {
+		if let Some(Call::attest { .. }) = call.is_sub_type() {
+			T::WeightInfo::prevalidate_attests()
+		} else {
+			Weight::zero()
+		}
+	}
+
+	fn validate(
+		&self,
+		origin: <T::RuntimeCall as Dispatchable>::RuntimeOrigin,
+		call: &T::RuntimeCall,
+		_info: &DispatchInfoOf<T::RuntimeCall>,
+		_len: usize,
+		_self_implicit: Self::Implicit,
+		_inherited_implication: &impl Encode,
+		_source: TransactionSource,
+	) -> Result<
+		(ValidTransaction, Self::Val, <T::RuntimeCall as Dispatchable>::RuntimeOrigin),
+		TransactionValidityError,
+	> {
+		if let Some(Call::attest { statement: attested_statement }) = call.is_sub_type() {
+			let who = origin.as_system_origin_signer().ok_or(InvalidTransaction::BadSigner)?;
+			let signer = Preclaims::<T>::get(who)
+				.ok_or(InvalidTransaction::Custom(ValidityError::SignerHasNoClaim.into()))?;
+			if let Some(s) = Signing::<T>::get(signer) {
+				let e = InvalidTransaction::Custom(ValidityError::InvalidStatement.into());
+				ensure!(&attested_statement[..] == s.to_text(), e);
+			}
+		}
+		Ok((ValidTransaction::default(), (), origin))
+	}
+
+	impl_tx_ext_default!(T::RuntimeCall; prepare);
+}
+
+#[cfg(any(test, feature = "runtime-benchmarks"))]
+mod secp_utils {
+	use super::*;
+
+	pub fn public(secret: &libsecp256k1::SecretKey) -> libsecp256k1::PublicKey {
+		libsecp256k1::PublicKey::from_secret_key(secret)
+	}
+	pub fn eth(secret: &libsecp256k1::SecretKey) -> EthereumAddress {
+		let mut res = EthereumAddress::default();
+		res.0.copy_from_slice(&keccak_256(&public(secret).serialize()[1..65])[12..]);
+		res
+	}
+	pub fn sig<T: Config>(
+		secret: &libsecp256k1::SecretKey,
+		what: &[u8],
+		extra: &[u8],
+	) -> EcdsaSignature {
+		let msg = keccak_256(&super::Pallet::<T>::ethereum_signable_message(
+			&to_ascii_hex(what)[..],
+			extra,
+		));
+		let (sig, recovery_id) = libsecp256k1::sign(&libsecp256k1::Message::parse(&msg), secret);
+		let mut r = [0u8; 65];
+		r[0..64].copy_from_slice(&sig.serialize()[..]);
+		r[64] = recovery_id.serialize();
+		EcdsaSignature(r)
+	}
+}
+
+#[cfg(test)]
+mod mock;
+
+#[cfg(test)]
+mod tests;
+
+#[cfg(feature = "runtime-benchmarks")]
+mod benchmarking;
diff --git a/polkadot/runtime/common/src/claims/tests.rs b/polkadot/runtime/common/src/claims/tests.rs
new file mode 100644
index 000000000000..dff2623cb934
--- /dev/null
+++ b/polkadot/runtime/common/src/claims/tests.rs
@@ -0,0 +1,666 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Tests for the claims pallet.
+
+#[cfg(test)]
+use super::*;
+use crate::{claims, claims::mock::*};
+use claims::Call as ClaimsCall;
+use hex_literal::hex;
+use secp_utils::*;
+use sp_runtime::transaction_validity::TransactionSource::External;
+
+use codec::Encode;
+// The testing primitives are very useful for avoiding having to work with signatures
+// or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
+use frame_support::{
+	assert_err, assert_noop, assert_ok,
+	dispatch::{GetDispatchInfo, Pays},
+	traits::ExistenceRequirement,
+};
+use sp_runtime::{
+	traits::DispatchTransaction, transaction_validity::TransactionLongevity,
+	DispatchError::BadOrigin, TokenError,
+};
+
+#[test]
+fn basic_setup_works() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(claims::Total::<Test>::get(), total_claims());
+		assert_eq!(claims::Claims::<Test>::get(&eth(&alice())), Some(100));
+		assert_eq!(claims::Claims::<Test>::get(&eth(&dave())), Some(200));
+		assert_eq!(claims::Claims::<Test>::get(&eth(&eve())), Some(300));
+		assert_eq!(claims::Claims::<Test>::get(&eth(&frank())), Some(400));
+		assert_eq!(claims::Claims::<Test>::get(&EthereumAddress::default()), None);
+		assert_eq!(claims::Vesting::<Test>::get(&eth(&alice())), Some((50, 10, 1)));
+	});
+}
+
+#[test]
+fn serde_works() {
+	let x = EthereumAddress(hex!["0123456789abcdef0123456789abcdef01234567"]);
+	let y = serde_json::to_string(&x).unwrap();
+	assert_eq!(y, "\"0x0123456789abcdef0123456789abcdef01234567\"");
+	let z: EthereumAddress = serde_json::from_str(&y).unwrap();
+	assert_eq!(x, z);
+}
+
+#[test]
+fn claiming_works() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(Balances::free_balance(42), 0);
+		assert_ok!(claims::mock::Claims::claim(
+			RuntimeOrigin::none(),
+			42,
+			sig::<Test>(&alice(), &42u64.encode(), &[][..])
+		));
+		assert_eq!(Balances::free_balance(&42), 100);
+		assert_eq!(claims::mock::Vesting::vesting_balance(&42), Some(50));
+		assert_eq!(claims::Total::<Test>::get(), total_claims() - 100);
+	});
+}
+
+#[test]
+fn basic_claim_moving_works() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(Balances::free_balance(42), 0);
+		assert_noop!(
+			claims::mock::Claims::move_claim(
+				RuntimeOrigin::signed(1),
+				eth(&alice()),
+				eth(&bob()),
+				None
+			),
+			BadOrigin
+		);
+		assert_ok!(claims::mock::Claims::move_claim(
+			RuntimeOrigin::signed(6),
+			eth(&alice()),
+			eth(&bob()),
+			None
+		));
+		assert_noop!(
+			claims::mock::Claims::claim(
+				RuntimeOrigin::none(),
+				42,
+				sig::<Test>(&alice(), &42u64.encode(), &[][..])
+			),
+			Error::<Test>::SignerHasNoClaim
+		);
+		assert_ok!(claims::mock::Claims::claim(
+			RuntimeOrigin::none(),
+			42,
+			sig::<Test>(&bob(), &42u64.encode(), &[][..])
+		));
+		assert_eq!(Balances::free_balance(&42), 100);
+		assert_eq!(claims::mock::Vesting::vesting_balance(&42), Some(50));
+		assert_eq!(claims::Total::<Test>::get(), total_claims() - 100);
+	});
+}
+
+#[test]
+fn claim_attest_moving_works() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(claims::mock::Claims::move_claim(
+			RuntimeOrigin::signed(6),
+			eth(&dave()),
+			eth(&bob()),
+			None
+		));
+		let s = sig::<Test>(&bob(), &42u64.encode(), StatementKind::Regular.to_text());
+		assert_ok!(claims::mock::Claims::claim_attest(
+			RuntimeOrigin::none(),
+			42,
+			s,
+			StatementKind::Regular.to_text().to_vec()
+		));
+		assert_eq!(Balances::free_balance(&42), 200);
+	});
+}
+
+#[test]
+fn attest_moving_works() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(claims::mock::Claims::move_claim(
+			RuntimeOrigin::signed(6),
+			eth(&eve()),
+			eth(&bob()),
+			Some(42)
+		));
+		assert_ok!(claims::mock::Claims::attest(
+			RuntimeOrigin::signed(42),
+			StatementKind::Saft.to_text().to_vec()
+		));
+		assert_eq!(Balances::free_balance(&42), 300);
+	});
+}
+
+#[test]
+fn claiming_does_not_bypass_signing() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(claims::mock::Claims::claim(
+			RuntimeOrigin::none(),
+			42,
+			sig::<Test>(&alice(), &42u64.encode(), &[][..])
+		));
+		assert_noop!(
+			claims::mock::Claims::claim(
+				RuntimeOrigin::none(),
+				42,
+				sig::<Test>(&dave(), &42u64.encode(), &[][..])
+			),
+			Error::<Test>::InvalidStatement,
+		);
+		assert_noop!(
+			claims::mock::Claims::claim(
+				RuntimeOrigin::none(),
+				42,
+				sig::<Test>(&eve(), &42u64.encode(), &[][..])
+			),
+			Error::<Test>::InvalidStatement,
+		);
+		assert_ok!(claims::mock::Claims::claim(
+			RuntimeOrigin::none(),
+			42,
+			sig::<Test>(&frank(), &42u64.encode(), &[][..])
+		));
+	});
+}
+
+#[test]
+fn attest_claiming_works() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(Balances::free_balance(42), 0);
+		let s = sig::<Test>(&dave(), &42u64.encode(), StatementKind::Saft.to_text());
+		let r = claims::mock::Claims::claim_attest(
+			RuntimeOrigin::none(),
+			42,
+			s.clone(),
+			StatementKind::Saft.to_text().to_vec(),
+		);
+		assert_noop!(r, Error::<Test>::InvalidStatement);
+
+		let r = claims::mock::Claims::claim_attest(
+			RuntimeOrigin::none(),
+			42,
+			s,
+			StatementKind::Regular.to_text().to_vec(),
+		);
+		assert_noop!(r, Error::<Test>::SignerHasNoClaim);
+		// ^^^ we use ecdsa_recover, so an invalid signature just results in a random signer id
+		// being recovered, which realistically will never have a claim.
+
+		let s = sig::<Test>(&dave(), &42u64.encode(), StatementKind::Regular.to_text());
+		assert_ok!(claims::mock::Claims::claim_attest(
+			RuntimeOrigin::none(),
+			42,
+			s,
+			StatementKind::Regular.to_text().to_vec()
+		));
+		assert_eq!(Balances::free_balance(&42), 200);
+		assert_eq!(claims::Total::<Test>::get(), total_claims() - 200);
+
+		let s = sig::<Test>(&dave(), &42u64.encode(), StatementKind::Regular.to_text());
+		let r = claims::mock::Claims::claim_attest(
+			RuntimeOrigin::none(),
+			42,
+			s,
+			StatementKind::Regular.to_text().to_vec(),
+		);
+		assert_noop!(r, Error::<Test>::SignerHasNoClaim);
+	});
+}
+
+#[test]
+fn attesting_works() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(Balances::free_balance(42), 0);
+		assert_noop!(
+			claims::mock::Claims::attest(
+				RuntimeOrigin::signed(69),
+				StatementKind::Saft.to_text().to_vec()
+			),
+			Error::<Test>::SenderHasNoClaim
+		);
+		assert_noop!(
+			claims::mock::Claims::attest(
+				RuntimeOrigin::signed(42),
+				StatementKind::Regular.to_text().to_vec()
+			),
+			Error::<Test>::InvalidStatement
+		);
+		assert_ok!(claims::mock::Claims::attest(
+			RuntimeOrigin::signed(42),
+			StatementKind::Saft.to_text().to_vec()
+		));
+		assert_eq!(Balances::free_balance(&42), 300);
+		assert_eq!(claims::Total::<Test>::get(), total_claims() - 300);
+	});
+}
+
+#[test]
+fn claim_cannot_clobber_preclaim() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(Balances::free_balance(42), 0);
+		// Alice's claim is 100
+		assert_ok!(claims::mock::Claims::claim(
+			RuntimeOrigin::none(),
+			42,
+			sig::<Test>(&alice(), &42u64.encode(), &[][..])
+		));
+		assert_eq!(Balances::free_balance(&42), 100);
+		// Eve's claim is 300 through Account 42
+		assert_ok!(claims::mock::Claims::attest(
+			RuntimeOrigin::signed(42),
+			StatementKind::Saft.to_text().to_vec()
+		));
+		assert_eq!(Balances::free_balance(&42), 100 + 300);
+		assert_eq!(claims::Total::<Test>::get(), total_claims() - 400);
+	});
+}
+
+#[test]
+fn valid_attest_transactions_are_free() {
+	new_test_ext().execute_with(|| {
+		let p = PrevalidateAttests::<Test>::new();
+		let c = claims::mock::RuntimeCall::Claims(ClaimsCall::attest {
+			statement: StatementKind::Saft.to_text().to_vec(),
+		});
+		let di = c.get_dispatch_info();
+		assert_eq!(di.pays_fee, Pays::No);
+		let r = p.validate_only(Some(42).into(), &c, &di, 20, External, 0);
+		assert_eq!(r.unwrap().0, ValidTransaction::default());
+	});
+}
+
+#[test]
+fn invalid_attest_transactions_are_recognized() {
+	new_test_ext().execute_with(|| {
+		let p = PrevalidateAttests::<Test>::new();
+		let c = claims::mock::RuntimeCall::Claims(ClaimsCall::attest {
+			statement: StatementKind::Regular.to_text().to_vec(),
+		});
+		let di = c.get_dispatch_info();
+		let r = p.validate_only(Some(42).into(), &c, &di, 20, External, 0);
+		assert!(r.is_err());
+		let c = claims::mock::RuntimeCall::Claims(ClaimsCall::attest {
+			statement: StatementKind::Saft.to_text().to_vec(),
+		});
+		let di = c.get_dispatch_info();
+		let r = p.validate_only(Some(69).into(), &c, &di, 20, External, 0);
+		assert!(r.is_err());
+	});
+}
+
+#[test]
+fn cannot_bypass_attest_claiming() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(Balances::free_balance(42), 0);
+		let s = sig::<Test>(&dave(), &42u64.encode(), &[]);
+		let r = claims::mock::Claims::claim(RuntimeOrigin::none(), 42, s.clone());
+		assert_noop!(r, Error::<Test>::InvalidStatement);
+	});
+}
+
+#[test]
+fn add_claim_works() {
+	new_test_ext().execute_with(|| {
+		assert_noop!(
+			claims::mock::Claims::mint_claim(
+				RuntimeOrigin::signed(42),
+				eth(&bob()),
+				200,
+				None,
+				None
+			),
+			sp_runtime::traits::BadOrigin,
+		);
+		assert_eq!(Balances::free_balance(42), 0);
+		assert_noop!(
+			claims::mock::Claims::claim(
+				RuntimeOrigin::none(),
+				69,
+				sig::<Test>(&bob(), &69u64.encode(), &[][..])
+			),
+			Error::<Test>::SignerHasNoClaim,
+		);
+		assert_ok!(claims::mock::Claims::mint_claim(
+			RuntimeOrigin::root(),
+			eth(&bob()),
+			200,
+			None,
+			None
+		));
+		assert_eq!(claims::Total::<Test>::get(), total_claims() + 200);
+		assert_ok!(claims::mock::Claims::claim(
+			RuntimeOrigin::none(),
+			69,
+			sig::<Test>(&bob(), &69u64.encode(), &[][..])
+		));
+		assert_eq!(Balances::free_balance(&69), 200);
+		assert_eq!(claims::mock::Vesting::vesting_balance(&69), None);
+		assert_eq!(claims::Total::<Test>::get(), total_claims());
+	});
+}
+
+#[test]
+fn add_claim_with_vesting_works() {
+	new_test_ext().execute_with(|| {
+		assert_noop!(
+			claims::mock::Claims::mint_claim(
+				RuntimeOrigin::signed(42),
+				eth(&bob()),
+				200,
+				Some((50, 10, 1)),
+				None
+			),
+			sp_runtime::traits::BadOrigin,
+		);
+		assert_eq!(Balances::free_balance(42), 0);
+		assert_noop!(
+			claims::mock::Claims::claim(
+				RuntimeOrigin::none(),
+				69,
+				sig::<Test>(&bob(), &69u64.encode(), &[][..])
+			),
+			Error::<Test>::SignerHasNoClaim,
+		);
+		assert_ok!(claims::mock::Claims::mint_claim(
+			RuntimeOrigin::root(),
+			eth(&bob()),
+			200,
+			Some((50, 10, 1)),
+			None
+		));
+		assert_ok!(claims::mock::Claims::claim(
+			RuntimeOrigin::none(),
+			69,
+			sig::<Test>(&bob(), &69u64.encode(), &[][..])
+		));
+		assert_eq!(Balances::free_balance(&69), 200);
+		assert_eq!(claims::mock::Vesting::vesting_balance(&69), Some(50));
+
+		// Make sure we can not transfer the vested balance.
+		assert_err!(
+			<Balances as Currency<_>>::transfer(&69, &80, 180, ExistenceRequirement::AllowDeath),
+			TokenError::Frozen,
+		);
+	});
+}
+
+#[test]
+fn add_claim_with_statement_works() {
+	new_test_ext().execute_with(|| {
+		assert_noop!(
+			claims::mock::Claims::mint_claim(
+				RuntimeOrigin::signed(42),
+				eth(&bob()),
+				200,
+				None,
+				Some(StatementKind::Regular)
+			),
+			sp_runtime::traits::BadOrigin,
+		);
+		assert_eq!(Balances::free_balance(42), 0);
+		let signature = sig::<Test>(&bob(), &69u64.encode(), StatementKind::Regular.to_text());
+		assert_noop!(
+			claims::mock::Claims::claim_attest(
+				RuntimeOrigin::none(),
+				69,
+				signature.clone(),
+				StatementKind::Regular.to_text().to_vec()
+			),
+			Error::<Test>::SignerHasNoClaim
+		);
+		assert_ok!(claims::mock::Claims::mint_claim(
+			RuntimeOrigin::root(),
+			eth(&bob()),
+			200,
+			None,
+			Some(StatementKind::Regular)
+		));
+		assert_noop!(
+			claims::mock::Claims::claim_attest(
+				RuntimeOrigin::none(),
+				69,
+				signature.clone(),
+				vec![],
+			),
+			Error::<Test>::SignerHasNoClaim
+		);
+		assert_ok!(claims::mock::Claims::claim_attest(
+			RuntimeOrigin::none(),
+			69,
+			signature.clone(),
+			StatementKind::Regular.to_text().to_vec()
+		));
+		assert_eq!(Balances::free_balance(&69), 200);
+	});
+}
+
+#[test]
+fn origin_signed_claiming_fail() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(Balances::free_balance(42), 0);
+		assert_err!(
+			claims::mock::Claims::claim(
+				RuntimeOrigin::signed(42),
+				42,
+				sig::<Test>(&alice(), &42u64.encode(), &[][..])
+			),
+			sp_runtime::traits::BadOrigin,
+		);
+	});
+}
+
+#[test]
+fn double_claiming_doesnt_work() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(Balances::free_balance(42), 0);
+		assert_ok!(claims::mock::Claims::claim(
+			RuntimeOrigin::none(),
+			42,
+			sig::<Test>(&alice(), &42u64.encode(), &[][..])
+		));
+		assert_noop!(
+			claims::mock::Claims::claim(
+				RuntimeOrigin::none(),
+				42,
+				sig::<Test>(&alice(), &42u64.encode(), &[][..])
+			),
+			Error::<Test>::SignerHasNoClaim
+		);
+	});
+}
+
+#[test]
+fn claiming_while_vested_doesnt_work() {
+	new_test_ext().execute_with(|| {
+		CurrencyOf::<Test>::make_free_balance_be(&69, total_claims());
+		assert_eq!(Balances::free_balance(69), total_claims());
+		// A user is already vested
+		assert_ok!(<Test as Config>::VestingSchedule::add_vesting_schedule(
+			&69,
+			total_claims(),
+			100,
+			10
+		));
+		assert_ok!(claims::mock::Claims::mint_claim(
+			RuntimeOrigin::root(),
+			eth(&bob()),
+			200,
+			Some((50, 10, 1)),
+			None
+		));
+		// New total
+		assert_eq!(claims::Total::<Test>::get(), total_claims() + 200);
+
+		// They should not be able to claim
+		assert_noop!(
+			claims::mock::Claims::claim(
+				RuntimeOrigin::none(),
+				69,
+				sig::<Test>(&bob(), &69u64.encode(), &[][..])
+			),
+			Error::<Test>::VestedBalanceExists,
+		);
+	});
+}
+
+#[test]
+fn non_sender_sig_doesnt_work() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(Balances::free_balance(42), 0);
+		assert_noop!(
+			claims::mock::Claims::claim(
+				RuntimeOrigin::none(),
+				42,
+				sig::<Test>(&alice(), &69u64.encode(), &[][..])
+			),
+			Error::<Test>::SignerHasNoClaim
+		);
+	});
+}
+
+#[test]
+fn non_claimant_doesnt_work() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(Balances::free_balance(42), 0);
+		assert_noop!(
+			claims::mock::Claims::claim(
+				RuntimeOrigin::none(),
+				42,
+				sig::<Test>(&bob(), &69u64.encode(), &[][..])
+			),
+			Error::<Test>::SignerHasNoClaim
+		);
+	});
+}
+
+#[test]
+fn real_eth_sig_works() {
+	new_test_ext().execute_with(|| {
+			// "Pay RUSTs to the TEST account:2a00000000000000"
+			let sig = hex!["444023e89b67e67c0562ed0305d252a5dd12b2af5ac51d6d3cb69a0b486bc4b3191401802dc29d26d586221f7256cd3329fe82174bdf659baea149a40e1c495d1c"];
+			let sig = EcdsaSignature(sig);
+			let who = 42u64.using_encoded(to_ascii_hex);
+			let signer = claims::mock::Claims::eth_recover(&sig, &who, &[][..]).unwrap();
+			assert_eq!(signer.0, hex!["6d31165d5d932d571f3b44695653b46dcc327e84"]);
+		});
+}
+
+#[test]
+fn validate_unsigned_works() {
+	use sp_runtime::traits::ValidateUnsigned;
+	let source = sp_runtime::transaction_validity::TransactionSource::External;
+
+	new_test_ext().execute_with(|| {
+		assert_eq!(
+			Pallet::<Test>::validate_unsigned(
+				source,
+				&ClaimsCall::claim {
+					dest: 1,
+					ethereum_signature: sig::<Test>(&alice(), &1u64.encode(), &[][..])
+				}
+			),
+			Ok(ValidTransaction {
+				priority: 100,
+				requires: vec![],
+				provides: vec![("claims", eth(&alice())).encode()],
+				longevity: TransactionLongevity::max_value(),
+				propagate: true,
+			})
+		);
+		assert_eq!(
+			Pallet::<Test>::validate_unsigned(
+				source,
+				&ClaimsCall::claim { dest: 0, ethereum_signature: EcdsaSignature([0; 65]) }
+			),
+			InvalidTransaction::Custom(ValidityError::InvalidEthereumSignature.into()).into(),
+		);
+		assert_eq!(
+			Pallet::<Test>::validate_unsigned(
+				source,
+				&ClaimsCall::claim {
+					dest: 1,
+					ethereum_signature: sig::<Test>(&bob(), &1u64.encode(), &[][..])
+				}
+			),
+			InvalidTransaction::Custom(ValidityError::SignerHasNoClaim.into()).into(),
+		);
+		let s = sig::<Test>(&dave(), &1u64.encode(), StatementKind::Regular.to_text());
+		let call = ClaimsCall::claim_attest {
+			dest: 1,
+			ethereum_signature: s,
+			statement: StatementKind::Regular.to_text().to_vec(),
+		};
+		assert_eq!(
+			Pallet::<Test>::validate_unsigned(source, &call),
+			Ok(ValidTransaction {
+				priority: 100,
+				requires: vec![],
+				provides: vec![("claims", eth(&dave())).encode()],
+				longevity: TransactionLongevity::max_value(),
+				propagate: true,
+			})
+		);
+		assert_eq!(
+			Pallet::<Test>::validate_unsigned(
+				source,
+				&ClaimsCall::claim_attest {
+					dest: 1,
+					ethereum_signature: EcdsaSignature([0; 65]),
+					statement: StatementKind::Regular.to_text().to_vec()
+				}
+			),
+			InvalidTransaction::Custom(ValidityError::InvalidEthereumSignature.into()).into(),
+		);
+
+		let s = sig::<Test>(&bob(), &1u64.encode(), StatementKind::Regular.to_text());
+		let call = ClaimsCall::claim_attest {
+			dest: 1,
+			ethereum_signature: s,
+			statement: StatementKind::Regular.to_text().to_vec(),
+		};
+		assert_eq!(
+			Pallet::<Test>::validate_unsigned(source, &call),
+			InvalidTransaction::Custom(ValidityError::SignerHasNoClaim.into()).into(),
+		);
+
+		let s = sig::<Test>(&dave(), &1u64.encode(), StatementKind::Saft.to_text());
+		let call = ClaimsCall::claim_attest {
+			dest: 1,
+			ethereum_signature: s,
+			statement: StatementKind::Regular.to_text().to_vec(),
+		};
+		assert_eq!(
+			Pallet::<Test>::validate_unsigned(source, &call),
+			InvalidTransaction::Custom(ValidityError::SignerHasNoClaim.into()).into(),
+		);
+
+		let s = sig::<Test>(&dave(), &1u64.encode(), StatementKind::Saft.to_text());
+		let call = ClaimsCall::claim_attest {
+			dest: 1,
+			ethereum_signature: s,
+			statement: StatementKind::Saft.to_text().to_vec(),
+		};
+		assert_eq!(
+			Pallet::<Test>::validate_unsigned(source, &call),
+			InvalidTransaction::Custom(ValidityError::InvalidStatement.into()).into(),
+		);
+	});
+}
diff --git a/polkadot/runtime/common/src/paras_registrar/benchmarking.rs b/polkadot/runtime/common/src/paras_registrar/benchmarking.rs
new file mode 100644
index 000000000000..95df8a969576
--- /dev/null
+++ b/polkadot/runtime/common/src/paras_registrar/benchmarking.rs
@@ -0,0 +1,171 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Benchmarking for paras_registrar pallet
+
+#[cfg(feature = "runtime-benchmarks")]
+use super::{Pallet as Registrar, *};
+use crate::traits::Registrar as RegistrarT;
+use frame_support::assert_ok;
+use frame_system::RawOrigin;
+use polkadot_primitives::{MAX_CODE_SIZE, MAX_HEAD_DATA_SIZE, MIN_CODE_SIZE};
+use polkadot_runtime_parachains::{paras, shared, Origin as ParaOrigin};
+use sp_runtime::traits::Bounded;
+
+use frame_benchmarking::{account, benchmarks, whitelisted_caller};
+
+fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
+	let events = frame_system::Pallet::<T>::events();
+	let system_event: <T as frame_system::Config>::RuntimeEvent = generic_event.into();
+	// compare to the last event record
+	let frame_system::EventRecord { event, .. } = &events[events.len() - 1];
+	assert_eq!(event, &system_event);
+}
+
+fn register_para<T: Config>(id: u32) -> ParaId {
+	let para = ParaId::from(id);
+	let genesis_head = Registrar::<T>::worst_head_data();
+	let validation_code = Registrar::<T>::worst_validation_code();
+	let caller: T::AccountId = whitelisted_caller();
+	T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+	assert_ok!(Registrar::<T>::reserve(RawOrigin::Signed(caller.clone()).into()));
+	assert_ok!(Registrar::<T>::register(
+		RawOrigin::Signed(caller).into(),
+		para,
+		genesis_head,
+		validation_code.clone()
+	));
+	assert_ok!(polkadot_runtime_parachains::paras::Pallet::<T>::add_trusted_validation_code(
+		frame_system::Origin::<T>::Root.into(),
+		validation_code,
+	));
+	return para
+}
+
+fn para_origin(id: u32) -> ParaOrigin {
+	ParaOrigin::Parachain(id.into())
+}
+
+// This function moves forward to the next scheduled session for parachain lifecycle upgrades.
+fn next_scheduled_session<T: Config>() {
+	shared::Pallet::<T>::set_session_index(shared::Pallet::<T>::scheduled_session());
+	paras::Pallet::<T>::test_on_new_session();
+}
+
+benchmarks! {
+	where_clause { where ParaOrigin: Into<<T as frame_system::Config>::RuntimeOrigin> }
+
+	reserve {
+		let caller: T::AccountId = whitelisted_caller();
+		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+	}: _(RawOrigin::Signed(caller.clone()))
+	verify {
+		assert_last_event::<T>(Event::<T>::Reserved { para_id: LOWEST_PUBLIC_ID, who: caller }.into());
+		assert!(Paras::<T>::get(LOWEST_PUBLIC_ID).is_some());
+		assert_eq!(paras::Pallet::<T>::lifecycle(LOWEST_PUBLIC_ID), None);
+	}
+
+	register {
+		let para = LOWEST_PUBLIC_ID;
+		let genesis_head = Registrar::<T>::worst_head_data();
+		let validation_code = Registrar::<T>::worst_validation_code();
+		let caller: T::AccountId = whitelisted_caller();
+		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+		assert_ok!(Registrar::<T>::reserve(RawOrigin::Signed(caller.clone()).into()));
+	}: _(RawOrigin::Signed(caller.clone()), para, genesis_head, validation_code.clone())
+	verify {
+		assert_last_event::<T>(Event::<T>::Registered{ para_id: para, manager: caller }.into());
+		assert_eq!(paras::Pallet::<T>::lifecycle(para), Some(ParaLifecycle::Onboarding));
+		assert_ok!(polkadot_runtime_parachains::paras::Pallet::<T>::add_trusted_validation_code(
+			frame_system::Origin::<T>::Root.into(),
+			validation_code,
+		));
+		next_scheduled_session::<T>();
+		assert_eq!(paras::Pallet::<T>::lifecycle(para), Some(ParaLifecycle::Parathread));
+	}
+
+	force_register {
+		let manager: T::AccountId = account("manager", 0, 0);
+		let deposit = 0u32.into();
+		let para = ParaId::from(69);
+		let genesis_head = Registrar::<T>::worst_head_data();
+		let validation_code = Registrar::<T>::worst_validation_code();
+	}: _(RawOrigin::Root, manager.clone(), deposit, para, genesis_head, validation_code.clone())
+	verify {
+		assert_last_event::<T>(Event::<T>::Registered { para_id: para, manager }.into());
+		assert_eq!(paras::Pallet::<T>::lifecycle(para), Some(ParaLifecycle::Onboarding));
+		assert_ok!(polkadot_runtime_parachains::paras::Pallet::<T>::add_trusted_validation_code(
+			frame_system::Origin::<T>::Root.into(),
+			validation_code,
+		));
+		next_scheduled_session::<T>();
+		assert_eq!(paras::Pallet::<T>::lifecycle(para), Some(ParaLifecycle::Parathread));
+	}
+
+	deregister {
+		let para = register_para::<T>(LOWEST_PUBLIC_ID.into());
+		next_scheduled_session::<T>();
+		let caller: T::AccountId = whitelisted_caller();
+	}: _(RawOrigin::Signed(caller), para)
+	verify {
+		assert_last_event::<T>(Event::<T>::Deregistered { para_id: para }.into());
+	}
+
+	swap {
+		// On demand parachain
+		let parathread = register_para::<T>(LOWEST_PUBLIC_ID.into());
+		let parachain = register_para::<T>((LOWEST_PUBLIC_ID + 1).into());
+
+		let parachain_origin = para_origin(parachain.into());
+
+		// Actually finish registration process
+		next_scheduled_session::<T>();
+
+		// Upgrade the parachain
+		Registrar::<T>::make_parachain(parachain)?;
+		next_scheduled_session::<T>();
+
+		assert_eq!(paras::Pallet::<T>::lifecycle(parachain), Some(ParaLifecycle::Parachain));
+		assert_eq!(paras::Pallet::<T>::lifecycle(parathread), Some(ParaLifecycle::Parathread));
+
+		let caller: T::AccountId = whitelisted_caller();
+		Registrar::<T>::swap(parachain_origin.into(), parachain, parathread)?;
+	}: _(RawOrigin::Signed(caller.clone()), parathread, parachain)
+	verify {
+		next_scheduled_session::<T>();
+		// Swapped!
+		assert_eq!(paras::Pallet::<T>::lifecycle(parachain), Some(ParaLifecycle::Parathread));
+		assert_eq!(paras::Pallet::<T>::lifecycle(parathread), Some(ParaLifecycle::Parachain));
+	}
+
+	schedule_code_upgrade {
+		let b in MIN_CODE_SIZE .. MAX_CODE_SIZE;
+		let new_code = ValidationCode(vec![0; b as usize]);
+		let para_id = ParaId::from(1000);
+	}: _(RawOrigin::Root, para_id, new_code)
+
+	set_current_head {
+		let b in 1 .. MAX_HEAD_DATA_SIZE;
+		let new_head = HeadData(vec![0; b as usize]);
+		let para_id = ParaId::from(1000);
+	}: _(RawOrigin::Root, para_id, new_head)
+
+	impl_benchmark_test_suite!(
+		Registrar,
+		crate::integration_tests::new_test_ext(),
+		crate::integration_tests::Test,
+	);
+}
diff --git a/polkadot/runtime/common/src/paras_registrar/mock.rs b/polkadot/runtime/common/src/paras_registrar/mock.rs
new file mode 100644
index 000000000000..1627fd70365d
--- /dev/null
+++ b/polkadot/runtime/common/src/paras_registrar/mock.rs
@@ -0,0 +1,254 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Mocking utilities for testing in paras_registrar pallet.
+
+#[cfg(test)]
+use super::*;
+use crate::paras_registrar;
+use alloc::collections::btree_map::BTreeMap;
+use frame_support::{
+	derive_impl, parameter_types,
+	traits::{OnFinalize, OnInitialize},
+};
+use frame_system::limits;
+use polkadot_primitives::{Balance, BlockNumber, MAX_CODE_SIZE};
+use polkadot_runtime_parachains::{configuration, origin, shared};
+use sp_core::H256;
+use sp_io::TestExternalities;
+use sp_keyring::Sr25519Keyring;
+use sp_runtime::{
+	traits::{BlakeTwo256, IdentityLookup},
+	transaction_validity::TransactionPriority,
+	BuildStorage, Perbill,
+};
+
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlockU32<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test
+	{
+		System: frame_system,
+		Balances: pallet_balances,
+		Configuration: configuration,
+		Parachains: paras,
+		ParasShared: shared,
+		Registrar: paras_registrar,
+		ParachainsOrigin: origin,
+	}
+);
+
+impl<C> frame_system::offchain::CreateTransactionBase<C> for Test
+where
+	RuntimeCall: From<C>,
+{
+	type Extrinsic = UncheckedExtrinsic;
+	type RuntimeCall = RuntimeCall;
+}
+
+impl<C> frame_system::offchain::CreateInherent<C> for Test
+where
+	RuntimeCall: From<C>,
+{
+	fn create_inherent(call: Self::RuntimeCall) -> Self::Extrinsic {
+		UncheckedExtrinsic::new_bare(call)
+	}
+}
+
+const NORMAL_RATIO: Perbill = Perbill::from_percent(75);
+parameter_types! {
+	pub BlockWeights: limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(Weight::from_parts(1024, u64::MAX));
+	pub BlockLength: limits::BlockLength =
+		limits::BlockLength::max_with_normal_ratio(4 * 1024 * 1024, NORMAL_RATIO);
+}
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
+impl frame_system::Config for Test {
+	type BaseCallFilter = frame_support::traits::Everything;
+	type RuntimeOrigin = RuntimeOrigin;
+	type RuntimeCall = RuntimeCall;
+	type Nonce = u64;
+	type Hash = H256;
+	type Hashing = BlakeTwo256;
+	type AccountId = u64;
+	type Lookup = IdentityLookup<u64>;
+	type Block = Block;
+	type RuntimeEvent = RuntimeEvent;
+	type DbWeight = ();
+	type BlockWeights = BlockWeights;
+	type BlockLength = BlockLength;
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = pallet_balances::AccountData<u128>;
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+	type SS58Prefix = ();
+	type OnSetCode = ();
+	type MaxConsumers = frame_support::traits::ConstU32<16>;
+}
+
+parameter_types! {
+	pub const ExistentialDeposit: Balance = 1;
+}
+
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig)]
+impl pallet_balances::Config for Test {
+	type Balance = Balance;
+	type ExistentialDeposit = ExistentialDeposit;
+	type AccountStore = System;
+}
+
+impl shared::Config for Test {
+	type DisabledValidators = ();
+}
+
+impl origin::Config for Test {}
+
+parameter_types! {
+	pub const ParasUnsignedPriority: TransactionPriority = TransactionPriority::max_value();
+}
+
+impl paras::Config for Test {
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = paras::TestWeightInfo;
+	type UnsignedPriority = ParasUnsignedPriority;
+	type QueueFootprinter = ();
+	type NextSessionRotation = crate::mock::TestNextSessionRotation;
+	type OnNewHead = ();
+	type AssignCoretime = ();
+}
+
+impl configuration::Config for Test {
+	type WeightInfo = configuration::TestWeightInfo;
+}
+
+parameter_types! {
+	pub const ParaDeposit: Balance = 10;
+	pub const DataDepositPerByte: Balance = 1;
+	pub const MaxRetries: u32 = 3;
+}
+
+impl Config for Test {
+	type RuntimeOrigin = RuntimeOrigin;
+	type RuntimeEvent = RuntimeEvent;
+	type Currency = Balances;
+	type OnSwap = MockSwap;
+	type ParaDeposit = ParaDeposit;
+	type DataDepositPerByte = DataDepositPerByte;
+	type WeightInfo = TestWeightInfo;
+}
+
+pub fn new_test_ext() -> TestExternalities {
+	let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
+
+	configuration::GenesisConfig::<Test> {
+		config: configuration::HostConfiguration {
+			max_code_size: MAX_CODE_SIZE,
+			max_head_data_size: 1 * 1024 * 1024, // 1 MB
+			..Default::default()
+		},
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
+
+	pallet_balances::GenesisConfig::<Test> {
+		balances: vec![(1, 10_000_000), (2, 10_000_000), (3, 10_000_000)],
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
+
+	t.into()
+}
+
+parameter_types! {
+	pub static SwapData: BTreeMap<ParaId, u64> = BTreeMap::new();
+}
+
+pub struct MockSwap;
+impl OnSwap for MockSwap {
+	fn on_swap(one: ParaId, other: ParaId) {
+		let mut swap_data = SwapData::get();
+		let one_data = swap_data.remove(&one).unwrap_or_default();
+		let other_data = swap_data.remove(&other).unwrap_or_default();
+		swap_data.insert(one, other_data);
+		swap_data.insert(other, one_data);
+		SwapData::set(swap_data);
+	}
+}
+
+pub const BLOCKS_PER_SESSION: u32 = 3;
+
+pub const VALIDATORS: &[Sr25519Keyring] = &[
+	Sr25519Keyring::Alice,
+	Sr25519Keyring::Bob,
+	Sr25519Keyring::Charlie,
+	Sr25519Keyring::Dave,
+	Sr25519Keyring::Ferdie,
+];
+
+pub fn run_to_block(n: BlockNumber) {
+	// NOTE that this function only simulates modules of interest. Depending on new pallet may
+	// require adding it here.
+	assert!(System::block_number() < n);
+	while System::block_number() < n {
+		let b = System::block_number();
+
+		if System::block_number() > 1 {
+			System::on_finalize(System::block_number());
+		}
+		// Session change every 3 blocks.
+		if (b + 1) % BLOCKS_PER_SESSION == 0 {
+			let session_index = shared::CurrentSessionIndex::<Test>::get() + 1;
+			let validators_pub_keys = VALIDATORS.iter().map(|v| v.public().into()).collect();
+
+			shared::Pallet::<Test>::set_session_index(session_index);
+			shared::Pallet::<Test>::set_active_validators_ascending(validators_pub_keys);
+
+			Parachains::test_on_new_session();
+		}
+		System::set_block_number(b + 1);
+		System::on_initialize(System::block_number());
+	}
+}
+
+pub fn run_to_session(n: BlockNumber) {
+	let block_number = n * BLOCKS_PER_SESSION;
+	run_to_block(block_number);
+}
+
+pub fn test_genesis_head(size: usize) -> HeadData {
+	HeadData(vec![0u8; size])
+}
+
+pub fn test_validation_code(size: usize) -> ValidationCode {
+	let validation_code = vec![0u8; size as usize];
+	ValidationCode(validation_code)
+}
+
+pub fn para_origin(id: ParaId) -> RuntimeOrigin {
+	polkadot_runtime_parachains::Origin::Parachain(id).into()
+}
+
+pub fn max_code_size() -> u32 {
+	configuration::ActiveConfig::<Test>::get().max_code_size
+}
+
+pub fn max_head_size() -> u32 {
+	configuration::ActiveConfig::<Test>::get().max_head_data_size
+}
diff --git a/polkadot/runtime/common/src/paras_registrar/mod.rs b/polkadot/runtime/common/src/paras_registrar/mod.rs
index 2ead621dedf0..aed0729c9d51 100644
--- a/polkadot/runtime/common/src/paras_registrar/mod.rs
+++ b/polkadot/runtime/common/src/paras_registrar/mod.rs
@@ -561,15 +561,16 @@ impl<T: Config> Pallet<T> {
 		origin: <T as frame_system::Config>::RuntimeOrigin,
 		id: ParaId,
 	) -> DispatchResult {
-		ensure_signed(origin.clone())
-			.map_err(|e| e.into())
-			.and_then(|who| -> DispatchResult {
-				let para_info = Paras::<T>::get(id).ok_or(Error::<T>::NotRegistered)?;
+		if let Ok(who) = ensure_signed(origin.clone()) {
+			let para_info = Paras::<T>::get(id).ok_or(Error::<T>::NotRegistered)?;
+
+			if para_info.manager == who {
 				ensure!(!para_info.is_locked(), Error::<T>::ParaLocked);
-				ensure!(para_info.manager == who, Error::<T>::NotOwner);
-				Ok(())
-			})
-			.or_else(|_| -> DispatchResult { Self::ensure_root_or_para(origin, id) })
+				return Ok(())
+			}
+		}
+
+		Self::ensure_root_or_para(origin, id)
 	}
 
 	/// Ensure the origin is one of Root or the `para` itself.
@@ -577,14 +578,14 @@ impl<T: Config> Pallet<T> {
 		origin: <T as frame_system::Config>::RuntimeOrigin,
 		id: ParaId,
 	) -> DispatchResult {
-		if let Ok(caller_id) = ensure_parachain(<T as Config>::RuntimeOrigin::from(origin.clone()))
-		{
-			// Check if matching para id...
-			ensure!(caller_id == id, Error::<T>::NotOwner);
-		} else {
-			// Check if root...
-			ensure_root(origin.clone())?;
+		if ensure_root(origin.clone()).is_ok() {
+			return Ok(())
 		}
+
+		let caller_id = ensure_parachain(<T as Config>::RuntimeOrigin::from(origin))?;
+		// Check if matching para id...
+		ensure!(caller_id == id, Error::<T>::NotOwner);
+
 		Ok(())
 	}
 
@@ -713,967 +714,10 @@ impl<T: Config> OnNewHead for Pallet<T> {
 }
 
 #[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::{
-		mock::conclude_pvf_checking, paras_registrar, traits::Registrar as RegistrarTrait,
-	};
-	use alloc::collections::btree_map::BTreeMap;
-	use frame_support::{
-		assert_noop, assert_ok, derive_impl, parameter_types,
-		traits::{OnFinalize, OnInitialize},
-	};
-	use frame_system::limits;
-	use pallet_balances::Error as BalancesError;
-	use polkadot_primitives::{Balance, BlockNumber, SessionIndex, MAX_CODE_SIZE};
-	use polkadot_runtime_parachains::{configuration, origin, shared};
-	use sp_core::H256;
-	use sp_io::TestExternalities;
-	use sp_keyring::Sr25519Keyring;
-	use sp_runtime::{
-		traits::{BadOrigin, BlakeTwo256, IdentityLookup},
-		transaction_validity::TransactionPriority,
-		BuildStorage, Perbill,
-	};
-
-	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-	type Block = frame_system::mocking::MockBlockU32<Test>;
-
-	frame_support::construct_runtime!(
-		pub enum Test
-		{
-			System: frame_system,
-			Balances: pallet_balances,
-			Configuration: configuration,
-			Parachains: paras,
-			ParasShared: shared,
-			Registrar: paras_registrar,
-			ParachainsOrigin: origin,
-		}
-	);
-
-	impl<C> frame_system::offchain::CreateTransactionBase<C> for Test
-	where
-		RuntimeCall: From<C>,
-	{
-		type Extrinsic = UncheckedExtrinsic;
-		type RuntimeCall = RuntimeCall;
-	}
-
-	impl<C> frame_system::offchain::CreateInherent<C> for Test
-	where
-		RuntimeCall: From<C>,
-	{
-		fn create_inherent(call: Self::RuntimeCall) -> Self::Extrinsic {
-			UncheckedExtrinsic::new_bare(call)
-		}
-	}
-
-	const NORMAL_RATIO: Perbill = Perbill::from_percent(75);
-	parameter_types! {
-		pub BlockWeights: limits::BlockWeights =
-			frame_system::limits::BlockWeights::simple_max(Weight::from_parts(1024, u64::MAX));
-		pub BlockLength: limits::BlockLength =
-			limits::BlockLength::max_with_normal_ratio(4 * 1024 * 1024, NORMAL_RATIO);
-	}
-
-	#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
-	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::Everything;
-		type RuntimeOrigin = RuntimeOrigin;
-		type RuntimeCall = RuntimeCall;
-		type Nonce = u64;
-		type Hash = H256;
-		type Hashing = BlakeTwo256;
-		type AccountId = u64;
-		type Lookup = IdentityLookup<u64>;
-		type Block = Block;
-		type RuntimeEvent = RuntimeEvent;
-		type DbWeight = ();
-		type BlockWeights = BlockWeights;
-		type BlockLength = BlockLength;
-		type Version = ();
-		type PalletInfo = PalletInfo;
-		type AccountData = pallet_balances::AccountData<u128>;
-		type OnNewAccount = ();
-		type OnKilledAccount = ();
-		type SystemWeightInfo = ();
-		type SS58Prefix = ();
-		type OnSetCode = ();
-		type MaxConsumers = frame_support::traits::ConstU32<16>;
-	}
-
-	parameter_types! {
-		pub const ExistentialDeposit: Balance = 1;
-	}
-
-	#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig)]
-	impl pallet_balances::Config for Test {
-		type Balance = Balance;
-		type ExistentialDeposit = ExistentialDeposit;
-		type AccountStore = System;
-	}
-
-	impl shared::Config for Test {
-		type DisabledValidators = ();
-	}
-
-	impl origin::Config for Test {}
-
-	parameter_types! {
-		pub const ParasUnsignedPriority: TransactionPriority = TransactionPriority::max_value();
-	}
-
-	impl paras::Config for Test {
-		type RuntimeEvent = RuntimeEvent;
-		type WeightInfo = paras::TestWeightInfo;
-		type UnsignedPriority = ParasUnsignedPriority;
-		type QueueFootprinter = ();
-		type NextSessionRotation = crate::mock::TestNextSessionRotation;
-		type OnNewHead = ();
-		type AssignCoretime = ();
-	}
-
-	impl configuration::Config for Test {
-		type WeightInfo = configuration::TestWeightInfo;
-	}
-
-	parameter_types! {
-		pub const ParaDeposit: Balance = 10;
-		pub const DataDepositPerByte: Balance = 1;
-		pub const MaxRetries: u32 = 3;
-	}
-
-	impl Config for Test {
-		type RuntimeOrigin = RuntimeOrigin;
-		type RuntimeEvent = RuntimeEvent;
-		type Currency = Balances;
-		type OnSwap = MockSwap;
-		type ParaDeposit = ParaDeposit;
-		type DataDepositPerByte = DataDepositPerByte;
-		type WeightInfo = TestWeightInfo;
-	}
-
-	pub fn new_test_ext() -> TestExternalities {
-		let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
-
-		configuration::GenesisConfig::<Test> {
-			config: configuration::HostConfiguration {
-				max_code_size: MAX_CODE_SIZE,
-				max_head_data_size: 1 * 1024 * 1024, // 1 MB
-				..Default::default()
-			},
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		pallet_balances::GenesisConfig::<Test> {
-			balances: vec![(1, 10_000_000), (2, 10_000_000), (3, 10_000_000)],
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		t.into()
-	}
-
-	parameter_types! {
-		pub static SwapData: BTreeMap<ParaId, u64> = BTreeMap::new();
-	}
-
-	pub struct MockSwap;
-	impl OnSwap for MockSwap {
-		fn on_swap(one: ParaId, other: ParaId) {
-			let mut swap_data = SwapData::get();
-			let one_data = swap_data.remove(&one).unwrap_or_default();
-			let other_data = swap_data.remove(&other).unwrap_or_default();
-			swap_data.insert(one, other_data);
-			swap_data.insert(other, one_data);
-			SwapData::set(swap_data);
-		}
-	}
-
-	const BLOCKS_PER_SESSION: u32 = 3;
-
-	const VALIDATORS: &[Sr25519Keyring] = &[
-		Sr25519Keyring::Alice,
-		Sr25519Keyring::Bob,
-		Sr25519Keyring::Charlie,
-		Sr25519Keyring::Dave,
-		Sr25519Keyring::Ferdie,
-	];
-
-	fn run_to_block(n: BlockNumber) {
-		// NOTE that this function only simulates modules of interest. Depending on new pallet may
-		// require adding it here.
-		assert!(System::block_number() < n);
-		while System::block_number() < n {
-			let b = System::block_number();
-
-			if System::block_number() > 1 {
-				System::on_finalize(System::block_number());
-			}
-			// Session change every 3 blocks.
-			if (b + 1) % BLOCKS_PER_SESSION == 0 {
-				let session_index = shared::CurrentSessionIndex::<Test>::get() + 1;
-				let validators_pub_keys = VALIDATORS.iter().map(|v| v.public().into()).collect();
-
-				shared::Pallet::<Test>::set_session_index(session_index);
-				shared::Pallet::<Test>::set_active_validators_ascending(validators_pub_keys);
-
-				Parachains::test_on_new_session();
-			}
-			System::set_block_number(b + 1);
-			System::on_initialize(System::block_number());
-		}
-	}
-
-	fn run_to_session(n: BlockNumber) {
-		let block_number = n * BLOCKS_PER_SESSION;
-		run_to_block(block_number);
-	}
-
-	fn test_genesis_head(size: usize) -> HeadData {
-		HeadData(vec![0u8; size])
-	}
+mod mock;
 
-	fn test_validation_code(size: usize) -> ValidationCode {
-		let validation_code = vec![0u8; size as usize];
-		ValidationCode(validation_code)
-	}
-
-	fn para_origin(id: ParaId) -> RuntimeOrigin {
-		polkadot_runtime_parachains::Origin::Parachain(id).into()
-	}
-
-	fn max_code_size() -> u32 {
-		configuration::ActiveConfig::<Test>::get().max_code_size
-	}
-
-	fn max_head_size() -> u32 {
-		configuration::ActiveConfig::<Test>::get().max_head_data_size
-	}
-
-	#[test]
-	fn basic_setup_works() {
-		new_test_ext().execute_with(|| {
-			assert_eq!(PendingSwap::<Test>::get(&ParaId::from(0u32)), None);
-			assert_eq!(Paras::<Test>::get(&ParaId::from(0u32)), None);
-		});
-	}
-
-	#[test]
-	fn end_to_end_scenario_works() {
-		new_test_ext().execute_with(|| {
-			let para_id = LOWEST_PUBLIC_ID;
-
-			const START_SESSION_INDEX: SessionIndex = 1;
-			run_to_session(START_SESSION_INDEX);
-
-			// first para is not yet registered
-			assert!(!Parachains::is_parathread(para_id));
-			// We register the Para ID
-			let validation_code = test_validation_code(32);
-			assert_ok!(Registrar::reserve(RuntimeOrigin::signed(1)));
-			assert_ok!(Registrar::register(
-				RuntimeOrigin::signed(1),
-				para_id,
-				test_genesis_head(32),
-				validation_code.clone(),
-			));
-			conclude_pvf_checking::<Test>(&validation_code, VALIDATORS, START_SESSION_INDEX);
-
-			run_to_session(START_SESSION_INDEX + 2);
-			// It is now a parathread (on-demand parachain).
-			assert!(Parachains::is_parathread(para_id));
-			assert!(!Parachains::is_parachain(para_id));
-			// Some other external process will elevate on-demand to lease holding parachain
-			assert_ok!(Registrar::make_parachain(para_id));
-			run_to_session(START_SESSION_INDEX + 4);
-			// It is now a lease holding parachain.
-			assert!(!Parachains::is_parathread(para_id));
-			assert!(Parachains::is_parachain(para_id));
-			// Turn it back into a parathread (on-demand parachain)
-			assert_ok!(Registrar::make_parathread(para_id));
-			run_to_session(START_SESSION_INDEX + 6);
-			assert!(Parachains::is_parathread(para_id));
-			assert!(!Parachains::is_parachain(para_id));
-			// Deregister it
-			assert_ok!(Registrar::deregister(RuntimeOrigin::root(), para_id,));
-			run_to_session(START_SESSION_INDEX + 8);
-			// It is nothing
-			assert!(!Parachains::is_parathread(para_id));
-			assert!(!Parachains::is_parachain(para_id));
-		});
-	}
-
-	#[test]
-	fn register_works() {
-		new_test_ext().execute_with(|| {
-			const START_SESSION_INDEX: SessionIndex = 1;
-			run_to_session(START_SESSION_INDEX);
-
-			let para_id = LOWEST_PUBLIC_ID;
-			assert!(!Parachains::is_parathread(para_id));
-
-			let validation_code = test_validation_code(32);
-			assert_ok!(Registrar::reserve(RuntimeOrigin::signed(1)));
-			assert_eq!(Balances::reserved_balance(&1), <Test as Config>::ParaDeposit::get());
-			assert_ok!(Registrar::register(
-				RuntimeOrigin::signed(1),
-				para_id,
-				test_genesis_head(32),
-				validation_code.clone(),
-			));
-			conclude_pvf_checking::<Test>(&validation_code, VALIDATORS, START_SESSION_INDEX);
-
-			run_to_session(START_SESSION_INDEX + 2);
-			assert!(Parachains::is_parathread(para_id));
-			// Even though the registered validation code has a smaller size than the maximum the
-			// para manager's deposit is reserved as though they registered the maximum-sized code.
-			// Consequently, they can upgrade their code to the maximum size at any point without
-			// additional cost.
-			let validation_code_deposit =
-				max_code_size() as BalanceOf<Test> * <Test as Config>::DataDepositPerByte::get();
-			let head_deposit = 32 * <Test as Config>::DataDepositPerByte::get();
-			assert_eq!(
-				Balances::reserved_balance(&1),
-				<Test as Config>::ParaDeposit::get() + head_deposit + validation_code_deposit
-			);
-		});
-	}
-
-	#[test]
-	fn schedule_code_upgrade_validates_code() {
-		new_test_ext().execute_with(|| {
-			const START_SESSION_INDEX: SessionIndex = 1;
-			run_to_session(START_SESSION_INDEX);
-
-			let para_id = LOWEST_PUBLIC_ID;
-			assert!(!Parachains::is_parathread(para_id));
-
-			let validation_code = test_validation_code(32);
-			assert_ok!(Registrar::reserve(RuntimeOrigin::signed(1)));
-			assert_eq!(Balances::reserved_balance(&1), <Test as Config>::ParaDeposit::get());
-			assert_ok!(Registrar::register(
-				RuntimeOrigin::signed(1),
-				para_id,
-				test_genesis_head(32),
-				validation_code.clone(),
-			));
-			conclude_pvf_checking::<Test>(&validation_code, VALIDATORS, START_SESSION_INDEX);
-
-			run_to_session(START_SESSION_INDEX + 2);
-			assert!(Parachains::is_parathread(para_id));
-
-			let new_code = test_validation_code(0);
-			assert_noop!(
-				Registrar::schedule_code_upgrade(
-					RuntimeOrigin::signed(1),
-					para_id,
-					new_code.clone(),
-				),
-				paras::Error::<Test>::InvalidCode
-			);
-
-			let new_code = test_validation_code(max_code_size() as usize + 1);
-			assert_noop!(
-				Registrar::schedule_code_upgrade(
-					RuntimeOrigin::signed(1),
-					para_id,
-					new_code.clone(),
-				),
-				paras::Error::<Test>::InvalidCode
-			);
-		});
-	}
-
-	#[test]
-	fn register_handles_basic_errors() {
-		new_test_ext().execute_with(|| {
-			let para_id = LOWEST_PUBLIC_ID;
-
-			assert_noop!(
-				Registrar::register(
-					RuntimeOrigin::signed(1),
-					para_id,
-					test_genesis_head(max_head_size() as usize),
-					test_validation_code(max_code_size() as usize),
-				),
-				Error::<Test>::NotReserved
-			);
-
-			// Successfully register para
-			assert_ok!(Registrar::reserve(RuntimeOrigin::signed(1)));
-
-			assert_noop!(
-				Registrar::register(
-					RuntimeOrigin::signed(2),
-					para_id,
-					test_genesis_head(max_head_size() as usize),
-					test_validation_code(max_code_size() as usize),
-				),
-				Error::<Test>::NotOwner
-			);
-
-			assert_ok!(Registrar::register(
-				RuntimeOrigin::signed(1),
-				para_id,
-				test_genesis_head(max_head_size() as usize),
-				test_validation_code(max_code_size() as usize),
-			));
-			// Can skip pre-check and deregister para which's still onboarding.
-			run_to_session(2);
-
-			assert_ok!(Registrar::deregister(RuntimeOrigin::root(), para_id));
-
-			// Can't do it again
-			assert_noop!(
-				Registrar::register(
-					RuntimeOrigin::signed(1),
-					para_id,
-					test_genesis_head(max_head_size() as usize),
-					test_validation_code(max_code_size() as usize),
-				),
-				Error::<Test>::NotReserved
-			);
-
-			// Head Size Check
-			assert_ok!(Registrar::reserve(RuntimeOrigin::signed(2)));
-			assert_noop!(
-				Registrar::register(
-					RuntimeOrigin::signed(2),
-					para_id + 1,
-					test_genesis_head((max_head_size() + 1) as usize),
-					test_validation_code(max_code_size() as usize),
-				),
-				Error::<Test>::HeadDataTooLarge
-			);
-
-			// Code Size Check
-			assert_noop!(
-				Registrar::register(
-					RuntimeOrigin::signed(2),
-					para_id + 1,
-					test_genesis_head(max_head_size() as usize),
-					test_validation_code((max_code_size() + 1) as usize),
-				),
-				Error::<Test>::CodeTooLarge
-			);
-
-			// Needs enough funds for deposit
-			assert_noop!(
-				Registrar::reserve(RuntimeOrigin::signed(1337)),
-				BalancesError::<Test, _>::InsufficientBalance
-			);
-		});
-	}
-
-	#[test]
-	fn deregister_works() {
-		new_test_ext().execute_with(|| {
-			const START_SESSION_INDEX: SessionIndex = 1;
-			run_to_session(START_SESSION_INDEX);
-
-			let para_id = LOWEST_PUBLIC_ID;
-			assert!(!Parachains::is_parathread(para_id));
-
-			let validation_code = test_validation_code(32);
-			assert_ok!(Registrar::reserve(RuntimeOrigin::signed(1)));
-			assert_ok!(Registrar::register(
-				RuntimeOrigin::signed(1),
-				para_id,
-				test_genesis_head(32),
-				validation_code.clone(),
-			));
-			conclude_pvf_checking::<Test>(&validation_code, VALIDATORS, START_SESSION_INDEX);
-
-			run_to_session(START_SESSION_INDEX + 2);
-			assert!(Parachains::is_parathread(para_id));
-			assert_ok!(Registrar::deregister(RuntimeOrigin::root(), para_id,));
-			run_to_session(START_SESSION_INDEX + 4);
-			assert!(paras::Pallet::<Test>::lifecycle(para_id).is_none());
-			assert_eq!(Balances::reserved_balance(&1), 0);
-		});
-	}
-
-	#[test]
-	fn deregister_handles_basic_errors() {
-		new_test_ext().execute_with(|| {
-			const START_SESSION_INDEX: SessionIndex = 1;
-			run_to_session(START_SESSION_INDEX);
-
-			let para_id = LOWEST_PUBLIC_ID;
-			assert!(!Parachains::is_parathread(para_id));
-
-			let validation_code = test_validation_code(32);
-			assert_ok!(Registrar::reserve(RuntimeOrigin::signed(1)));
-			assert_ok!(Registrar::register(
-				RuntimeOrigin::signed(1),
-				para_id,
-				test_genesis_head(32),
-				validation_code.clone(),
-			));
-			conclude_pvf_checking::<Test>(&validation_code, VALIDATORS, START_SESSION_INDEX);
-
-			run_to_session(START_SESSION_INDEX + 2);
-			assert!(Parachains::is_parathread(para_id));
-			// Owner check
-			assert_noop!(Registrar::deregister(RuntimeOrigin::signed(2), para_id,), BadOrigin);
-			assert_ok!(Registrar::make_parachain(para_id));
-			run_to_session(START_SESSION_INDEX + 4);
-			// Cant directly deregister parachain
-			assert_noop!(
-				Registrar::deregister(RuntimeOrigin::root(), para_id,),
-				Error::<Test>::NotParathread
-			);
-		});
-	}
-
-	#[test]
-	fn swap_works() {
-		new_test_ext().execute_with(|| {
-			const START_SESSION_INDEX: SessionIndex = 1;
-			run_to_session(START_SESSION_INDEX);
-
-			// Successfully register first two parachains
-			let para_1 = LOWEST_PUBLIC_ID;
-			let para_2 = LOWEST_PUBLIC_ID + 1;
-
-			let validation_code = test_validation_code(max_code_size() as usize);
-			assert_ok!(Registrar::reserve(RuntimeOrigin::signed(1)));
-			assert_ok!(Registrar::register(
-				RuntimeOrigin::signed(1),
-				para_1,
-				test_genesis_head(max_head_size() as usize),
-				validation_code.clone(),
-			));
-			assert_ok!(Registrar::reserve(RuntimeOrigin::signed(2)));
-			assert_ok!(Registrar::register(
-				RuntimeOrigin::signed(2),
-				para_2,
-				test_genesis_head(max_head_size() as usize),
-				validation_code.clone(),
-			));
-			conclude_pvf_checking::<Test>(&validation_code, VALIDATORS, START_SESSION_INDEX);
-
-			run_to_session(START_SESSION_INDEX + 2);
-
-			// Upgrade para 1 into a parachain
-			assert_ok!(Registrar::make_parachain(para_1));
-
-			// Set some mock swap data.
-			let mut swap_data = SwapData::get();
-			swap_data.insert(para_1, 69);
-			swap_data.insert(para_2, 1337);
-			SwapData::set(swap_data);
-
-			run_to_session(START_SESSION_INDEX + 4);
-
-			// Roles are as we expect
-			assert!(Parachains::is_parachain(para_1));
-			assert!(!Parachains::is_parathread(para_1));
-			assert!(!Parachains::is_parachain(para_2));
-			assert!(Parachains::is_parathread(para_2));
-
-			// Both paras initiate a swap
-			// Swap between parachain and parathread
-			assert_ok!(Registrar::swap(para_origin(para_1), para_1, para_2,));
-			assert_ok!(Registrar::swap(para_origin(para_2), para_2, para_1,));
-			System::assert_last_event(RuntimeEvent::Registrar(paras_registrar::Event::Swapped {
-				para_id: para_2,
-				other_id: para_1,
-			}));
-
-			run_to_session(START_SESSION_INDEX + 6);
-
-			// Roles are swapped
-			assert!(!Parachains::is_parachain(para_1));
-			assert!(Parachains::is_parathread(para_1));
-			assert!(Parachains::is_parachain(para_2));
-			assert!(!Parachains::is_parathread(para_2));
-
-			// Data is swapped
-			assert_eq!(SwapData::get().get(&para_1).unwrap(), &1337);
-			assert_eq!(SwapData::get().get(&para_2).unwrap(), &69);
-
-			// Both paras initiate a swap
-			// Swap between parathread and parachain
-			assert_ok!(Registrar::swap(para_origin(para_1), para_1, para_2,));
-			assert_ok!(Registrar::swap(para_origin(para_2), para_2, para_1,));
-			System::assert_last_event(RuntimeEvent::Registrar(paras_registrar::Event::Swapped {
-				para_id: para_2,
-				other_id: para_1,
-			}));
-
-			// Data is swapped
-			assert_eq!(SwapData::get().get(&para_1).unwrap(), &69);
-			assert_eq!(SwapData::get().get(&para_2).unwrap(), &1337);
-
-			// Parachain to parachain swap
-			let para_3 = LOWEST_PUBLIC_ID + 2;
-			let validation_code = test_validation_code(max_code_size() as usize);
-			assert_ok!(Registrar::reserve(RuntimeOrigin::signed(3)));
-			assert_ok!(Registrar::register(
-				RuntimeOrigin::signed(3),
-				para_3,
-				test_genesis_head(max_head_size() as usize),
-				validation_code.clone(),
-			));
-			conclude_pvf_checking::<Test>(&validation_code, VALIDATORS, START_SESSION_INDEX + 6);
-
-			run_to_session(START_SESSION_INDEX + 8);
-
-			// Upgrade para 3 into a parachain
-			assert_ok!(Registrar::make_parachain(para_3));
-
-			// Set some mock swap data.
-			let mut swap_data = SwapData::get();
-			swap_data.insert(para_3, 777);
-			SwapData::set(swap_data);
-
-			run_to_session(START_SESSION_INDEX + 10);
-
-			// Both are parachains
-			assert!(Parachains::is_parachain(para_3));
-			assert!(!Parachains::is_parathread(para_3));
-			assert!(Parachains::is_parachain(para_1));
-			assert!(!Parachains::is_parathread(para_1));
-
-			// Both paras initiate a swap
-			// Swap between parachain and parachain
-			assert_ok!(Registrar::swap(para_origin(para_1), para_1, para_3,));
-			assert_ok!(Registrar::swap(para_origin(para_3), para_3, para_1,));
-			System::assert_last_event(RuntimeEvent::Registrar(paras_registrar::Event::Swapped {
-				para_id: para_3,
-				other_id: para_1,
-			}));
-
-			// Data is swapped
-			assert_eq!(SwapData::get().get(&para_3).unwrap(), &69);
-			assert_eq!(SwapData::get().get(&para_1).unwrap(), &777);
-		});
-	}
-
-	#[test]
-	fn para_lock_works() {
-		new_test_ext().execute_with(|| {
-			run_to_block(1);
-
-			assert_ok!(Registrar::reserve(RuntimeOrigin::signed(1)));
-			let para_id = LOWEST_PUBLIC_ID;
-			assert_ok!(Registrar::register(
-				RuntimeOrigin::signed(1),
-				para_id,
-				vec![1; 3].into(),
-				test_validation_code(32)
-			));
-
-			assert_noop!(Registrar::add_lock(RuntimeOrigin::signed(2), para_id), BadOrigin);
-
-			// Once they produces new block, we lock them in.
-			Registrar::on_new_head(para_id, &Default::default());
-
-			// Owner cannot pass origin check when checking lock
-			assert_noop!(
-				Registrar::ensure_root_para_or_owner(RuntimeOrigin::signed(1), para_id),
-				BadOrigin
-			);
-			// Owner cannot remove lock.
-			assert_noop!(Registrar::remove_lock(RuntimeOrigin::signed(1), para_id), BadOrigin);
-			// Para can.
-			assert_ok!(Registrar::remove_lock(para_origin(para_id), para_id));
-			// Owner can pass origin check again
-			assert_ok!(Registrar::ensure_root_para_or_owner(RuntimeOrigin::signed(1), para_id));
-
-			// Won't lock again after it is unlocked
-			Registrar::on_new_head(para_id, &Default::default());
-
-			assert_ok!(Registrar::ensure_root_para_or_owner(RuntimeOrigin::signed(1), para_id));
-		});
-	}
-
-	#[test]
-	fn swap_handles_bad_states() {
-		new_test_ext().execute_with(|| {
-			const START_SESSION_INDEX: SessionIndex = 1;
-			run_to_session(START_SESSION_INDEX);
-
-			let para_1 = LOWEST_PUBLIC_ID;
-			let para_2 = LOWEST_PUBLIC_ID + 1;
-
-			// paras are not yet registered
-			assert!(!Parachains::is_parathread(para_1));
-			assert!(!Parachains::is_parathread(para_2));
-
-			// Cannot even start a swap
-			assert_noop!(
-				Registrar::swap(RuntimeOrigin::root(), para_1, para_2),
-				Error::<Test>::NotRegistered
-			);
-
-			// We register Paras 1 and 2
-			let validation_code = test_validation_code(32);
-			assert_ok!(Registrar::reserve(RuntimeOrigin::signed(1)));
-			assert_ok!(Registrar::reserve(RuntimeOrigin::signed(2)));
-			assert_ok!(Registrar::register(
-				RuntimeOrigin::signed(1),
-				para_1,
-				test_genesis_head(32),
-				validation_code.clone(),
-			));
-			assert_ok!(Registrar::register(
-				RuntimeOrigin::signed(2),
-				para_2,
-				test_genesis_head(32),
-				validation_code.clone(),
-			));
-			conclude_pvf_checking::<Test>(&validation_code, VALIDATORS, START_SESSION_INDEX);
-
-			// Cannot swap
-			assert_ok!(Registrar::swap(RuntimeOrigin::root(), para_1, para_2));
-			assert_noop!(
-				Registrar::swap(RuntimeOrigin::root(), para_2, para_1),
-				Error::<Test>::CannotSwap
-			);
-
-			run_to_session(START_SESSION_INDEX + 2);
-
-			// They are now parathreads (on-demand parachains).
-			assert!(Parachains::is_parathread(para_1));
-			assert!(Parachains::is_parathread(para_2));
-
-			// Cannot swap
-			assert_ok!(Registrar::swap(RuntimeOrigin::root(), para_1, para_2));
-			assert_noop!(
-				Registrar::swap(RuntimeOrigin::root(), para_2, para_1),
-				Error::<Test>::CannotSwap
-			);
-
-			// Some other external process will elevate one on-demand
-			// parachain to a lease holding parachain
-			assert_ok!(Registrar::make_parachain(para_1));
-
-			// Cannot swap
-			assert_ok!(Registrar::swap(RuntimeOrigin::root(), para_1, para_2));
-			assert_noop!(
-				Registrar::swap(RuntimeOrigin::root(), para_2, para_1),
-				Error::<Test>::CannotSwap
-			);
-
-			run_to_session(START_SESSION_INDEX + 3);
-
-			// Cannot swap
-			assert_ok!(Registrar::swap(RuntimeOrigin::root(), para_1, para_2));
-			assert_noop!(
-				Registrar::swap(RuntimeOrigin::root(), para_2, para_1),
-				Error::<Test>::CannotSwap
-			);
-
-			run_to_session(START_SESSION_INDEX + 4);
-
-			// It is now a lease holding parachain.
-			assert!(Parachains::is_parachain(para_1));
-			assert!(Parachains::is_parathread(para_2));
-
-			// Swap works here.
-			assert_ok!(Registrar::swap(RuntimeOrigin::root(), para_1, para_2));
-			assert_ok!(Registrar::swap(RuntimeOrigin::root(), para_2, para_1));
-			assert!(System::events().iter().any(|r| matches!(
-				r.event,
-				RuntimeEvent::Registrar(paras_registrar::Event::Swapped { .. })
-			)));
-
-			run_to_session(START_SESSION_INDEX + 5);
-
-			// Cannot swap
-			assert_ok!(Registrar::swap(RuntimeOrigin::root(), para_1, para_2));
-			assert_noop!(
-				Registrar::swap(RuntimeOrigin::root(), para_2, para_1),
-				Error::<Test>::CannotSwap
-			);
-
-			run_to_session(START_SESSION_INDEX + 6);
-
-			// Swap worked!
-			assert!(Parachains::is_parachain(para_2));
-			assert!(Parachains::is_parathread(para_1));
-			assert!(System::events().iter().any(|r| matches!(
-				r.event,
-				RuntimeEvent::Registrar(paras_registrar::Event::Swapped { .. })
-			)));
-
-			// Something starts to downgrade a para
-			assert_ok!(Registrar::make_parathread(para_2));
-
-			run_to_session(START_SESSION_INDEX + 7);
-
-			// Cannot swap
-			assert_ok!(Registrar::swap(RuntimeOrigin::root(), para_1, para_2));
-			assert_noop!(
-				Registrar::swap(RuntimeOrigin::root(), para_2, para_1),
-				Error::<Test>::CannotSwap
-			);
-
-			run_to_session(START_SESSION_INDEX + 8);
-
-			assert!(Parachains::is_parathread(para_1));
-			assert!(Parachains::is_parathread(para_2));
-		});
-	}
-}
+#[cfg(test)]
+mod tests;
 
 #[cfg(feature = "runtime-benchmarks")]
-mod benchmarking {
-	use super::{Pallet as Registrar, *};
-	use crate::traits::Registrar as RegistrarT;
-	use frame_support::assert_ok;
-	use frame_system::RawOrigin;
-	use polkadot_primitives::{MAX_CODE_SIZE, MAX_HEAD_DATA_SIZE, MIN_CODE_SIZE};
-	use polkadot_runtime_parachains::{paras, shared, Origin as ParaOrigin};
-	use sp_runtime::traits::Bounded;
-
-	use frame_benchmarking::{account, benchmarks, whitelisted_caller};
-
-	fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
-		let events = frame_system::Pallet::<T>::events();
-		let system_event: <T as frame_system::Config>::RuntimeEvent = generic_event.into();
-		// compare to the last event record
-		let frame_system::EventRecord { event, .. } = &events[events.len() - 1];
-		assert_eq!(event, &system_event);
-	}
-
-	fn register_para<T: Config>(id: u32) -> ParaId {
-		let para = ParaId::from(id);
-		let genesis_head = Registrar::<T>::worst_head_data();
-		let validation_code = Registrar::<T>::worst_validation_code();
-		let caller: T::AccountId = whitelisted_caller();
-		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
-		assert_ok!(Registrar::<T>::reserve(RawOrigin::Signed(caller.clone()).into()));
-		assert_ok!(Registrar::<T>::register(
-			RawOrigin::Signed(caller).into(),
-			para,
-			genesis_head,
-			validation_code.clone()
-		));
-		assert_ok!(polkadot_runtime_parachains::paras::Pallet::<T>::add_trusted_validation_code(
-			frame_system::Origin::<T>::Root.into(),
-			validation_code,
-		));
-		return para
-	}
-
-	fn para_origin(id: u32) -> ParaOrigin {
-		ParaOrigin::Parachain(id.into())
-	}
-
-	// This function moves forward to the next scheduled session for parachain lifecycle upgrades.
-	fn next_scheduled_session<T: Config>() {
-		shared::Pallet::<T>::set_session_index(shared::Pallet::<T>::scheduled_session());
-		paras::Pallet::<T>::test_on_new_session();
-	}
-
-	benchmarks! {
-		where_clause { where ParaOrigin: Into<<T as frame_system::Config>::RuntimeOrigin> }
-
-		reserve {
-			let caller: T::AccountId = whitelisted_caller();
-			T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
-		}: _(RawOrigin::Signed(caller.clone()))
-		verify {
-			assert_last_event::<T>(Event::<T>::Reserved { para_id: LOWEST_PUBLIC_ID, who: caller }.into());
-			assert!(Paras::<T>::get(LOWEST_PUBLIC_ID).is_some());
-			assert_eq!(paras::Pallet::<T>::lifecycle(LOWEST_PUBLIC_ID), None);
-		}
-
-		register {
-			let para = LOWEST_PUBLIC_ID;
-			let genesis_head = Registrar::<T>::worst_head_data();
-			let validation_code = Registrar::<T>::worst_validation_code();
-			let caller: T::AccountId = whitelisted_caller();
-			T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
-			assert_ok!(Registrar::<T>::reserve(RawOrigin::Signed(caller.clone()).into()));
-		}: _(RawOrigin::Signed(caller.clone()), para, genesis_head, validation_code.clone())
-		verify {
-			assert_last_event::<T>(Event::<T>::Registered{ para_id: para, manager: caller }.into());
-			assert_eq!(paras::Pallet::<T>::lifecycle(para), Some(ParaLifecycle::Onboarding));
-			assert_ok!(polkadot_runtime_parachains::paras::Pallet::<T>::add_trusted_validation_code(
-				frame_system::Origin::<T>::Root.into(),
-				validation_code,
-			));
-			next_scheduled_session::<T>();
-			assert_eq!(paras::Pallet::<T>::lifecycle(para), Some(ParaLifecycle::Parathread));
-		}
-
-		force_register {
-			let manager: T::AccountId = account("manager", 0, 0);
-			let deposit = 0u32.into();
-			let para = ParaId::from(69);
-			let genesis_head = Registrar::<T>::worst_head_data();
-			let validation_code = Registrar::<T>::worst_validation_code();
-		}: _(RawOrigin::Root, manager.clone(), deposit, para, genesis_head, validation_code.clone())
-		verify {
-			assert_last_event::<T>(Event::<T>::Registered { para_id: para, manager }.into());
-			assert_eq!(paras::Pallet::<T>::lifecycle(para), Some(ParaLifecycle::Onboarding));
-			assert_ok!(polkadot_runtime_parachains::paras::Pallet::<T>::add_trusted_validation_code(
-				frame_system::Origin::<T>::Root.into(),
-				validation_code,
-			));
-			next_scheduled_session::<T>();
-			assert_eq!(paras::Pallet::<T>::lifecycle(para), Some(ParaLifecycle::Parathread));
-		}
-
-		deregister {
-			let para = register_para::<T>(LOWEST_PUBLIC_ID.into());
-			next_scheduled_session::<T>();
-			let caller: T::AccountId = whitelisted_caller();
-		}: _(RawOrigin::Signed(caller), para)
-		verify {
-			assert_last_event::<T>(Event::<T>::Deregistered { para_id: para }.into());
-		}
-
-		swap {
-			// On demand parachain
-			let parathread = register_para::<T>(LOWEST_PUBLIC_ID.into());
-			let parachain = register_para::<T>((LOWEST_PUBLIC_ID + 1).into());
-
-			let parachain_origin = para_origin(parachain.into());
-
-			// Actually finish registration process
-			next_scheduled_session::<T>();
-
-			// Upgrade the parachain
-			Registrar::<T>::make_parachain(parachain)?;
-			next_scheduled_session::<T>();
-
-			assert_eq!(paras::Pallet::<T>::lifecycle(parachain), Some(ParaLifecycle::Parachain));
-			assert_eq!(paras::Pallet::<T>::lifecycle(parathread), Some(ParaLifecycle::Parathread));
-
-			let caller: T::AccountId = whitelisted_caller();
-			Registrar::<T>::swap(parachain_origin.into(), parachain, parathread)?;
-		}: _(RawOrigin::Signed(caller.clone()), parathread, parachain)
-		verify {
-			next_scheduled_session::<T>();
-			// Swapped!
-			assert_eq!(paras::Pallet::<T>::lifecycle(parachain), Some(ParaLifecycle::Parathread));
-			assert_eq!(paras::Pallet::<T>::lifecycle(parathread), Some(ParaLifecycle::Parachain));
-		}
-
-		schedule_code_upgrade {
-			let b in MIN_CODE_SIZE .. MAX_CODE_SIZE;
-			let new_code = ValidationCode(vec![0; b as usize]);
-			let para_id = ParaId::from(1000);
-		}: _(RawOrigin::Root, para_id, new_code)
-
-		set_current_head {
-			let b in 1 .. MAX_HEAD_DATA_SIZE;
-			let new_head = HeadData(vec![0; b as usize]);
-			let para_id = ParaId::from(1000);
-		}: _(RawOrigin::Root, para_id, new_head)
-
-		impl_benchmark_test_suite!(
-			Registrar,
-			crate::integration_tests::new_test_ext(),
-			crate::integration_tests::Test,
-		);
-	}
-}
+mod benchmarking;
diff --git a/polkadot/runtime/common/src/paras_registrar/tests.rs b/polkadot/runtime/common/src/paras_registrar/tests.rs
new file mode 100644
index 000000000000..66fef31c9afd
--- /dev/null
+++ b/polkadot/runtime/common/src/paras_registrar/tests.rs
@@ -0,0 +1,588 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Tests for the paras_registrar pallet.
+
+#[cfg(test)]
+use super::*;
+use crate::{
+	mock::conclude_pvf_checking, paras_registrar, paras_registrar::mock::*,
+	traits::Registrar as RegistrarTrait,
+};
+use frame_support::{assert_noop, assert_ok};
+use pallet_balances::Error as BalancesError;
+use polkadot_primitives::SessionIndex;
+use sp_runtime::traits::BadOrigin;
+
+#[test]
+fn end_to_end_scenario_works() {
+	new_test_ext().execute_with(|| {
+		let para_id = LOWEST_PUBLIC_ID;
+
+		const START_SESSION_INDEX: SessionIndex = 1;
+		run_to_session(START_SESSION_INDEX);
+
+		// first para is not yet registered
+		assert!(!Parachains::is_parathread(para_id));
+		// We register the Para ID
+		let validation_code = test_validation_code(32);
+		assert_ok!(mock::Registrar::reserve(RuntimeOrigin::signed(1)));
+		assert_ok!(mock::Registrar::register(
+			RuntimeOrigin::signed(1),
+			para_id,
+			test_genesis_head(32),
+			validation_code.clone(),
+		));
+		conclude_pvf_checking::<Test>(&validation_code, VALIDATORS, START_SESSION_INDEX);
+
+		run_to_session(START_SESSION_INDEX + 2);
+		// It is now a parathread (on-demand parachain).
+		assert!(Parachains::is_parathread(para_id));
+		assert!(!Parachains::is_parachain(para_id));
+		// Some other external process will elevate on-demand to lease holding parachain
+		assert_ok!(mock::Registrar::make_parachain(para_id));
+		run_to_session(START_SESSION_INDEX + 4);
+		// It is now a lease holding parachain.
+		assert!(!Parachains::is_parathread(para_id));
+		assert!(Parachains::is_parachain(para_id));
+		// Turn it back into a parathread (on-demand parachain)
+		assert_ok!(mock::Registrar::make_parathread(para_id));
+		run_to_session(START_SESSION_INDEX + 6);
+		assert!(Parachains::is_parathread(para_id));
+		assert!(!Parachains::is_parachain(para_id));
+		// Deregister it
+		assert_ok!(mock::Registrar::deregister(RuntimeOrigin::root(), para_id,));
+		run_to_session(START_SESSION_INDEX + 8);
+		// It is nothing
+		assert!(!Parachains::is_parathread(para_id));
+		assert!(!Parachains::is_parachain(para_id));
+	});
+}
+
+#[test]
+fn register_works() {
+	new_test_ext().execute_with(|| {
+		const START_SESSION_INDEX: SessionIndex = 1;
+		run_to_session(START_SESSION_INDEX);
+
+		let para_id = LOWEST_PUBLIC_ID;
+		assert!(!Parachains::is_parathread(para_id));
+
+		let validation_code = test_validation_code(32);
+		assert_ok!(mock::Registrar::reserve(RuntimeOrigin::signed(1)));
+		assert_eq!(Balances::reserved_balance(&1), <Test as Config>::ParaDeposit::get());
+		assert_ok!(mock::Registrar::register(
+			RuntimeOrigin::signed(1),
+			para_id,
+			test_genesis_head(32),
+			validation_code.clone(),
+		));
+		conclude_pvf_checking::<Test>(&validation_code, VALIDATORS, START_SESSION_INDEX);
+
+		run_to_session(START_SESSION_INDEX + 2);
+		assert!(Parachains::is_parathread(para_id));
+		// Even though the registered validation code has a smaller size than the maximum the
+		// para manager's deposit is reserved as though they registered the maximum-sized code.
+		// Consequently, they can upgrade their code to the maximum size at any point without
+		// additional cost.
+		let validation_code_deposit =
+			max_code_size() as BalanceOf<Test> * <Test as Config>::DataDepositPerByte::get();
+		let head_deposit = 32 * <Test as Config>::DataDepositPerByte::get();
+		assert_eq!(
+			Balances::reserved_balance(&1),
+			<Test as Config>::ParaDeposit::get() + head_deposit + validation_code_deposit
+		);
+	});
+}
+
+#[test]
+fn schedule_code_upgrade_validates_code() {
+	new_test_ext().execute_with(|| {
+		const START_SESSION_INDEX: SessionIndex = 1;
+		run_to_session(START_SESSION_INDEX);
+
+		let para_id = LOWEST_PUBLIC_ID;
+		assert!(!Parachains::is_parathread(para_id));
+
+		let validation_code = test_validation_code(32);
+		assert_ok!(mock::Registrar::reserve(RuntimeOrigin::signed(1)));
+		assert_eq!(Balances::reserved_balance(&1), <Test as Config>::ParaDeposit::get());
+		assert_ok!(mock::Registrar::register(
+			RuntimeOrigin::signed(1),
+			para_id,
+			test_genesis_head(32),
+			validation_code.clone(),
+		));
+		conclude_pvf_checking::<Test>(&validation_code, VALIDATORS, START_SESSION_INDEX);
+
+		run_to_session(START_SESSION_INDEX + 2);
+		assert!(Parachains::is_parathread(para_id));
+
+		let new_code = test_validation_code(0);
+		assert_noop!(
+			mock::Registrar::schedule_code_upgrade(
+				RuntimeOrigin::signed(1),
+				para_id,
+				new_code.clone(),
+			),
+			paras::Error::<Test>::InvalidCode
+		);
+
+		let new_code = test_validation_code(max_code_size() as usize + 1);
+		assert_noop!(
+			mock::Registrar::schedule_code_upgrade(
+				RuntimeOrigin::signed(1),
+				para_id,
+				new_code.clone(),
+			),
+			paras::Error::<Test>::InvalidCode
+		);
+	});
+}
+
+#[test]
+fn register_handles_basic_errors() {
+	new_test_ext().execute_with(|| {
+		let para_id = LOWEST_PUBLIC_ID;
+
+		assert_noop!(
+			mock::Registrar::register(
+				RuntimeOrigin::signed(1),
+				para_id,
+				test_genesis_head(max_head_size() as usize),
+				test_validation_code(max_code_size() as usize),
+			),
+			Error::<Test>::NotReserved
+		);
+
+		// Successfully register para
+		assert_ok!(mock::Registrar::reserve(RuntimeOrigin::signed(1)));
+
+		assert_noop!(
+			mock::Registrar::register(
+				RuntimeOrigin::signed(2),
+				para_id,
+				test_genesis_head(max_head_size() as usize),
+				test_validation_code(max_code_size() as usize),
+			),
+			Error::<Test>::NotOwner
+		);
+
+		assert_ok!(mock::Registrar::register(
+			RuntimeOrigin::signed(1),
+			para_id,
+			test_genesis_head(max_head_size() as usize),
+			test_validation_code(max_code_size() as usize),
+		));
+		// Can skip pre-check and deregister para which's still onboarding.
+		run_to_session(2);
+
+		assert_ok!(mock::Registrar::deregister(RuntimeOrigin::root(), para_id));
+
+		// Can't do it again
+		assert_noop!(
+			mock::Registrar::register(
+				RuntimeOrigin::signed(1),
+				para_id,
+				test_genesis_head(max_head_size() as usize),
+				test_validation_code(max_code_size() as usize),
+			),
+			Error::<Test>::NotReserved
+		);
+
+		// Head Size Check
+		assert_ok!(mock::Registrar::reserve(RuntimeOrigin::signed(2)));
+		assert_noop!(
+			mock::Registrar::register(
+				RuntimeOrigin::signed(2),
+				para_id + 1,
+				test_genesis_head((max_head_size() + 1) as usize),
+				test_validation_code(max_code_size() as usize),
+			),
+			Error::<Test>::HeadDataTooLarge
+		);
+
+		// Code Size Check
+		assert_noop!(
+			mock::Registrar::register(
+				RuntimeOrigin::signed(2),
+				para_id + 1,
+				test_genesis_head(max_head_size() as usize),
+				test_validation_code((max_code_size() + 1) as usize),
+			),
+			Error::<Test>::CodeTooLarge
+		);
+
+		// Needs enough funds for deposit
+		assert_noop!(
+			mock::Registrar::reserve(RuntimeOrigin::signed(1337)),
+			BalancesError::<Test, _>::InsufficientBalance
+		);
+	});
+}
+
+#[test]
+fn deregister_works() {
+	new_test_ext().execute_with(|| {
+		const START_SESSION_INDEX: SessionIndex = 1;
+		run_to_session(START_SESSION_INDEX);
+
+		let para_id = LOWEST_PUBLIC_ID;
+		assert!(!Parachains::is_parathread(para_id));
+
+		let validation_code = test_validation_code(32);
+		assert_ok!(mock::Registrar::reserve(RuntimeOrigin::signed(1)));
+		assert_ok!(mock::Registrar::register(
+			RuntimeOrigin::signed(1),
+			para_id,
+			test_genesis_head(32),
+			validation_code.clone(),
+		));
+		conclude_pvf_checking::<Test>(&validation_code, VALIDATORS, START_SESSION_INDEX);
+
+		run_to_session(START_SESSION_INDEX + 2);
+		assert!(Parachains::is_parathread(para_id));
+		assert_ok!(mock::Registrar::deregister(RuntimeOrigin::root(), para_id,));
+		run_to_session(START_SESSION_INDEX + 4);
+		assert!(paras::Pallet::<Test>::lifecycle(para_id).is_none());
+		assert_eq!(Balances::reserved_balance(&1), 0);
+	});
+}
+
+#[test]
+fn deregister_handles_basic_errors() {
+	new_test_ext().execute_with(|| {
+		const START_SESSION_INDEX: SessionIndex = 1;
+		run_to_session(START_SESSION_INDEX);
+
+		let para_id = LOWEST_PUBLIC_ID;
+		assert!(!Parachains::is_parathread(para_id));
+
+		let validation_code = test_validation_code(32);
+		assert_ok!(mock::Registrar::reserve(RuntimeOrigin::signed(1)));
+		assert_ok!(mock::Registrar::register(
+			RuntimeOrigin::signed(1),
+			para_id,
+			test_genesis_head(32),
+			validation_code.clone(),
+		));
+		conclude_pvf_checking::<Test>(&validation_code, VALIDATORS, START_SESSION_INDEX);
+
+		run_to_session(START_SESSION_INDEX + 2);
+		assert!(Parachains::is_parathread(para_id));
+		// Owner check
+		assert_noop!(mock::Registrar::deregister(RuntimeOrigin::signed(2), para_id,), BadOrigin);
+		assert_ok!(mock::Registrar::make_parachain(para_id));
+		run_to_session(START_SESSION_INDEX + 4);
+		// Cant directly deregister parachain
+		assert_noop!(
+			mock::Registrar::deregister(RuntimeOrigin::root(), para_id,),
+			Error::<Test>::NotParathread
+		);
+	});
+}
+
+#[test]
+fn swap_works() {
+	new_test_ext().execute_with(|| {
+		const START_SESSION_INDEX: SessionIndex = 1;
+		run_to_session(START_SESSION_INDEX);
+
+		// Successfully register first two parachains
+		let para_1 = LOWEST_PUBLIC_ID;
+		let para_2 = LOWEST_PUBLIC_ID + 1;
+
+		let validation_code = test_validation_code(max_code_size() as usize);
+		assert_ok!(mock::Registrar::reserve(RuntimeOrigin::signed(1)));
+		assert_ok!(mock::Registrar::register(
+			RuntimeOrigin::signed(1),
+			para_1,
+			test_genesis_head(max_head_size() as usize),
+			validation_code.clone(),
+		));
+		assert_ok!(mock::Registrar::reserve(RuntimeOrigin::signed(2)));
+		assert_ok!(mock::Registrar::register(
+			RuntimeOrigin::signed(2),
+			para_2,
+			test_genesis_head(max_head_size() as usize),
+			validation_code.clone(),
+		));
+		conclude_pvf_checking::<Test>(&validation_code, VALIDATORS, START_SESSION_INDEX);
+
+		run_to_session(START_SESSION_INDEX + 2);
+
+		// Upgrade para 1 into a parachain
+		assert_ok!(mock::Registrar::make_parachain(para_1));
+
+		// Set some mock swap data.
+		let mut swap_data = SwapData::get();
+		swap_data.insert(para_1, 69);
+		swap_data.insert(para_2, 1337);
+		SwapData::set(swap_data);
+
+		run_to_session(START_SESSION_INDEX + 4);
+
+		// Roles are as we expect
+		assert!(Parachains::is_parachain(para_1));
+		assert!(!Parachains::is_parathread(para_1));
+		assert!(!Parachains::is_parachain(para_2));
+		assert!(Parachains::is_parathread(para_2));
+
+		// Both paras initiate a swap
+		// Swap between parachain and parathread
+		assert_ok!(mock::Registrar::swap(para_origin(para_1), para_1, para_2,));
+		assert_ok!(mock::Registrar::swap(para_origin(para_2), para_2, para_1,));
+		System::assert_last_event(RuntimeEvent::Registrar(paras_registrar::Event::Swapped {
+			para_id: para_2,
+			other_id: para_1,
+		}));
+
+		run_to_session(START_SESSION_INDEX + 6);
+
+		// Roles are swapped
+		assert!(!Parachains::is_parachain(para_1));
+		assert!(Parachains::is_parathread(para_1));
+		assert!(Parachains::is_parachain(para_2));
+		assert!(!Parachains::is_parathread(para_2));
+
+		// Data is swapped
+		assert_eq!(SwapData::get().get(&para_1).unwrap(), &1337);
+		assert_eq!(SwapData::get().get(&para_2).unwrap(), &69);
+
+		// Both paras initiate a swap
+		// Swap between parathread and parachain
+		assert_ok!(mock::Registrar::swap(para_origin(para_1), para_1, para_2,));
+		assert_ok!(mock::Registrar::swap(para_origin(para_2), para_2, para_1,));
+		System::assert_last_event(RuntimeEvent::Registrar(paras_registrar::Event::Swapped {
+			para_id: para_2,
+			other_id: para_1,
+		}));
+
+		// Data is swapped
+		assert_eq!(SwapData::get().get(&para_1).unwrap(), &69);
+		assert_eq!(SwapData::get().get(&para_2).unwrap(), &1337);
+
+		// Parachain to parachain swap
+		let para_3 = LOWEST_PUBLIC_ID + 2;
+		let validation_code = test_validation_code(max_code_size() as usize);
+		assert_ok!(mock::Registrar::reserve(RuntimeOrigin::signed(3)));
+		assert_ok!(mock::Registrar::register(
+			RuntimeOrigin::signed(3),
+			para_3,
+			test_genesis_head(max_head_size() as usize),
+			validation_code.clone(),
+		));
+		conclude_pvf_checking::<Test>(&validation_code, VALIDATORS, START_SESSION_INDEX + 6);
+
+		run_to_session(START_SESSION_INDEX + 8);
+
+		// Upgrade para 3 into a parachain
+		assert_ok!(mock::Registrar::make_parachain(para_3));
+
+		// Set some mock swap data.
+		let mut swap_data = SwapData::get();
+		swap_data.insert(para_3, 777);
+		SwapData::set(swap_data);
+
+		run_to_session(START_SESSION_INDEX + 10);
+
+		// Both are parachains
+		assert!(Parachains::is_parachain(para_3));
+		assert!(!Parachains::is_parathread(para_3));
+		assert!(Parachains::is_parachain(para_1));
+		assert!(!Parachains::is_parathread(para_1));
+
+		// Both paras initiate a swap
+		// Swap between parachain and parachain
+		assert_ok!(mock::Registrar::swap(para_origin(para_1), para_1, para_3,));
+		assert_ok!(mock::Registrar::swap(para_origin(para_3), para_3, para_1,));
+		System::assert_last_event(RuntimeEvent::Registrar(paras_registrar::Event::Swapped {
+			para_id: para_3,
+			other_id: para_1,
+		}));
+
+		// Data is swapped
+		assert_eq!(SwapData::get().get(&para_3).unwrap(), &69);
+		assert_eq!(SwapData::get().get(&para_1).unwrap(), &777);
+	});
+}
+
+#[test]
+fn para_lock_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+
+		assert_ok!(mock::Registrar::reserve(RuntimeOrigin::signed(1)));
+		let para_id = LOWEST_PUBLIC_ID;
+		assert_ok!(mock::Registrar::register(
+			RuntimeOrigin::signed(1),
+			para_id,
+			vec![1; 3].into(),
+			test_validation_code(32)
+		));
+
+		assert_noop!(mock::Registrar::add_lock(RuntimeOrigin::signed(2), para_id), BadOrigin);
+
+		// Once they produces new block, we lock them in.
+		mock::Registrar::on_new_head(para_id, &Default::default());
+
+		// Owner cannot pass origin check when checking lock
+		assert_noop!(
+			mock::Registrar::ensure_root_para_or_owner(RuntimeOrigin::signed(1), para_id),
+			Error::<Test>::ParaLocked,
+		);
+		// Owner cannot remove lock.
+		assert_noop!(mock::Registrar::remove_lock(RuntimeOrigin::signed(1), para_id), BadOrigin);
+		// Para can.
+		assert_ok!(mock::Registrar::remove_lock(para_origin(para_id), para_id));
+		// Owner can pass origin check again
+		assert_ok!(mock::Registrar::ensure_root_para_or_owner(RuntimeOrigin::signed(1), para_id));
+
+		// Won't lock again after it is unlocked
+		mock::Registrar::on_new_head(para_id, &Default::default());
+
+		assert_ok!(mock::Registrar::ensure_root_para_or_owner(RuntimeOrigin::signed(1), para_id));
+	});
+}
+
+#[test]
+fn swap_handles_bad_states() {
+	new_test_ext().execute_with(|| {
+		const START_SESSION_INDEX: SessionIndex = 1;
+		run_to_session(START_SESSION_INDEX);
+
+		let para_1 = LOWEST_PUBLIC_ID;
+		let para_2 = LOWEST_PUBLIC_ID + 1;
+
+		// paras are not yet registered
+		assert!(!Parachains::is_parathread(para_1));
+		assert!(!Parachains::is_parathread(para_2));
+
+		// Cannot even start a swap
+		assert_noop!(
+			mock::Registrar::swap(RuntimeOrigin::root(), para_1, para_2),
+			Error::<Test>::NotRegistered
+		);
+
+		// We register Paras 1 and 2
+		let validation_code = test_validation_code(32);
+		assert_ok!(mock::Registrar::reserve(RuntimeOrigin::signed(1)));
+		assert_ok!(mock::Registrar::reserve(RuntimeOrigin::signed(2)));
+		assert_ok!(mock::Registrar::register(
+			RuntimeOrigin::signed(1),
+			para_1,
+			test_genesis_head(32),
+			validation_code.clone(),
+		));
+		assert_ok!(mock::Registrar::register(
+			RuntimeOrigin::signed(2),
+			para_2,
+			test_genesis_head(32),
+			validation_code.clone(),
+		));
+		conclude_pvf_checking::<Test>(&validation_code, VALIDATORS, START_SESSION_INDEX);
+
+		// Cannot swap
+		assert_ok!(mock::Registrar::swap(RuntimeOrigin::root(), para_1, para_2));
+		assert_noop!(
+			mock::Registrar::swap(RuntimeOrigin::root(), para_2, para_1),
+			Error::<Test>::CannotSwap
+		);
+
+		run_to_session(START_SESSION_INDEX + 2);
+
+		// They are now parathreads (on-demand parachains).
+		assert!(Parachains::is_parathread(para_1));
+		assert!(Parachains::is_parathread(para_2));
+
+		// Cannot swap
+		assert_ok!(mock::Registrar::swap(RuntimeOrigin::root(), para_1, para_2));
+		assert_noop!(
+			mock::Registrar::swap(RuntimeOrigin::root(), para_2, para_1),
+			Error::<Test>::CannotSwap
+		);
+
+		// Some other external process will elevate one on-demand
+		// parachain to a lease holding parachain
+		assert_ok!(mock::Registrar::make_parachain(para_1));
+
+		// Cannot swap
+		assert_ok!(mock::Registrar::swap(RuntimeOrigin::root(), para_1, para_2));
+		assert_noop!(
+			mock::Registrar::swap(RuntimeOrigin::root(), para_2, para_1),
+			Error::<Test>::CannotSwap
+		);
+
+		run_to_session(START_SESSION_INDEX + 3);
+
+		// Cannot swap
+		assert_ok!(mock::Registrar::swap(RuntimeOrigin::root(), para_1, para_2));
+		assert_noop!(
+			mock::Registrar::swap(RuntimeOrigin::root(), para_2, para_1),
+			Error::<Test>::CannotSwap
+		);
+
+		run_to_session(START_SESSION_INDEX + 4);
+
+		// It is now a lease holding parachain.
+		assert!(Parachains::is_parachain(para_1));
+		assert!(Parachains::is_parathread(para_2));
+
+		// Swap works here.
+		assert_ok!(mock::Registrar::swap(RuntimeOrigin::root(), para_1, para_2));
+		assert_ok!(mock::Registrar::swap(RuntimeOrigin::root(), para_2, para_1));
+		assert!(System::events().iter().any(|r| matches!(
+			r.event,
+			RuntimeEvent::Registrar(paras_registrar::Event::Swapped { .. })
+		)));
+
+		run_to_session(START_SESSION_INDEX + 5);
+
+		// Cannot swap
+		assert_ok!(mock::Registrar::swap(RuntimeOrigin::root(), para_1, para_2));
+		assert_noop!(
+			mock::Registrar::swap(RuntimeOrigin::root(), para_2, para_1),
+			Error::<Test>::CannotSwap
+		);
+
+		run_to_session(START_SESSION_INDEX + 6);
+
+		// Swap worked!
+		assert!(Parachains::is_parachain(para_2));
+		assert!(Parachains::is_parathread(para_1));
+		assert!(System::events().iter().any(|r| matches!(
+			r.event,
+			RuntimeEvent::Registrar(paras_registrar::Event::Swapped { .. })
+		)));
+
+		// Something starts to downgrade a para
+		assert_ok!(mock::Registrar::make_parathread(para_2));
+
+		run_to_session(START_SESSION_INDEX + 7);
+
+		// Cannot swap
+		assert_ok!(mock::Registrar::swap(RuntimeOrigin::root(), para_1, para_2));
+		assert_noop!(
+			mock::Registrar::swap(RuntimeOrigin::root(), para_2, para_1),
+			Error::<Test>::CannotSwap
+		);
+
+		run_to_session(START_SESSION_INDEX + 8);
+
+		assert!(Parachains::is_parathread(para_1));
+		assert!(Parachains::is_parathread(para_2));
+	});
+}
diff --git a/polkadot/runtime/common/src/purchase.rs b/polkadot/runtime/common/src/purchase.rs
deleted file mode 100644
index cec92540654c..000000000000
--- a/polkadot/runtime/common/src/purchase.rs
+++ /dev/null
@@ -1,1178 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Pallet to process purchase of DOTs.
-
-use alloc::vec::Vec;
-use codec::{Decode, Encode};
-use frame_support::{
-	pallet_prelude::*,
-	traits::{Currency, EnsureOrigin, ExistenceRequirement, Get, VestingSchedule},
-};
-use frame_system::pallet_prelude::*;
-pub use pallet::*;
-use scale_info::TypeInfo;
-use sp_core::sr25519;
-use sp_runtime::{
-	traits::{CheckedAdd, Saturating, Verify, Zero},
-	AnySignature, DispatchError, DispatchResult, Permill, RuntimeDebug,
-};
-
-type BalanceOf<T> =
-	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-
-/// The kind of statement an account needs to make for a claim to be valid.
-#[derive(Encode, Decode, Clone, Copy, Eq, PartialEq, RuntimeDebug, TypeInfo)]
-pub enum AccountValidity {
-	/// Account is not valid.
-	Invalid,
-	/// Account has initiated the account creation process.
-	Initiated,
-	/// Account is pending validation.
-	Pending,
-	/// Account is valid with a low contribution amount.
-	ValidLow,
-	/// Account is valid with a high contribution amount.
-	ValidHigh,
-	/// Account has completed the purchase process.
-	Completed,
-}
-
-impl Default for AccountValidity {
-	fn default() -> Self {
-		AccountValidity::Invalid
-	}
-}
-
-impl AccountValidity {
-	fn is_valid(&self) -> bool {
-		match self {
-			Self::Invalid => false,
-			Self::Initiated => false,
-			Self::Pending => false,
-			Self::ValidLow => true,
-			Self::ValidHigh => true,
-			Self::Completed => false,
-		}
-	}
-}
-
-/// All information about an account regarding the purchase of DOTs.
-#[derive(Encode, Decode, Default, Clone, Eq, PartialEq, RuntimeDebug, TypeInfo)]
-pub struct AccountStatus<Balance> {
-	/// The current validity status of the user. Will denote if the user has passed KYC,
-	/// how much they are able to purchase, and when their purchase process has completed.
-	validity: AccountValidity,
-	/// The amount of free DOTs they have purchased.
-	free_balance: Balance,
-	/// The amount of locked DOTs they have purchased.
-	locked_balance: Balance,
-	/// Their sr25519/ed25519 signature verifying they have signed our required statement.
-	signature: Vec<u8>,
-	/// The percentage of VAT the purchaser is responsible for. This is already factored into
-	/// account balance.
-	vat: Permill,
-}
-
-#[frame_support::pallet]
-pub mod pallet {
-	use super::*;
-
-	#[pallet::pallet]
-	#[pallet::without_storage_info]
-	pub struct Pallet<T>(_);
-
-	#[pallet::config]
-	pub trait Config: frame_system::Config {
-		/// The overarching event type.
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-
-		/// Balances Pallet
-		type Currency: Currency<Self::AccountId>;
-
-		/// Vesting Pallet
-		type VestingSchedule: VestingSchedule<
-			Self::AccountId,
-			Moment = BlockNumberFor<Self>,
-			Currency = Self::Currency,
-		>;
-
-		/// The origin allowed to set account status.
-		type ValidityOrigin: EnsureOrigin<Self::RuntimeOrigin>;
-
-		/// The origin allowed to make configurations to the pallet.
-		type ConfigurationOrigin: EnsureOrigin<Self::RuntimeOrigin>;
-
-		/// The maximum statement length for the statement users to sign when creating an account.
-		#[pallet::constant]
-		type MaxStatementLength: Get<u32>;
-
-		/// The amount of purchased locked DOTs that we will unlock for basic actions on the chain.
-		#[pallet::constant]
-		type UnlockedProportion: Get<Permill>;
-
-		/// The maximum amount of locked DOTs that we will unlock.
-		#[pallet::constant]
-		type MaxUnlocked: Get<BalanceOf<Self>>;
-	}
-
-	#[pallet::event]
-	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	pub enum Event<T: Config> {
-		/// A new account was created.
-		AccountCreated { who: T::AccountId },
-		/// Someone's account validity was updated.
-		ValidityUpdated { who: T::AccountId, validity: AccountValidity },
-		/// Someone's purchase balance was updated.
-		BalanceUpdated { who: T::AccountId, free: BalanceOf<T>, locked: BalanceOf<T> },
-		/// A payout was made to a purchaser.
-		PaymentComplete { who: T::AccountId, free: BalanceOf<T>, locked: BalanceOf<T> },
-		/// A new payment account was set.
-		PaymentAccountSet { who: T::AccountId },
-		/// A new statement was set.
-		StatementUpdated,
-		/// A new statement was set. `[block_number]`
-		UnlockBlockUpdated { block_number: BlockNumberFor<T> },
-	}
-
-	#[pallet::error]
-	pub enum Error<T> {
-		/// Account is not currently valid to use.
-		InvalidAccount,
-		/// Account used in the purchase already exists.
-		ExistingAccount,
-		/// Provided signature is invalid
-		InvalidSignature,
-		/// Account has already completed the purchase process.
-		AlreadyCompleted,
-		/// An overflow occurred when doing calculations.
-		Overflow,
-		/// The statement is too long to be stored on chain.
-		InvalidStatement,
-		/// The unlock block is in the past!
-		InvalidUnlockBlock,
-		/// Vesting schedule already exists for this account.
-		VestingScheduleExists,
-	}
-
-	// A map of all participants in the DOT purchase process.
-	#[pallet::storage]
-	pub(super) type Accounts<T: Config> =
-		StorageMap<_, Blake2_128Concat, T::AccountId, AccountStatus<BalanceOf<T>>, ValueQuery>;
-
-	// The account that will be used to payout participants of the DOT purchase process.
-	#[pallet::storage]
-	pub(super) type PaymentAccount<T: Config> = StorageValue<_, T::AccountId, OptionQuery>;
-
-	// The statement purchasers will need to sign to participate.
-	#[pallet::storage]
-	pub(super) type Statement<T> = StorageValue<_, Vec<u8>, ValueQuery>;
-
-	// The block where all locked dots will unlock.
-	#[pallet::storage]
-	pub(super) type UnlockBlock<T: Config> = StorageValue<_, BlockNumberFor<T>, ValueQuery>;
-
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
-	#[pallet::call]
-	impl<T: Config> Pallet<T> {
-		/// Create a new account. Proof of existence through a valid signed message.
-		///
-		/// We check that the account does not exist at this stage.
-		///
-		/// Origin must match the `ValidityOrigin`.
-		#[pallet::call_index(0)]
-		#[pallet::weight(Weight::from_parts(200_000_000, 0) + T::DbWeight::get().reads_writes(4, 1))]
-		pub fn create_account(
-			origin: OriginFor<T>,
-			who: T::AccountId,
-			signature: Vec<u8>,
-		) -> DispatchResult {
-			T::ValidityOrigin::ensure_origin(origin)?;
-			// Account is already being tracked by the pallet.
-			ensure!(!Accounts::<T>::contains_key(&who), Error::<T>::ExistingAccount);
-			// Account should not have a vesting schedule.
-			ensure!(
-				T::VestingSchedule::vesting_balance(&who).is_none(),
-				Error::<T>::VestingScheduleExists
-			);
-
-			// Verify the signature provided is valid for the statement.
-			Self::verify_signature(&who, &signature)?;
-
-			// Create a new pending account.
-			let status = AccountStatus {
-				validity: AccountValidity::Initiated,
-				signature,
-				free_balance: Zero::zero(),
-				locked_balance: Zero::zero(),
-				vat: Permill::zero(),
-			};
-			Accounts::<T>::insert(&who, status);
-			Self::deposit_event(Event::<T>::AccountCreated { who });
-			Ok(())
-		}
-
-		/// Update the validity status of an existing account. If set to completed, the account
-		/// will no longer be able to continue through the crowdfund process.
-		///
-		/// We check that the account exists at this stage, but has not completed the process.
-		///
-		/// Origin must match the `ValidityOrigin`.
-		#[pallet::call_index(1)]
-		#[pallet::weight(T::DbWeight::get().reads_writes(1, 1))]
-		pub fn update_validity_status(
-			origin: OriginFor<T>,
-			who: T::AccountId,
-			validity: AccountValidity,
-		) -> DispatchResult {
-			T::ValidityOrigin::ensure_origin(origin)?;
-			ensure!(Accounts::<T>::contains_key(&who), Error::<T>::InvalidAccount);
-			Accounts::<T>::try_mutate(
-				&who,
-				|status: &mut AccountStatus<BalanceOf<T>>| -> DispatchResult {
-					ensure!(
-						status.validity != AccountValidity::Completed,
-						Error::<T>::AlreadyCompleted
-					);
-					status.validity = validity;
-					Ok(())
-				},
-			)?;
-			Self::deposit_event(Event::<T>::ValidityUpdated { who, validity });
-			Ok(())
-		}
-
-		/// Update the balance of a valid account.
-		///
-		/// We check that the account is valid for a balance transfer at this point.
-		///
-		/// Origin must match the `ValidityOrigin`.
-		#[pallet::call_index(2)]
-		#[pallet::weight(T::DbWeight::get().reads_writes(2, 1))]
-		pub fn update_balance(
-			origin: OriginFor<T>,
-			who: T::AccountId,
-			free_balance: BalanceOf<T>,
-			locked_balance: BalanceOf<T>,
-			vat: Permill,
-		) -> DispatchResult {
-			T::ValidityOrigin::ensure_origin(origin)?;
-
-			Accounts::<T>::try_mutate(
-				&who,
-				|status: &mut AccountStatus<BalanceOf<T>>| -> DispatchResult {
-					// Account has a valid status (not Invalid, Pending, or Completed)...
-					ensure!(status.validity.is_valid(), Error::<T>::InvalidAccount);
-
-					free_balance.checked_add(&locked_balance).ok_or(Error::<T>::Overflow)?;
-					status.free_balance = free_balance;
-					status.locked_balance = locked_balance;
-					status.vat = vat;
-					Ok(())
-				},
-			)?;
-			Self::deposit_event(Event::<T>::BalanceUpdated {
-				who,
-				free: free_balance,
-				locked: locked_balance,
-			});
-			Ok(())
-		}
-
-		/// Pay the user and complete the purchase process.
-		///
-		/// We reverify all assumptions about the state of an account, and complete the process.
-		///
-		/// Origin must match the configured `PaymentAccount` (if it is not configured then this
-		/// will always fail with `BadOrigin`).
-		#[pallet::call_index(3)]
-		#[pallet::weight(T::DbWeight::get().reads_writes(4, 2))]
-		pub fn payout(origin: OriginFor<T>, who: T::AccountId) -> DispatchResult {
-			// Payments must be made directly by the `PaymentAccount`.
-			let payment_account = ensure_signed(origin)?;
-			let test_against = PaymentAccount::<T>::get().ok_or(DispatchError::BadOrigin)?;
-			ensure!(payment_account == test_against, DispatchError::BadOrigin);
-
-			// Account should not have a vesting schedule.
-			ensure!(
-				T::VestingSchedule::vesting_balance(&who).is_none(),
-				Error::<T>::VestingScheduleExists
-			);
-
-			Accounts::<T>::try_mutate(
-				&who,
-				|status: &mut AccountStatus<BalanceOf<T>>| -> DispatchResult {
-					// Account has a valid status (not Invalid, Pending, or Completed)...
-					ensure!(status.validity.is_valid(), Error::<T>::InvalidAccount);
-
-					// Transfer funds from the payment account into the purchasing user.
-					let total_balance = status
-						.free_balance
-						.checked_add(&status.locked_balance)
-						.ok_or(Error::<T>::Overflow)?;
-					T::Currency::transfer(
-						&payment_account,
-						&who,
-						total_balance,
-						ExistenceRequirement::AllowDeath,
-					)?;
-
-					if !status.locked_balance.is_zero() {
-						let unlock_block = UnlockBlock::<T>::get();
-						// We allow some configurable portion of the purchased locked DOTs to be
-						// unlocked for basic usage.
-						let unlocked = (T::UnlockedProportion::get() * status.locked_balance)
-							.min(T::MaxUnlocked::get());
-						let locked = status.locked_balance.saturating_sub(unlocked);
-						// We checked that this account has no existing vesting schedule. So this
-						// function should never fail, however if it does, not much we can do about
-						// it at this point.
-						let _ = T::VestingSchedule::add_vesting_schedule(
-							// Apply vesting schedule to this user
-							&who,
-							// For this much amount
-							locked,
-							// Unlocking the full amount after one block
-							locked,
-							// When everything unlocks
-							unlock_block,
-						);
-					}
-
-					// Setting the user account to `Completed` ends the purchase process for this
-					// user.
-					status.validity = AccountValidity::Completed;
-					Self::deposit_event(Event::<T>::PaymentComplete {
-						who: who.clone(),
-						free: status.free_balance,
-						locked: status.locked_balance,
-					});
-					Ok(())
-				},
-			)?;
-			Ok(())
-		}
-
-		/* Configuration Operations */
-
-		/// Set the account that will be used to payout users in the DOT purchase process.
-		///
-		/// Origin must match the `ConfigurationOrigin`
-		#[pallet::call_index(4)]
-		#[pallet::weight(T::DbWeight::get().writes(1))]
-		pub fn set_payment_account(origin: OriginFor<T>, who: T::AccountId) -> DispatchResult {
-			T::ConfigurationOrigin::ensure_origin(origin)?;
-			// Possibly this is worse than having the caller account be the payment account?
-			PaymentAccount::<T>::put(who.clone());
-			Self::deposit_event(Event::<T>::PaymentAccountSet { who });
-			Ok(())
-		}
-
-		/// Set the statement that must be signed for a user to participate on the DOT sale.
-		///
-		/// Origin must match the `ConfigurationOrigin`
-		#[pallet::call_index(5)]
-		#[pallet::weight(T::DbWeight::get().writes(1))]
-		pub fn set_statement(origin: OriginFor<T>, statement: Vec<u8>) -> DispatchResult {
-			T::ConfigurationOrigin::ensure_origin(origin)?;
-			ensure!(
-				(statement.len() as u32) < T::MaxStatementLength::get(),
-				Error::<T>::InvalidStatement
-			);
-			// Possibly this is worse than having the caller account be the payment account?
-			Statement::<T>::set(statement);
-			Self::deposit_event(Event::<T>::StatementUpdated);
-			Ok(())
-		}
-
-		/// Set the block where locked DOTs will become unlocked.
-		///
-		/// Origin must match the `ConfigurationOrigin`
-		#[pallet::call_index(6)]
-		#[pallet::weight(T::DbWeight::get().writes(1))]
-		pub fn set_unlock_block(
-			origin: OriginFor<T>,
-			unlock_block: BlockNumberFor<T>,
-		) -> DispatchResult {
-			T::ConfigurationOrigin::ensure_origin(origin)?;
-			ensure!(
-				unlock_block > frame_system::Pallet::<T>::block_number(),
-				Error::<T>::InvalidUnlockBlock
-			);
-			// Possibly this is worse than having the caller account be the payment account?
-			UnlockBlock::<T>::set(unlock_block);
-			Self::deposit_event(Event::<T>::UnlockBlockUpdated { block_number: unlock_block });
-			Ok(())
-		}
-	}
-}
-
-impl<T: Config> Pallet<T> {
-	fn verify_signature(who: &T::AccountId, signature: &[u8]) -> Result<(), DispatchError> {
-		// sr25519 always expects a 64 byte signature.
-		let signature: AnySignature = sr25519::Signature::try_from(signature)
-			.map_err(|_| Error::<T>::InvalidSignature)?
-			.into();
-
-		// In Polkadot, the AccountId is always the same as the 32 byte public key.
-		let account_bytes: [u8; 32] = account_to_bytes(who)?;
-		let public_key = sr25519::Public::from_raw(account_bytes);
-
-		let message = Statement::<T>::get();
-
-		// Check if everything is good or not.
-		match signature.verify(message.as_slice(), &public_key) {
-			true => Ok(()),
-			false => Err(Error::<T>::InvalidSignature)?,
-		}
-	}
-}
-
-// This function converts a 32 byte AccountId to its byte-array equivalent form.
-fn account_to_bytes<AccountId>(account: &AccountId) -> Result<[u8; 32], DispatchError>
-where
-	AccountId: Encode,
-{
-	let account_vec = account.encode();
-	ensure!(account_vec.len() == 32, "AccountId must be 32 bytes.");
-	let mut bytes = [0u8; 32];
-	bytes.copy_from_slice(&account_vec);
-	Ok(bytes)
-}
-
-/// WARNING: Executing this function will clear all storage used by this pallet.
-/// Be sure this is what you want...
-pub fn remove_pallet<T>() -> frame_support::weights::Weight
-where
-	T: frame_system::Config,
-{
-	#[allow(deprecated)]
-	use frame_support::migration::remove_storage_prefix;
-	#[allow(deprecated)]
-	remove_storage_prefix(b"Purchase", b"Accounts", b"");
-	#[allow(deprecated)]
-	remove_storage_prefix(b"Purchase", b"PaymentAccount", b"");
-	#[allow(deprecated)]
-	remove_storage_prefix(b"Purchase", b"Statement", b"");
-	#[allow(deprecated)]
-	remove_storage_prefix(b"Purchase", b"UnlockBlock", b"");
-
-	<T as frame_system::Config>::BlockWeights::get().max_block
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-
-	use sp_core::{crypto::AccountId32, H256};
-	use sp_keyring::{Ed25519Keyring, Sr25519Keyring};
-	// The testing primitives are very useful for avoiding having to work with signatures
-	// or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
-	use crate::purchase;
-	use frame_support::{
-		assert_noop, assert_ok, derive_impl, ord_parameter_types, parameter_types,
-		traits::{Currency, WithdrawReasons},
-	};
-	use sp_runtime::{
-		traits::{BlakeTwo256, Dispatchable, Identity, IdentityLookup},
-		ArithmeticError, BuildStorage,
-		DispatchError::BadOrigin,
-	};
-
-	type Block = frame_system::mocking::MockBlock<Test>;
-
-	frame_support::construct_runtime!(
-		pub enum Test
-		{
-			System: frame_system,
-			Balances: pallet_balances,
-			Vesting: pallet_vesting,
-			Purchase: purchase,
-		}
-	);
-
-	type AccountId = AccountId32;
-
-	#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
-	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::Everything;
-		type BlockWeights = ();
-		type BlockLength = ();
-		type DbWeight = ();
-		type RuntimeOrigin = RuntimeOrigin;
-		type RuntimeCall = RuntimeCall;
-		type Nonce = u64;
-		type Hash = H256;
-		type Hashing = BlakeTwo256;
-		type AccountId = AccountId;
-		type Lookup = IdentityLookup<AccountId>;
-		type Block = Block;
-		type RuntimeEvent = RuntimeEvent;
-		type Version = ();
-		type PalletInfo = PalletInfo;
-		type AccountData = pallet_balances::AccountData<u64>;
-		type OnNewAccount = ();
-		type OnKilledAccount = ();
-		type SystemWeightInfo = ();
-		type SS58Prefix = ();
-		type OnSetCode = ();
-		type MaxConsumers = frame_support::traits::ConstU32<16>;
-	}
-
-	#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig)]
-	impl pallet_balances::Config for Test {
-		type AccountStore = System;
-	}
-
-	parameter_types! {
-		pub const MinVestedTransfer: u64 = 1;
-		pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons =
-			WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
-	}
-
-	impl pallet_vesting::Config for Test {
-		type RuntimeEvent = RuntimeEvent;
-		type Currency = Balances;
-		type BlockNumberToBalance = Identity;
-		type MinVestedTransfer = MinVestedTransfer;
-		type WeightInfo = ();
-		type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
-		type BlockNumberProvider = System;
-		const MAX_VESTING_SCHEDULES: u32 = 28;
-	}
-
-	parameter_types! {
-		pub const MaxStatementLength: u32 =  1_000;
-		pub const UnlockedProportion: Permill = Permill::from_percent(10);
-		pub const MaxUnlocked: u64 = 10;
-	}
-
-	ord_parameter_types! {
-		pub const ValidityOrigin: AccountId = AccountId32::from([0u8; 32]);
-		pub const PaymentOrigin: AccountId = AccountId32::from([1u8; 32]);
-		pub const ConfigurationOrigin: AccountId = AccountId32::from([2u8; 32]);
-	}
-
-	impl Config for Test {
-		type RuntimeEvent = RuntimeEvent;
-		type Currency = Balances;
-		type VestingSchedule = Vesting;
-		type ValidityOrigin = frame_system::EnsureSignedBy<ValidityOrigin, AccountId>;
-		type ConfigurationOrigin = frame_system::EnsureSignedBy<ConfigurationOrigin, AccountId>;
-		type MaxStatementLength = MaxStatementLength;
-		type UnlockedProportion = UnlockedProportion;
-		type MaxUnlocked = MaxUnlocked;
-	}
-
-	// This function basically just builds a genesis storage key/value store according to
-	// our desired mockup. It also executes our `setup` function which sets up this pallet for use.
-	pub fn new_test_ext() -> sp_io::TestExternalities {
-		let t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
-		let mut ext = sp_io::TestExternalities::new(t);
-		ext.execute_with(|| setup());
-		ext
-	}
-
-	fn setup() {
-		let statement = b"Hello, World".to_vec();
-		let unlock_block = 100;
-		Purchase::set_statement(RuntimeOrigin::signed(configuration_origin()), statement).unwrap();
-		Purchase::set_unlock_block(RuntimeOrigin::signed(configuration_origin()), unlock_block)
-			.unwrap();
-		Purchase::set_payment_account(
-			RuntimeOrigin::signed(configuration_origin()),
-			payment_account(),
-		)
-		.unwrap();
-		Balances::make_free_balance_be(&payment_account(), 100_000);
-	}
-
-	fn alice() -> AccountId {
-		Sr25519Keyring::Alice.to_account_id()
-	}
-
-	fn alice_ed25519() -> AccountId {
-		Ed25519Keyring::Alice.to_account_id()
-	}
-
-	fn bob() -> AccountId {
-		Sr25519Keyring::Bob.to_account_id()
-	}
-
-	fn alice_signature() -> [u8; 64] {
-		// echo -n "Hello, World" | subkey -s sign "bottom drive obey lake curtain smoke basket hold
-		// race lonely fit walk//Alice"
-		hex_literal::hex!("20e0faffdf4dfe939f2faa560f73b1d01cde8472e2b690b7b40606a374244c3a2e9eb9c8107c10b605138374003af8819bd4387d7c24a66ee9253c2e688ab881")
-	}
-
-	fn bob_signature() -> [u8; 64] {
-		// echo -n "Hello, World" | subkey -s sign "bottom drive obey lake curtain smoke basket hold
-		// race lonely fit walk//Bob"
-		hex_literal::hex!("d6d460187ecf530f3ec2d6e3ac91b9d083c8fbd8f1112d92a82e4d84df552d18d338e6da8944eba6e84afaacf8a9850f54e7b53a84530d649be2e0119c7ce889")
-	}
-
-	fn alice_signature_ed25519() -> [u8; 64] {
-		// echo -n "Hello, World" | subkey -e sign "bottom drive obey lake curtain smoke basket hold
-		// race lonely fit walk//Alice"
-		hex_literal::hex!("ee3f5a6cbfc12a8f00c18b811dc921b550ddf272354cda4b9a57b1d06213fcd8509f5af18425d39a279d13622f14806c3e978e2163981f2ec1c06e9628460b0e")
-	}
-
-	fn validity_origin() -> AccountId {
-		ValidityOrigin::get()
-	}
-
-	fn configuration_origin() -> AccountId {
-		ConfigurationOrigin::get()
-	}
-
-	fn payment_account() -> AccountId {
-		[42u8; 32].into()
-	}
-
-	#[test]
-	fn set_statement_works_and_handles_basic_errors() {
-		new_test_ext().execute_with(|| {
-			let statement = b"Test Set Statement".to_vec();
-			// Invalid origin
-			assert_noop!(
-				Purchase::set_statement(RuntimeOrigin::signed(alice()), statement.clone()),
-				BadOrigin,
-			);
-			// Too Long
-			let long_statement = [0u8; 10_000].to_vec();
-			assert_noop!(
-				Purchase::set_statement(
-					RuntimeOrigin::signed(configuration_origin()),
-					long_statement
-				),
-				Error::<Test>::InvalidStatement,
-			);
-			// Just right...
-			assert_ok!(Purchase::set_statement(
-				RuntimeOrigin::signed(configuration_origin()),
-				statement.clone()
-			));
-			assert_eq!(Statement::<Test>::get(), statement);
-		});
-	}
-
-	#[test]
-	fn set_unlock_block_works_and_handles_basic_errors() {
-		new_test_ext().execute_with(|| {
-			let unlock_block = 69;
-			// Invalid origin
-			assert_noop!(
-				Purchase::set_unlock_block(RuntimeOrigin::signed(alice()), unlock_block),
-				BadOrigin,
-			);
-			// Block Number in Past
-			let bad_unlock_block = 50;
-			System::set_block_number(bad_unlock_block);
-			assert_noop!(
-				Purchase::set_unlock_block(
-					RuntimeOrigin::signed(configuration_origin()),
-					bad_unlock_block
-				),
-				Error::<Test>::InvalidUnlockBlock,
-			);
-			// Just right...
-			assert_ok!(Purchase::set_unlock_block(
-				RuntimeOrigin::signed(configuration_origin()),
-				unlock_block
-			));
-			assert_eq!(UnlockBlock::<Test>::get(), unlock_block);
-		});
-	}
-
-	#[test]
-	fn set_payment_account_works_and_handles_basic_errors() {
-		new_test_ext().execute_with(|| {
-			let payment_account: AccountId = [69u8; 32].into();
-			// Invalid Origin
-			assert_noop!(
-				Purchase::set_payment_account(
-					RuntimeOrigin::signed(alice()),
-					payment_account.clone()
-				),
-				BadOrigin,
-			);
-			// Just right...
-			assert_ok!(Purchase::set_payment_account(
-				RuntimeOrigin::signed(configuration_origin()),
-				payment_account.clone()
-			));
-			assert_eq!(PaymentAccount::<Test>::get(), Some(payment_account));
-		});
-	}
-
-	#[test]
-	fn signature_verification_works() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Purchase::verify_signature(&alice(), &alice_signature()));
-			assert_ok!(Purchase::verify_signature(&alice_ed25519(), &alice_signature_ed25519()));
-			assert_ok!(Purchase::verify_signature(&bob(), &bob_signature()));
-
-			// Mixing and matching fails
-			assert_noop!(
-				Purchase::verify_signature(&alice(), &bob_signature()),
-				Error::<Test>::InvalidSignature
-			);
-			assert_noop!(
-				Purchase::verify_signature(&bob(), &alice_signature()),
-				Error::<Test>::InvalidSignature
-			);
-		});
-	}
-
-	#[test]
-	fn account_creation_works() {
-		new_test_ext().execute_with(|| {
-			assert!(!Accounts::<Test>::contains_key(alice()));
-			assert_ok!(Purchase::create_account(
-				RuntimeOrigin::signed(validity_origin()),
-				alice(),
-				alice_signature().to_vec(),
-			));
-			assert_eq!(
-				Accounts::<Test>::get(alice()),
-				AccountStatus {
-					validity: AccountValidity::Initiated,
-					free_balance: Zero::zero(),
-					locked_balance: Zero::zero(),
-					signature: alice_signature().to_vec(),
-					vat: Permill::zero(),
-				}
-			);
-		});
-	}
-
-	#[test]
-	fn account_creation_handles_basic_errors() {
-		new_test_ext().execute_with(|| {
-			// Wrong Origin
-			assert_noop!(
-				Purchase::create_account(
-					RuntimeOrigin::signed(alice()),
-					alice(),
-					alice_signature().to_vec()
-				),
-				BadOrigin,
-			);
-
-			// Wrong Account/Signature
-			assert_noop!(
-				Purchase::create_account(
-					RuntimeOrigin::signed(validity_origin()),
-					alice(),
-					bob_signature().to_vec()
-				),
-				Error::<Test>::InvalidSignature,
-			);
-
-			// Account with vesting
-			Balances::make_free_balance_be(&alice(), 100);
-			assert_ok!(<Test as Config>::VestingSchedule::add_vesting_schedule(
-				&alice(),
-				100,
-				1,
-				50
-			));
-			assert_noop!(
-				Purchase::create_account(
-					RuntimeOrigin::signed(validity_origin()),
-					alice(),
-					alice_signature().to_vec()
-				),
-				Error::<Test>::VestingScheduleExists,
-			);
-
-			// Duplicate Purchasing Account
-			assert_ok!(Purchase::create_account(
-				RuntimeOrigin::signed(validity_origin()),
-				bob(),
-				bob_signature().to_vec()
-			));
-			assert_noop!(
-				Purchase::create_account(
-					RuntimeOrigin::signed(validity_origin()),
-					bob(),
-					bob_signature().to_vec()
-				),
-				Error::<Test>::ExistingAccount,
-			);
-		});
-	}
-
-	#[test]
-	fn update_validity_status_works() {
-		new_test_ext().execute_with(|| {
-			// Alice account is created.
-			assert_ok!(Purchase::create_account(
-				RuntimeOrigin::signed(validity_origin()),
-				alice(),
-				alice_signature().to_vec(),
-			));
-			// She submits KYC, and we update the status to `Pending`.
-			assert_ok!(Purchase::update_validity_status(
-				RuntimeOrigin::signed(validity_origin()),
-				alice(),
-				AccountValidity::Pending,
-			));
-			// KYC comes back negative, so we mark the account invalid.
-			assert_ok!(Purchase::update_validity_status(
-				RuntimeOrigin::signed(validity_origin()),
-				alice(),
-				AccountValidity::Invalid,
-			));
-			assert_eq!(
-				Accounts::<Test>::get(alice()),
-				AccountStatus {
-					validity: AccountValidity::Invalid,
-					free_balance: Zero::zero(),
-					locked_balance: Zero::zero(),
-					signature: alice_signature().to_vec(),
-					vat: Permill::zero(),
-				}
-			);
-			// She fixes it, we mark her account valid.
-			assert_ok!(Purchase::update_validity_status(
-				RuntimeOrigin::signed(validity_origin()),
-				alice(),
-				AccountValidity::ValidLow,
-			));
-			assert_eq!(
-				Accounts::<Test>::get(alice()),
-				AccountStatus {
-					validity: AccountValidity::ValidLow,
-					free_balance: Zero::zero(),
-					locked_balance: Zero::zero(),
-					signature: alice_signature().to_vec(),
-					vat: Permill::zero(),
-				}
-			);
-		});
-	}
-
-	#[test]
-	fn update_validity_status_handles_basic_errors() {
-		new_test_ext().execute_with(|| {
-			// Wrong Origin
-			assert_noop!(
-				Purchase::update_validity_status(
-					RuntimeOrigin::signed(alice()),
-					alice(),
-					AccountValidity::Pending,
-				),
-				BadOrigin
-			);
-			// Inactive Account
-			assert_noop!(
-				Purchase::update_validity_status(
-					RuntimeOrigin::signed(validity_origin()),
-					alice(),
-					AccountValidity::Pending,
-				),
-				Error::<Test>::InvalidAccount
-			);
-			// Already Completed
-			assert_ok!(Purchase::create_account(
-				RuntimeOrigin::signed(validity_origin()),
-				alice(),
-				alice_signature().to_vec(),
-			));
-			assert_ok!(Purchase::update_validity_status(
-				RuntimeOrigin::signed(validity_origin()),
-				alice(),
-				AccountValidity::Completed,
-			));
-			assert_noop!(
-				Purchase::update_validity_status(
-					RuntimeOrigin::signed(validity_origin()),
-					alice(),
-					AccountValidity::Pending,
-				),
-				Error::<Test>::AlreadyCompleted
-			);
-		});
-	}
-
-	#[test]
-	fn update_balance_works() {
-		new_test_ext().execute_with(|| {
-			// Alice account is created
-			assert_ok!(Purchase::create_account(
-				RuntimeOrigin::signed(validity_origin()),
-				alice(),
-				alice_signature().to_vec()
-			));
-			// And approved for basic contribution
-			assert_ok!(Purchase::update_validity_status(
-				RuntimeOrigin::signed(validity_origin()),
-				alice(),
-				AccountValidity::ValidLow,
-			));
-			// We set a balance on the user based on the payment they made. 50 locked, 50 free.
-			assert_ok!(Purchase::update_balance(
-				RuntimeOrigin::signed(validity_origin()),
-				alice(),
-				50,
-				50,
-				Permill::from_rational(77u32, 1000u32),
-			));
-			assert_eq!(
-				Accounts::<Test>::get(alice()),
-				AccountStatus {
-					validity: AccountValidity::ValidLow,
-					free_balance: 50,
-					locked_balance: 50,
-					signature: alice_signature().to_vec(),
-					vat: Permill::from_parts(77000),
-				}
-			);
-			// We can update the balance based on new information.
-			assert_ok!(Purchase::update_balance(
-				RuntimeOrigin::signed(validity_origin()),
-				alice(),
-				25,
-				50,
-				Permill::zero(),
-			));
-			assert_eq!(
-				Accounts::<Test>::get(alice()),
-				AccountStatus {
-					validity: AccountValidity::ValidLow,
-					free_balance: 25,
-					locked_balance: 50,
-					signature: alice_signature().to_vec(),
-					vat: Permill::zero(),
-				}
-			);
-		});
-	}
-
-	#[test]
-	fn update_balance_handles_basic_errors() {
-		new_test_ext().execute_with(|| {
-			// Wrong Origin
-			assert_noop!(
-				Purchase::update_balance(
-					RuntimeOrigin::signed(alice()),
-					alice(),
-					50,
-					50,
-					Permill::zero(),
-				),
-				BadOrigin
-			);
-			// Inactive Account
-			assert_noop!(
-				Purchase::update_balance(
-					RuntimeOrigin::signed(validity_origin()),
-					alice(),
-					50,
-					50,
-					Permill::zero(),
-				),
-				Error::<Test>::InvalidAccount
-			);
-			// Overflow
-			assert_noop!(
-				Purchase::update_balance(
-					RuntimeOrigin::signed(validity_origin()),
-					alice(),
-					u64::MAX,
-					u64::MAX,
-					Permill::zero(),
-				),
-				Error::<Test>::InvalidAccount
-			);
-		});
-	}
-
-	#[test]
-	fn payout_works() {
-		new_test_ext().execute_with(|| {
-			// Alice and Bob accounts are created
-			assert_ok!(Purchase::create_account(
-				RuntimeOrigin::signed(validity_origin()),
-				alice(),
-				alice_signature().to_vec()
-			));
-			assert_ok!(Purchase::create_account(
-				RuntimeOrigin::signed(validity_origin()),
-				bob(),
-				bob_signature().to_vec()
-			));
-			// Alice is approved for basic contribution
-			assert_ok!(Purchase::update_validity_status(
-				RuntimeOrigin::signed(validity_origin()),
-				alice(),
-				AccountValidity::ValidLow,
-			));
-			// Bob is approved for high contribution
-			assert_ok!(Purchase::update_validity_status(
-				RuntimeOrigin::signed(validity_origin()),
-				bob(),
-				AccountValidity::ValidHigh,
-			));
-			// We set a balance on the users based on the payment they made. 50 locked, 50 free.
-			assert_ok!(Purchase::update_balance(
-				RuntimeOrigin::signed(validity_origin()),
-				alice(),
-				50,
-				50,
-				Permill::zero(),
-			));
-			assert_ok!(Purchase::update_balance(
-				RuntimeOrigin::signed(validity_origin()),
-				bob(),
-				100,
-				150,
-				Permill::zero(),
-			));
-			// Now we call payout for Alice and Bob.
-			assert_ok!(Purchase::payout(RuntimeOrigin::signed(payment_account()), alice(),));
-			assert_ok!(Purchase::payout(RuntimeOrigin::signed(payment_account()), bob(),));
-			// Payment is made.
-			assert_eq!(<Test as Config>::Currency::free_balance(&payment_account()), 99_650);
-			assert_eq!(<Test as Config>::Currency::free_balance(&alice()), 100);
-			// 10% of the 50 units is unlocked automatically for Alice
-			assert_eq!(<Test as Config>::VestingSchedule::vesting_balance(&alice()), Some(45));
-			assert_eq!(<Test as Config>::Currency::free_balance(&bob()), 250);
-			// A max of 10 units is unlocked automatically for Bob
-			assert_eq!(<Test as Config>::VestingSchedule::vesting_balance(&bob()), Some(140));
-			// Status is completed.
-			assert_eq!(
-				Accounts::<Test>::get(alice()),
-				AccountStatus {
-					validity: AccountValidity::Completed,
-					free_balance: 50,
-					locked_balance: 50,
-					signature: alice_signature().to_vec(),
-					vat: Permill::zero(),
-				}
-			);
-			assert_eq!(
-				Accounts::<Test>::get(bob()),
-				AccountStatus {
-					validity: AccountValidity::Completed,
-					free_balance: 100,
-					locked_balance: 150,
-					signature: bob_signature().to_vec(),
-					vat: Permill::zero(),
-				}
-			);
-			// Vesting lock is removed in whole on block 101 (100 blocks after block 1)
-			System::set_block_number(100);
-			let vest_call = RuntimeCall::Vesting(pallet_vesting::Call::<Test>::vest {});
-			assert_ok!(vest_call.clone().dispatch(RuntimeOrigin::signed(alice())));
-			assert_ok!(vest_call.clone().dispatch(RuntimeOrigin::signed(bob())));
-			assert_eq!(<Test as Config>::VestingSchedule::vesting_balance(&alice()), Some(45));
-			assert_eq!(<Test as Config>::VestingSchedule::vesting_balance(&bob()), Some(140));
-			System::set_block_number(101);
-			assert_ok!(vest_call.clone().dispatch(RuntimeOrigin::signed(alice())));
-			assert_ok!(vest_call.clone().dispatch(RuntimeOrigin::signed(bob())));
-			assert_eq!(<Test as Config>::VestingSchedule::vesting_balance(&alice()), None);
-			assert_eq!(<Test as Config>::VestingSchedule::vesting_balance(&bob()), None);
-		});
-	}
-
-	#[test]
-	fn payout_handles_basic_errors() {
-		new_test_ext().execute_with(|| {
-			// Wrong Origin
-			assert_noop!(Purchase::payout(RuntimeOrigin::signed(alice()), alice(),), BadOrigin);
-			// Account with Existing Vesting Schedule
-			Balances::make_free_balance_be(&bob(), 100);
-			assert_ok!(
-				<Test as Config>::VestingSchedule::add_vesting_schedule(&bob(), 100, 1, 50,)
-			);
-			assert_noop!(
-				Purchase::payout(RuntimeOrigin::signed(payment_account()), bob(),),
-				Error::<Test>::VestingScheduleExists
-			);
-			// Invalid Account (never created)
-			assert_noop!(
-				Purchase::payout(RuntimeOrigin::signed(payment_account()), alice(),),
-				Error::<Test>::InvalidAccount
-			);
-			// Invalid Account (created, but not valid)
-			assert_ok!(Purchase::create_account(
-				RuntimeOrigin::signed(validity_origin()),
-				alice(),
-				alice_signature().to_vec()
-			));
-			assert_noop!(
-				Purchase::payout(RuntimeOrigin::signed(payment_account()), alice(),),
-				Error::<Test>::InvalidAccount
-			);
-			// Not enough funds in payment account
-			assert_ok!(Purchase::update_validity_status(
-				RuntimeOrigin::signed(validity_origin()),
-				alice(),
-				AccountValidity::ValidHigh,
-			));
-			assert_ok!(Purchase::update_balance(
-				RuntimeOrigin::signed(validity_origin()),
-				alice(),
-				100_000,
-				100_000,
-				Permill::zero(),
-			));
-			assert_noop!(
-				Purchase::payout(RuntimeOrigin::signed(payment_account()), alice()),
-				ArithmeticError::Underflow
-			);
-		});
-	}
-
-	#[test]
-	fn remove_pallet_works() {
-		new_test_ext().execute_with(|| {
-			let account_status = AccountStatus {
-				validity: AccountValidity::Completed,
-				free_balance: 1234,
-				locked_balance: 4321,
-				signature: b"my signature".to_vec(),
-				vat: Permill::from_percent(50),
-			};
-
-			// Add some storage.
-			Accounts::<Test>::insert(alice(), account_status.clone());
-			Accounts::<Test>::insert(bob(), account_status);
-			PaymentAccount::<Test>::put(alice());
-			Statement::<Test>::put(b"hello, world!".to_vec());
-			UnlockBlock::<Test>::put(4);
-
-			// Verify storage exists.
-			assert_eq!(Accounts::<Test>::iter().count(), 2);
-			assert!(PaymentAccount::<Test>::exists());
-			assert!(Statement::<Test>::exists());
-			assert!(UnlockBlock::<Test>::exists());
-
-			// Remove storage.
-			remove_pallet::<Test>();
-
-			// Verify storage is gone.
-			assert_eq!(Accounts::<Test>::iter().count(), 0);
-			assert!(!PaymentAccount::<Test>::exists());
-			assert!(!Statement::<Test>::exists());
-			assert!(!UnlockBlock::<Test>::exists());
-		});
-	}
-}
diff --git a/polkadot/runtime/common/src/purchase/mock.rs b/polkadot/runtime/common/src/purchase/mock.rs
new file mode 100644
index 000000000000..ec8599f3b792
--- /dev/null
+++ b/polkadot/runtime/common/src/purchase/mock.rs
@@ -0,0 +1,181 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Mocking utilities for testing in purchase pallet.
+
+#[cfg(test)]
+use super::*;
+
+use sp_core::{crypto::AccountId32, H256};
+use sp_keyring::{Ed25519Keyring, Sr25519Keyring};
+// The testing primitives are very useful for avoiding having to work with signatures
+// or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
+use crate::purchase;
+use frame_support::{
+	derive_impl, ord_parameter_types, parameter_types,
+	traits::{Currency, WithdrawReasons},
+};
+use sp_runtime::{
+	traits::{BlakeTwo256, Identity, IdentityLookup},
+	BuildStorage,
+};
+
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test
+	{
+		System: frame_system,
+		Balances: pallet_balances,
+		Vesting: pallet_vesting,
+		Purchase: purchase,
+	}
+);
+
+type AccountId = AccountId32;
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
+impl frame_system::Config for Test {
+	type BaseCallFilter = frame_support::traits::Everything;
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
+	type RuntimeOrigin = RuntimeOrigin;
+	type RuntimeCall = RuntimeCall;
+	type Nonce = u64;
+	type Hash = H256;
+	type Hashing = BlakeTwo256;
+	type AccountId = AccountId;
+	type Lookup = IdentityLookup<AccountId>;
+	type Block = Block;
+	type RuntimeEvent = RuntimeEvent;
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = pallet_balances::AccountData<u64>;
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+	type SS58Prefix = ();
+	type OnSetCode = ();
+	type MaxConsumers = frame_support::traits::ConstU32<16>;
+}
+
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig)]
+impl pallet_balances::Config for Test {
+	type AccountStore = System;
+}
+
+parameter_types! {
+	pub const MinVestedTransfer: u64 = 1;
+	pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons =
+		WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
+}
+
+impl pallet_vesting::Config for Test {
+	type RuntimeEvent = RuntimeEvent;
+	type Currency = Balances;
+	type BlockNumberToBalance = Identity;
+	type MinVestedTransfer = MinVestedTransfer;
+	type WeightInfo = ();
+	type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
+	type BlockNumberProvider = System;
+	const MAX_VESTING_SCHEDULES: u32 = 28;
+}
+
+parameter_types! {
+	pub const MaxStatementLength: u32 =  1_000;
+	pub const UnlockedProportion: Permill = Permill::from_percent(10);
+	pub const MaxUnlocked: u64 = 10;
+}
+
+ord_parameter_types! {
+	pub const ValidityOrigin: AccountId = AccountId32::from([0u8; 32]);
+	pub const PaymentOrigin: AccountId = AccountId32::from([1u8; 32]);
+	pub const ConfigurationOrigin: AccountId = AccountId32::from([2u8; 32]);
+}
+
+impl Config for Test {
+	type RuntimeEvent = RuntimeEvent;
+	type Currency = Balances;
+	type VestingSchedule = Vesting;
+	type ValidityOrigin = frame_system::EnsureSignedBy<ValidityOrigin, AccountId>;
+	type ConfigurationOrigin = frame_system::EnsureSignedBy<ConfigurationOrigin, AccountId>;
+	type MaxStatementLength = MaxStatementLength;
+	type UnlockedProportion = UnlockedProportion;
+	type MaxUnlocked = MaxUnlocked;
+}
+
+// This function basically just builds a genesis storage key/value store according to
+// our desired mockup. It also executes our `setup` function which sets up this pallet for use.
+pub fn new_test_ext() -> sp_io::TestExternalities {
+	let t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
+	let mut ext = sp_io::TestExternalities::new(t);
+	ext.execute_with(|| setup());
+	ext
+}
+
+pub fn setup() {
+	let statement = b"Hello, World".to_vec();
+	let unlock_block = 100;
+	Purchase::set_statement(RuntimeOrigin::signed(configuration_origin()), statement).unwrap();
+	Purchase::set_unlock_block(RuntimeOrigin::signed(configuration_origin()), unlock_block)
+		.unwrap();
+	Purchase::set_payment_account(RuntimeOrigin::signed(configuration_origin()), payment_account())
+		.unwrap();
+	Balances::make_free_balance_be(&payment_account(), 100_000);
+}
+
+pub fn alice() -> AccountId {
+	Sr25519Keyring::Alice.to_account_id()
+}
+
+pub fn alice_ed25519() -> AccountId {
+	Ed25519Keyring::Alice.to_account_id()
+}
+
+pub fn bob() -> AccountId {
+	Sr25519Keyring::Bob.to_account_id()
+}
+
+pub fn alice_signature() -> [u8; 64] {
+	// echo -n "Hello, World" | subkey -s sign "bottom drive obey lake curtain smoke basket hold
+	// race lonely fit walk//Alice"
+	hex_literal::hex!("20e0faffdf4dfe939f2faa560f73b1d01cde8472e2b690b7b40606a374244c3a2e9eb9c8107c10b605138374003af8819bd4387d7c24a66ee9253c2e688ab881")
+}
+
+pub fn bob_signature() -> [u8; 64] {
+	// echo -n "Hello, World" | subkey -s sign "bottom drive obey lake curtain smoke basket hold
+	// race lonely fit walk//Bob"
+	hex_literal::hex!("d6d460187ecf530f3ec2d6e3ac91b9d083c8fbd8f1112d92a82e4d84df552d18d338e6da8944eba6e84afaacf8a9850f54e7b53a84530d649be2e0119c7ce889")
+}
+
+pub fn alice_signature_ed25519() -> [u8; 64] {
+	// echo -n "Hello, World" | subkey -e sign "bottom drive obey lake curtain smoke basket hold
+	// race lonely fit walk//Alice"
+	hex_literal::hex!("ee3f5a6cbfc12a8f00c18b811dc921b550ddf272354cda4b9a57b1d06213fcd8509f5af18425d39a279d13622f14806c3e978e2163981f2ec1c06e9628460b0e")
+}
+
+pub fn validity_origin() -> AccountId {
+	ValidityOrigin::get()
+}
+
+pub fn configuration_origin() -> AccountId {
+	ConfigurationOrigin::get()
+}
+
+pub fn payment_account() -> AccountId {
+	[42u8; 32].into()
+}
diff --git a/polkadot/runtime/common/src/purchase/mod.rs b/polkadot/runtime/common/src/purchase/mod.rs
new file mode 100644
index 000000000000..71dc5b579670
--- /dev/null
+++ b/polkadot/runtime/common/src/purchase/mod.rs
@@ -0,0 +1,482 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Pallet to process purchase of DOTs.
+
+use alloc::vec::Vec;
+use codec::{Decode, Encode};
+use frame_support::{
+	pallet_prelude::*,
+	traits::{Currency, EnsureOrigin, ExistenceRequirement, Get, VestingSchedule},
+};
+use frame_system::pallet_prelude::*;
+pub use pallet::*;
+use scale_info::TypeInfo;
+use sp_core::sr25519;
+use sp_runtime::{
+	traits::{CheckedAdd, Saturating, Verify, Zero},
+	AnySignature, DispatchError, DispatchResult, Permill, RuntimeDebug,
+};
+
+type BalanceOf<T> =
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+
+/// The kind of statement an account needs to make for a claim to be valid.
+#[derive(Encode, Decode, Clone, Copy, Eq, PartialEq, RuntimeDebug, TypeInfo)]
+pub enum AccountValidity {
+	/// Account is not valid.
+	Invalid,
+	/// Account has initiated the account creation process.
+	Initiated,
+	/// Account is pending validation.
+	Pending,
+	/// Account is valid with a low contribution amount.
+	ValidLow,
+	/// Account is valid with a high contribution amount.
+	ValidHigh,
+	/// Account has completed the purchase process.
+	Completed,
+}
+
+impl Default for AccountValidity {
+	fn default() -> Self {
+		AccountValidity::Invalid
+	}
+}
+
+impl AccountValidity {
+	fn is_valid(&self) -> bool {
+		match self {
+			Self::Invalid => false,
+			Self::Initiated => false,
+			Self::Pending => false,
+			Self::ValidLow => true,
+			Self::ValidHigh => true,
+			Self::Completed => false,
+		}
+	}
+}
+
+/// All information about an account regarding the purchase of DOTs.
+#[derive(Encode, Decode, Default, Clone, Eq, PartialEq, RuntimeDebug, TypeInfo)]
+pub struct AccountStatus<Balance> {
+	/// The current validity status of the user. Will denote if the user has passed KYC,
+	/// how much they are able to purchase, and when their purchase process has completed.
+	validity: AccountValidity,
+	/// The amount of free DOTs they have purchased.
+	free_balance: Balance,
+	/// The amount of locked DOTs they have purchased.
+	locked_balance: Balance,
+	/// Their sr25519/ed25519 signature verifying they have signed our required statement.
+	signature: Vec<u8>,
+	/// The percentage of VAT the purchaser is responsible for. This is already factored into
+	/// account balance.
+	vat: Permill,
+}
+
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+
+	#[pallet::pallet]
+	#[pallet::without_storage_info]
+	pub struct Pallet<T>(_);
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
+
+		/// Balances Pallet
+		type Currency: Currency<Self::AccountId>;
+
+		/// Vesting Pallet
+		type VestingSchedule: VestingSchedule<
+			Self::AccountId,
+			Moment = BlockNumberFor<Self>,
+			Currency = Self::Currency,
+		>;
+
+		/// The origin allowed to set account status.
+		type ValidityOrigin: EnsureOrigin<Self::RuntimeOrigin>;
+
+		/// The origin allowed to make configurations to the pallet.
+		type ConfigurationOrigin: EnsureOrigin<Self::RuntimeOrigin>;
+
+		/// The maximum statement length for the statement users to sign when creating an account.
+		#[pallet::constant]
+		type MaxStatementLength: Get<u32>;
+
+		/// The amount of purchased locked DOTs that we will unlock for basic actions on the chain.
+		#[pallet::constant]
+		type UnlockedProportion: Get<Permill>;
+
+		/// The maximum amount of locked DOTs that we will unlock.
+		#[pallet::constant]
+		type MaxUnlocked: Get<BalanceOf<Self>>;
+	}
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config> {
+		/// A new account was created.
+		AccountCreated { who: T::AccountId },
+		/// Someone's account validity was updated.
+		ValidityUpdated { who: T::AccountId, validity: AccountValidity },
+		/// Someone's purchase balance was updated.
+		BalanceUpdated { who: T::AccountId, free: BalanceOf<T>, locked: BalanceOf<T> },
+		/// A payout was made to a purchaser.
+		PaymentComplete { who: T::AccountId, free: BalanceOf<T>, locked: BalanceOf<T> },
+		/// A new payment account was set.
+		PaymentAccountSet { who: T::AccountId },
+		/// A new statement was set.
+		StatementUpdated,
+		/// A new statement was set. `[block_number]`
+		UnlockBlockUpdated { block_number: BlockNumberFor<T> },
+	}
+
+	#[pallet::error]
+	pub enum Error<T> {
+		/// Account is not currently valid to use.
+		InvalidAccount,
+		/// Account used in the purchase already exists.
+		ExistingAccount,
+		/// Provided signature is invalid
+		InvalidSignature,
+		/// Account has already completed the purchase process.
+		AlreadyCompleted,
+		/// An overflow occurred when doing calculations.
+		Overflow,
+		/// The statement is too long to be stored on chain.
+		InvalidStatement,
+		/// The unlock block is in the past!
+		InvalidUnlockBlock,
+		/// Vesting schedule already exists for this account.
+		VestingScheduleExists,
+	}
+
+	// A map of all participants in the DOT purchase process.
+	#[pallet::storage]
+	pub(super) type Accounts<T: Config> =
+		StorageMap<_, Blake2_128Concat, T::AccountId, AccountStatus<BalanceOf<T>>, ValueQuery>;
+
+	// The account that will be used to payout participants of the DOT purchase process.
+	#[pallet::storage]
+	pub(super) type PaymentAccount<T: Config> = StorageValue<_, T::AccountId, OptionQuery>;
+
+	// The statement purchasers will need to sign to participate.
+	#[pallet::storage]
+	pub(super) type Statement<T> = StorageValue<_, Vec<u8>, ValueQuery>;
+
+	// The block where all locked dots will unlock.
+	#[pallet::storage]
+	pub(super) type UnlockBlock<T: Config> = StorageValue<_, BlockNumberFor<T>, ValueQuery>;
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		/// Create a new account. Proof of existence through a valid signed message.
+		///
+		/// We check that the account does not exist at this stage.
+		///
+		/// Origin must match the `ValidityOrigin`.
+		#[pallet::call_index(0)]
+		#[pallet::weight(Weight::from_parts(200_000_000, 0) + T::DbWeight::get().reads_writes(4, 1))]
+		pub fn create_account(
+			origin: OriginFor<T>,
+			who: T::AccountId,
+			signature: Vec<u8>,
+		) -> DispatchResult {
+			T::ValidityOrigin::ensure_origin(origin)?;
+			// Account is already being tracked by the pallet.
+			ensure!(!Accounts::<T>::contains_key(&who), Error::<T>::ExistingAccount);
+			// Account should not have a vesting schedule.
+			ensure!(
+				T::VestingSchedule::vesting_balance(&who).is_none(),
+				Error::<T>::VestingScheduleExists
+			);
+
+			// Verify the signature provided is valid for the statement.
+			Self::verify_signature(&who, &signature)?;
+
+			// Create a new pending account.
+			let status = AccountStatus {
+				validity: AccountValidity::Initiated,
+				signature,
+				free_balance: Zero::zero(),
+				locked_balance: Zero::zero(),
+				vat: Permill::zero(),
+			};
+			Accounts::<T>::insert(&who, status);
+			Self::deposit_event(Event::<T>::AccountCreated { who });
+			Ok(())
+		}
+
+		/// Update the validity status of an existing account. If set to completed, the account
+		/// will no longer be able to continue through the crowdfund process.
+		///
+		/// We check that the account exists at this stage, but has not completed the process.
+		///
+		/// Origin must match the `ValidityOrigin`.
+		#[pallet::call_index(1)]
+		#[pallet::weight(T::DbWeight::get().reads_writes(1, 1))]
+		pub fn update_validity_status(
+			origin: OriginFor<T>,
+			who: T::AccountId,
+			validity: AccountValidity,
+		) -> DispatchResult {
+			T::ValidityOrigin::ensure_origin(origin)?;
+			ensure!(Accounts::<T>::contains_key(&who), Error::<T>::InvalidAccount);
+			Accounts::<T>::try_mutate(
+				&who,
+				|status: &mut AccountStatus<BalanceOf<T>>| -> DispatchResult {
+					ensure!(
+						status.validity != AccountValidity::Completed,
+						Error::<T>::AlreadyCompleted
+					);
+					status.validity = validity;
+					Ok(())
+				},
+			)?;
+			Self::deposit_event(Event::<T>::ValidityUpdated { who, validity });
+			Ok(())
+		}
+
+		/// Update the balance of a valid account.
+		///
+		/// We check that the account is valid for a balance transfer at this point.
+		///
+		/// Origin must match the `ValidityOrigin`.
+		#[pallet::call_index(2)]
+		#[pallet::weight(T::DbWeight::get().reads_writes(2, 1))]
+		pub fn update_balance(
+			origin: OriginFor<T>,
+			who: T::AccountId,
+			free_balance: BalanceOf<T>,
+			locked_balance: BalanceOf<T>,
+			vat: Permill,
+		) -> DispatchResult {
+			T::ValidityOrigin::ensure_origin(origin)?;
+
+			Accounts::<T>::try_mutate(
+				&who,
+				|status: &mut AccountStatus<BalanceOf<T>>| -> DispatchResult {
+					// Account has a valid status (not Invalid, Pending, or Completed)...
+					ensure!(status.validity.is_valid(), Error::<T>::InvalidAccount);
+
+					free_balance.checked_add(&locked_balance).ok_or(Error::<T>::Overflow)?;
+					status.free_balance = free_balance;
+					status.locked_balance = locked_balance;
+					status.vat = vat;
+					Ok(())
+				},
+			)?;
+			Self::deposit_event(Event::<T>::BalanceUpdated {
+				who,
+				free: free_balance,
+				locked: locked_balance,
+			});
+			Ok(())
+		}
+
+		/// Pay the user and complete the purchase process.
+		///
+		/// We reverify all assumptions about the state of an account, and complete the process.
+		///
+		/// Origin must match the configured `PaymentAccount` (if it is not configured then this
+		/// will always fail with `BadOrigin`).
+		#[pallet::call_index(3)]
+		#[pallet::weight(T::DbWeight::get().reads_writes(4, 2))]
+		pub fn payout(origin: OriginFor<T>, who: T::AccountId) -> DispatchResult {
+			// Payments must be made directly by the `PaymentAccount`.
+			let payment_account = ensure_signed(origin)?;
+			let test_against = PaymentAccount::<T>::get().ok_or(DispatchError::BadOrigin)?;
+			ensure!(payment_account == test_against, DispatchError::BadOrigin);
+
+			// Account should not have a vesting schedule.
+			ensure!(
+				T::VestingSchedule::vesting_balance(&who).is_none(),
+				Error::<T>::VestingScheduleExists
+			);
+
+			Accounts::<T>::try_mutate(
+				&who,
+				|status: &mut AccountStatus<BalanceOf<T>>| -> DispatchResult {
+					// Account has a valid status (not Invalid, Pending, or Completed)...
+					ensure!(status.validity.is_valid(), Error::<T>::InvalidAccount);
+
+					// Transfer funds from the payment account into the purchasing user.
+					let total_balance = status
+						.free_balance
+						.checked_add(&status.locked_balance)
+						.ok_or(Error::<T>::Overflow)?;
+					T::Currency::transfer(
+						&payment_account,
+						&who,
+						total_balance,
+						ExistenceRequirement::AllowDeath,
+					)?;
+
+					if !status.locked_balance.is_zero() {
+						let unlock_block = UnlockBlock::<T>::get();
+						// We allow some configurable portion of the purchased locked DOTs to be
+						// unlocked for basic usage.
+						let unlocked = (T::UnlockedProportion::get() * status.locked_balance)
+							.min(T::MaxUnlocked::get());
+						let locked = status.locked_balance.saturating_sub(unlocked);
+						// We checked that this account has no existing vesting schedule. So this
+						// function should never fail, however if it does, not much we can do about
+						// it at this point.
+						let _ = T::VestingSchedule::add_vesting_schedule(
+							// Apply vesting schedule to this user
+							&who,
+							// For this much amount
+							locked,
+							// Unlocking the full amount after one block
+							locked,
+							// When everything unlocks
+							unlock_block,
+						);
+					}
+
+					// Setting the user account to `Completed` ends the purchase process for this
+					// user.
+					status.validity = AccountValidity::Completed;
+					Self::deposit_event(Event::<T>::PaymentComplete {
+						who: who.clone(),
+						free: status.free_balance,
+						locked: status.locked_balance,
+					});
+					Ok(())
+				},
+			)?;
+			Ok(())
+		}
+
+		/* Configuration Operations */
+
+		/// Set the account that will be used to payout users in the DOT purchase process.
+		///
+		/// Origin must match the `ConfigurationOrigin`
+		#[pallet::call_index(4)]
+		#[pallet::weight(T::DbWeight::get().writes(1))]
+		pub fn set_payment_account(origin: OriginFor<T>, who: T::AccountId) -> DispatchResult {
+			T::ConfigurationOrigin::ensure_origin(origin)?;
+			// Possibly this is worse than having the caller account be the payment account?
+			PaymentAccount::<T>::put(who.clone());
+			Self::deposit_event(Event::<T>::PaymentAccountSet { who });
+			Ok(())
+		}
+
+		/// Set the statement that must be signed for a user to participate on the DOT sale.
+		///
+		/// Origin must match the `ConfigurationOrigin`
+		#[pallet::call_index(5)]
+		#[pallet::weight(T::DbWeight::get().writes(1))]
+		pub fn set_statement(origin: OriginFor<T>, statement: Vec<u8>) -> DispatchResult {
+			T::ConfigurationOrigin::ensure_origin(origin)?;
+			ensure!(
+				(statement.len() as u32) < T::MaxStatementLength::get(),
+				Error::<T>::InvalidStatement
+			);
+			// Possibly this is worse than having the caller account be the payment account?
+			Statement::<T>::set(statement);
+			Self::deposit_event(Event::<T>::StatementUpdated);
+			Ok(())
+		}
+
+		/// Set the block where locked DOTs will become unlocked.
+		///
+		/// Origin must match the `ConfigurationOrigin`
+		#[pallet::call_index(6)]
+		#[pallet::weight(T::DbWeight::get().writes(1))]
+		pub fn set_unlock_block(
+			origin: OriginFor<T>,
+			unlock_block: BlockNumberFor<T>,
+		) -> DispatchResult {
+			T::ConfigurationOrigin::ensure_origin(origin)?;
+			ensure!(
+				unlock_block > frame_system::Pallet::<T>::block_number(),
+				Error::<T>::InvalidUnlockBlock
+			);
+			// Possibly this is worse than having the caller account be the payment account?
+			UnlockBlock::<T>::set(unlock_block);
+			Self::deposit_event(Event::<T>::UnlockBlockUpdated { block_number: unlock_block });
+			Ok(())
+		}
+	}
+}
+
+impl<T: Config> Pallet<T> {
+	fn verify_signature(who: &T::AccountId, signature: &[u8]) -> Result<(), DispatchError> {
+		// sr25519 always expects a 64 byte signature.
+		let signature: AnySignature = sr25519::Signature::try_from(signature)
+			.map_err(|_| Error::<T>::InvalidSignature)?
+			.into();
+
+		// In Polkadot, the AccountId is always the same as the 32 byte public key.
+		let account_bytes: [u8; 32] = account_to_bytes(who)?;
+		let public_key = sr25519::Public::from_raw(account_bytes);
+
+		let message = Statement::<T>::get();
+
+		// Check if everything is good or not.
+		match signature.verify(message.as_slice(), &public_key) {
+			true => Ok(()),
+			false => Err(Error::<T>::InvalidSignature)?,
+		}
+	}
+}
+
+// This function converts a 32 byte AccountId to its byte-array equivalent form.
+fn account_to_bytes<AccountId>(account: &AccountId) -> Result<[u8; 32], DispatchError>
+where
+	AccountId: Encode,
+{
+	let account_vec = account.encode();
+	ensure!(account_vec.len() == 32, "AccountId must be 32 bytes.");
+	let mut bytes = [0u8; 32];
+	bytes.copy_from_slice(&account_vec);
+	Ok(bytes)
+}
+
+/// WARNING: Executing this function will clear all storage used by this pallet.
+/// Be sure this is what you want...
+pub fn remove_pallet<T>() -> frame_support::weights::Weight
+where
+	T: frame_system::Config,
+{
+	#[allow(deprecated)]
+	use frame_support::migration::remove_storage_prefix;
+	#[allow(deprecated)]
+	remove_storage_prefix(b"Purchase", b"Accounts", b"");
+	#[allow(deprecated)]
+	remove_storage_prefix(b"Purchase", b"PaymentAccount", b"");
+	#[allow(deprecated)]
+	remove_storage_prefix(b"Purchase", b"Statement", b"");
+	#[allow(deprecated)]
+	remove_storage_prefix(b"Purchase", b"UnlockBlock", b"");
+
+	<T as frame_system::Config>::BlockWeights::get().max_block
+}
+
+#[cfg(test)]
+mod mock;
+
+#[cfg(test)]
+mod tests;
diff --git a/polkadot/runtime/common/src/purchase/tests.rs b/polkadot/runtime/common/src/purchase/tests.rs
new file mode 100644
index 000000000000..8cf2a124d245
--- /dev/null
+++ b/polkadot/runtime/common/src/purchase/tests.rs
@@ -0,0 +1,547 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Tests for the purchase pallet.
+
+#[cfg(test)]
+use super::*;
+
+use sp_core::crypto::AccountId32;
+// The testing primitives are very useful for avoiding having to work with signatures
+// or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
+use frame_support::{assert_noop, assert_ok, traits::Currency};
+use sp_runtime::{traits::Dispatchable, ArithmeticError, DispatchError::BadOrigin};
+
+use crate::purchase::mock::*;
+
+#[test]
+fn set_statement_works_and_handles_basic_errors() {
+	new_test_ext().execute_with(|| {
+		let statement = b"Test Set Statement".to_vec();
+		// Invalid origin
+		assert_noop!(
+			Purchase::set_statement(RuntimeOrigin::signed(alice()), statement.clone()),
+			BadOrigin,
+		);
+		// Too Long
+		let long_statement = [0u8; 10_000].to_vec();
+		assert_noop!(
+			Purchase::set_statement(RuntimeOrigin::signed(configuration_origin()), long_statement),
+			Error::<Test>::InvalidStatement,
+		);
+		// Just right...
+		assert_ok!(Purchase::set_statement(
+			RuntimeOrigin::signed(configuration_origin()),
+			statement.clone()
+		));
+		assert_eq!(Statement::<Test>::get(), statement);
+	});
+}
+
+#[test]
+fn set_unlock_block_works_and_handles_basic_errors() {
+	new_test_ext().execute_with(|| {
+		let unlock_block = 69;
+		// Invalid origin
+		assert_noop!(
+			Purchase::set_unlock_block(RuntimeOrigin::signed(alice()), unlock_block),
+			BadOrigin,
+		);
+		// Block Number in Past
+		let bad_unlock_block = 50;
+		System::set_block_number(bad_unlock_block);
+		assert_noop!(
+			Purchase::set_unlock_block(
+				RuntimeOrigin::signed(configuration_origin()),
+				bad_unlock_block
+			),
+			Error::<Test>::InvalidUnlockBlock,
+		);
+		// Just right...
+		assert_ok!(Purchase::set_unlock_block(
+			RuntimeOrigin::signed(configuration_origin()),
+			unlock_block
+		));
+		assert_eq!(UnlockBlock::<Test>::get(), unlock_block);
+	});
+}
+
+#[test]
+fn set_payment_account_works_and_handles_basic_errors() {
+	new_test_ext().execute_with(|| {
+		let payment_account: AccountId32 = [69u8; 32].into();
+		// Invalid Origin
+		assert_noop!(
+			Purchase::set_payment_account(RuntimeOrigin::signed(alice()), payment_account.clone()),
+			BadOrigin,
+		);
+		// Just right...
+		assert_ok!(Purchase::set_payment_account(
+			RuntimeOrigin::signed(configuration_origin()),
+			payment_account.clone()
+		));
+		assert_eq!(PaymentAccount::<Test>::get(), Some(payment_account));
+	});
+}
+
+#[test]
+fn signature_verification_works() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Purchase::verify_signature(&alice(), &alice_signature()));
+		assert_ok!(Purchase::verify_signature(&alice_ed25519(), &alice_signature_ed25519()));
+		assert_ok!(Purchase::verify_signature(&bob(), &bob_signature()));
+
+		// Mixing and matching fails
+		assert_noop!(
+			Purchase::verify_signature(&alice(), &bob_signature()),
+			Error::<Test>::InvalidSignature
+		);
+		assert_noop!(
+			Purchase::verify_signature(&bob(), &alice_signature()),
+			Error::<Test>::InvalidSignature
+		);
+	});
+}
+
+#[test]
+fn account_creation_works() {
+	new_test_ext().execute_with(|| {
+		assert!(!Accounts::<Test>::contains_key(alice()));
+		assert_ok!(Purchase::create_account(
+			RuntimeOrigin::signed(validity_origin()),
+			alice(),
+			alice_signature().to_vec(),
+		));
+		assert_eq!(
+			Accounts::<Test>::get(alice()),
+			AccountStatus {
+				validity: AccountValidity::Initiated,
+				free_balance: Zero::zero(),
+				locked_balance: Zero::zero(),
+				signature: alice_signature().to_vec(),
+				vat: Permill::zero(),
+			}
+		);
+	});
+}
+
+#[test]
+fn account_creation_handles_basic_errors() {
+	new_test_ext().execute_with(|| {
+		// Wrong Origin
+		assert_noop!(
+			Purchase::create_account(
+				RuntimeOrigin::signed(alice()),
+				alice(),
+				alice_signature().to_vec()
+			),
+			BadOrigin,
+		);
+
+		// Wrong Account/Signature
+		assert_noop!(
+			Purchase::create_account(
+				RuntimeOrigin::signed(validity_origin()),
+				alice(),
+				bob_signature().to_vec()
+			),
+			Error::<Test>::InvalidSignature,
+		);
+
+		// Account with vesting
+		Balances::make_free_balance_be(&alice(), 100);
+		assert_ok!(<Test as Config>::VestingSchedule::add_vesting_schedule(&alice(), 100, 1, 50));
+		assert_noop!(
+			Purchase::create_account(
+				RuntimeOrigin::signed(validity_origin()),
+				alice(),
+				alice_signature().to_vec()
+			),
+			Error::<Test>::VestingScheduleExists,
+		);
+
+		// Duplicate Purchasing Account
+		assert_ok!(Purchase::create_account(
+			RuntimeOrigin::signed(validity_origin()),
+			bob(),
+			bob_signature().to_vec()
+		));
+		assert_noop!(
+			Purchase::create_account(
+				RuntimeOrigin::signed(validity_origin()),
+				bob(),
+				bob_signature().to_vec()
+			),
+			Error::<Test>::ExistingAccount,
+		);
+	});
+}
+
+#[test]
+fn update_validity_status_works() {
+	new_test_ext().execute_with(|| {
+		// Alice account is created.
+		assert_ok!(Purchase::create_account(
+			RuntimeOrigin::signed(validity_origin()),
+			alice(),
+			alice_signature().to_vec(),
+		));
+		// She submits KYC, and we update the status to `Pending`.
+		assert_ok!(Purchase::update_validity_status(
+			RuntimeOrigin::signed(validity_origin()),
+			alice(),
+			AccountValidity::Pending,
+		));
+		// KYC comes back negative, so we mark the account invalid.
+		assert_ok!(Purchase::update_validity_status(
+			RuntimeOrigin::signed(validity_origin()),
+			alice(),
+			AccountValidity::Invalid,
+		));
+		assert_eq!(
+			Accounts::<Test>::get(alice()),
+			AccountStatus {
+				validity: AccountValidity::Invalid,
+				free_balance: Zero::zero(),
+				locked_balance: Zero::zero(),
+				signature: alice_signature().to_vec(),
+				vat: Permill::zero(),
+			}
+		);
+		// She fixes it, we mark her account valid.
+		assert_ok!(Purchase::update_validity_status(
+			RuntimeOrigin::signed(validity_origin()),
+			alice(),
+			AccountValidity::ValidLow,
+		));
+		assert_eq!(
+			Accounts::<Test>::get(alice()),
+			AccountStatus {
+				validity: AccountValidity::ValidLow,
+				free_balance: Zero::zero(),
+				locked_balance: Zero::zero(),
+				signature: alice_signature().to_vec(),
+				vat: Permill::zero(),
+			}
+		);
+	});
+}
+
+#[test]
+fn update_validity_status_handles_basic_errors() {
+	new_test_ext().execute_with(|| {
+		// Wrong Origin
+		assert_noop!(
+			Purchase::update_validity_status(
+				RuntimeOrigin::signed(alice()),
+				alice(),
+				AccountValidity::Pending,
+			),
+			BadOrigin
+		);
+		// Inactive Account
+		assert_noop!(
+			Purchase::update_validity_status(
+				RuntimeOrigin::signed(validity_origin()),
+				alice(),
+				AccountValidity::Pending,
+			),
+			Error::<Test>::InvalidAccount
+		);
+		// Already Completed
+		assert_ok!(Purchase::create_account(
+			RuntimeOrigin::signed(validity_origin()),
+			alice(),
+			alice_signature().to_vec(),
+		));
+		assert_ok!(Purchase::update_validity_status(
+			RuntimeOrigin::signed(validity_origin()),
+			alice(),
+			AccountValidity::Completed,
+		));
+		assert_noop!(
+			Purchase::update_validity_status(
+				RuntimeOrigin::signed(validity_origin()),
+				alice(),
+				AccountValidity::Pending,
+			),
+			Error::<Test>::AlreadyCompleted
+		);
+	});
+}
+
+#[test]
+fn update_balance_works() {
+	new_test_ext().execute_with(|| {
+		// Alice account is created
+		assert_ok!(Purchase::create_account(
+			RuntimeOrigin::signed(validity_origin()),
+			alice(),
+			alice_signature().to_vec()
+		));
+		// And approved for basic contribution
+		assert_ok!(Purchase::update_validity_status(
+			RuntimeOrigin::signed(validity_origin()),
+			alice(),
+			AccountValidity::ValidLow,
+		));
+		// We set a balance on the user based on the payment they made. 50 locked, 50 free.
+		assert_ok!(Purchase::update_balance(
+			RuntimeOrigin::signed(validity_origin()),
+			alice(),
+			50,
+			50,
+			Permill::from_rational(77u32, 1000u32),
+		));
+		assert_eq!(
+			Accounts::<Test>::get(alice()),
+			AccountStatus {
+				validity: AccountValidity::ValidLow,
+				free_balance: 50,
+				locked_balance: 50,
+				signature: alice_signature().to_vec(),
+				vat: Permill::from_parts(77000),
+			}
+		);
+		// We can update the balance based on new information.
+		assert_ok!(Purchase::update_balance(
+			RuntimeOrigin::signed(validity_origin()),
+			alice(),
+			25,
+			50,
+			Permill::zero(),
+		));
+		assert_eq!(
+			Accounts::<Test>::get(alice()),
+			AccountStatus {
+				validity: AccountValidity::ValidLow,
+				free_balance: 25,
+				locked_balance: 50,
+				signature: alice_signature().to_vec(),
+				vat: Permill::zero(),
+			}
+		);
+	});
+}
+
+#[test]
+fn update_balance_handles_basic_errors() {
+	new_test_ext().execute_with(|| {
+		// Wrong Origin
+		assert_noop!(
+			Purchase::update_balance(
+				RuntimeOrigin::signed(alice()),
+				alice(),
+				50,
+				50,
+				Permill::zero(),
+			),
+			BadOrigin
+		);
+		// Inactive Account
+		assert_noop!(
+			Purchase::update_balance(
+				RuntimeOrigin::signed(validity_origin()),
+				alice(),
+				50,
+				50,
+				Permill::zero(),
+			),
+			Error::<Test>::InvalidAccount
+		);
+		// Overflow
+		assert_noop!(
+			Purchase::update_balance(
+				RuntimeOrigin::signed(validity_origin()),
+				alice(),
+				u64::MAX,
+				u64::MAX,
+				Permill::zero(),
+			),
+			Error::<Test>::InvalidAccount
+		);
+	});
+}
+
+#[test]
+fn payout_works() {
+	new_test_ext().execute_with(|| {
+		// Alice and Bob accounts are created
+		assert_ok!(Purchase::create_account(
+			RuntimeOrigin::signed(validity_origin()),
+			alice(),
+			alice_signature().to_vec()
+		));
+		assert_ok!(Purchase::create_account(
+			RuntimeOrigin::signed(validity_origin()),
+			bob(),
+			bob_signature().to_vec()
+		));
+		// Alice is approved for basic contribution
+		assert_ok!(Purchase::update_validity_status(
+			RuntimeOrigin::signed(validity_origin()),
+			alice(),
+			AccountValidity::ValidLow,
+		));
+		// Bob is approved for high contribution
+		assert_ok!(Purchase::update_validity_status(
+			RuntimeOrigin::signed(validity_origin()),
+			bob(),
+			AccountValidity::ValidHigh,
+		));
+		// We set a balance on the users based on the payment they made. 50 locked, 50 free.
+		assert_ok!(Purchase::update_balance(
+			RuntimeOrigin::signed(validity_origin()),
+			alice(),
+			50,
+			50,
+			Permill::zero(),
+		));
+		assert_ok!(Purchase::update_balance(
+			RuntimeOrigin::signed(validity_origin()),
+			bob(),
+			100,
+			150,
+			Permill::zero(),
+		));
+		// Now we call payout for Alice and Bob.
+		assert_ok!(Purchase::payout(RuntimeOrigin::signed(payment_account()), alice(),));
+		assert_ok!(Purchase::payout(RuntimeOrigin::signed(payment_account()), bob(),));
+		// Payment is made.
+		assert_eq!(<Test as Config>::Currency::free_balance(&payment_account()), 99_650);
+		assert_eq!(<Test as Config>::Currency::free_balance(&alice()), 100);
+		// 10% of the 50 units is unlocked automatically for Alice
+		assert_eq!(<Test as Config>::VestingSchedule::vesting_balance(&alice()), Some(45));
+		assert_eq!(<Test as Config>::Currency::free_balance(&bob()), 250);
+		// A max of 10 units is unlocked automatically for Bob
+		assert_eq!(<Test as Config>::VestingSchedule::vesting_balance(&bob()), Some(140));
+		// Status is completed.
+		assert_eq!(
+			Accounts::<Test>::get(alice()),
+			AccountStatus {
+				validity: AccountValidity::Completed,
+				free_balance: 50,
+				locked_balance: 50,
+				signature: alice_signature().to_vec(),
+				vat: Permill::zero(),
+			}
+		);
+		assert_eq!(
+			Accounts::<Test>::get(bob()),
+			AccountStatus {
+				validity: AccountValidity::Completed,
+				free_balance: 100,
+				locked_balance: 150,
+				signature: bob_signature().to_vec(),
+				vat: Permill::zero(),
+			}
+		);
+		// Vesting lock is removed in whole on block 101 (100 blocks after block 1)
+		System::set_block_number(100);
+		let vest_call = RuntimeCall::Vesting(pallet_vesting::Call::<Test>::vest {});
+		assert_ok!(vest_call.clone().dispatch(RuntimeOrigin::signed(alice())));
+		assert_ok!(vest_call.clone().dispatch(RuntimeOrigin::signed(bob())));
+		assert_eq!(<Test as Config>::VestingSchedule::vesting_balance(&alice()), Some(45));
+		assert_eq!(<Test as Config>::VestingSchedule::vesting_balance(&bob()), Some(140));
+		System::set_block_number(101);
+		assert_ok!(vest_call.clone().dispatch(RuntimeOrigin::signed(alice())));
+		assert_ok!(vest_call.clone().dispatch(RuntimeOrigin::signed(bob())));
+		assert_eq!(<Test as Config>::VestingSchedule::vesting_balance(&alice()), None);
+		assert_eq!(<Test as Config>::VestingSchedule::vesting_balance(&bob()), None);
+	});
+}
+
+#[test]
+fn payout_handles_basic_errors() {
+	new_test_ext().execute_with(|| {
+		// Wrong Origin
+		assert_noop!(Purchase::payout(RuntimeOrigin::signed(alice()), alice(),), BadOrigin);
+		// Account with Existing Vesting Schedule
+		Balances::make_free_balance_be(&bob(), 100);
+		assert_ok!(<Test as Config>::VestingSchedule::add_vesting_schedule(&bob(), 100, 1, 50,));
+		assert_noop!(
+			Purchase::payout(RuntimeOrigin::signed(payment_account()), bob(),),
+			Error::<Test>::VestingScheduleExists
+		);
+		// Invalid Account (never created)
+		assert_noop!(
+			Purchase::payout(RuntimeOrigin::signed(payment_account()), alice(),),
+			Error::<Test>::InvalidAccount
+		);
+		// Invalid Account (created, but not valid)
+		assert_ok!(Purchase::create_account(
+			RuntimeOrigin::signed(validity_origin()),
+			alice(),
+			alice_signature().to_vec()
+		));
+		assert_noop!(
+			Purchase::payout(RuntimeOrigin::signed(payment_account()), alice(),),
+			Error::<Test>::InvalidAccount
+		);
+		// Not enough funds in payment account
+		assert_ok!(Purchase::update_validity_status(
+			RuntimeOrigin::signed(validity_origin()),
+			alice(),
+			AccountValidity::ValidHigh,
+		));
+		assert_ok!(Purchase::update_balance(
+			RuntimeOrigin::signed(validity_origin()),
+			alice(),
+			100_000,
+			100_000,
+			Permill::zero(),
+		));
+		assert_noop!(
+			Purchase::payout(RuntimeOrigin::signed(payment_account()), alice()),
+			ArithmeticError::Underflow
+		);
+	});
+}
+
+#[test]
+fn remove_pallet_works() {
+	new_test_ext().execute_with(|| {
+		let account_status = AccountStatus {
+			validity: AccountValidity::Completed,
+			free_balance: 1234,
+			locked_balance: 4321,
+			signature: b"my signature".to_vec(),
+			vat: Permill::from_percent(50),
+		};
+
+		// Add some storage.
+		Accounts::<Test>::insert(alice(), account_status.clone());
+		Accounts::<Test>::insert(bob(), account_status);
+		PaymentAccount::<Test>::put(alice());
+		Statement::<Test>::put(b"hello, world!".to_vec());
+		UnlockBlock::<Test>::put(4);
+
+		// Verify storage exists.
+		assert_eq!(Accounts::<Test>::iter().count(), 2);
+		assert!(PaymentAccount::<Test>::exists());
+		assert!(Statement::<Test>::exists());
+		assert!(UnlockBlock::<Test>::exists());
+
+		// Remove storage.
+		remove_pallet::<Test>();
+
+		// Verify storage is gone.
+		assert_eq!(Accounts::<Test>::iter().count(), 0);
+		assert!(!PaymentAccount::<Test>::exists());
+		assert!(!Statement::<Test>::exists());
+		assert!(!UnlockBlock::<Test>::exists());
+	});
+}
diff --git a/polkadot/runtime/metrics/Cargo.toml b/polkadot/runtime/metrics/Cargo.toml
index 0415e4754009..beb7e3236d5a 100644
--- a/polkadot/runtime/metrics/Cargo.toml
+++ b/polkadot/runtime/metrics/Cargo.toml
@@ -12,10 +12,10 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-sp-tracing = { workspace = true }
 codec = { workspace = true }
-polkadot-primitives = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
+polkadot-primitives = { workspace = true }
+sp-tracing = { workspace = true }
 
 bs58 = { features = ["alloc"], workspace = true }
 
diff --git a/polkadot/runtime/parachains/Cargo.toml b/polkadot/runtime/parachains/Cargo.toml
index b583e9c6cc50..7c00995d2291 100644
--- a/polkadot/runtime/parachains/Cargo.toml
+++ b/polkadot/runtime/parachains/Cargo.toml
@@ -12,32 +12,35 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-impl-trait-for-tuples = { workspace = true }
+bitflags = { workspace = true }
 bitvec = { features = ["alloc"], workspace = true }
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
+derive_more = { workspace = true, default-features = true }
+impl-trait-for-tuples = { workspace = true }
 log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { features = ["alloc", "derive"], workspace = true }
-derive_more = { workspace = true, default-features = true }
-bitflags = { workspace = true }
 
 sp-api = { workspace = true }
+sp-application-crypto = { optional = true, workspace = true }
+sp-arithmetic = { workspace = true }
+sp-core = { features = ["serde"], workspace = true }
 sp-inherents = { workspace = true }
 sp-io = { workspace = true }
+sp-keystore = { optional = true, workspace = true }
 sp-runtime = { features = ["serde"], workspace = true }
 sp-session = { workspace = true }
 sp-staking = { features = ["serde"], workspace = true }
-sp-core = { features = ["serde"], workspace = true }
-sp-keystore = { optional = true, workspace = true }
-sp-application-crypto = { optional = true, workspace = true }
-sp-tracing = { optional = true, workspace = true }
-sp-arithmetic = { workspace = true }
 sp-std = { workspace = true, optional = true }
+sp-tracing = { optional = true, workspace = true }
 
+frame-benchmarking = { optional = true, workspace = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
 pallet-authority-discovery = { workspace = true }
 pallet-authorship = { workspace = true }
-pallet-balances = { workspace = true }
 pallet-babe = { workspace = true }
+pallet-balances = { workspace = true }
 pallet-broker = { workspace = true }
 pallet-message-queue = { workspace = true }
 pallet-mmr = { workspace = true, optional = true }
@@ -45,36 +48,33 @@ pallet-session = { workspace = true }
 pallet-staking = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-vesting = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
-frame-support = { workspace = true }
-frame-system = { workspace = true }
 
+polkadot-primitives = { workspace = true }
 xcm = { workspace = true }
 xcm-executor = { workspace = true }
-polkadot-primitives = { workspace = true }
 
+polkadot-core-primitives = { workspace = true }
+polkadot-parachain-primitives = { workspace = true }
+polkadot-runtime-metrics = { workspace = true }
 rand = { workspace = true }
 rand_chacha = { workspace = true }
 static_assertions = { optional = true, workspace = true, default-features = true }
-polkadot-parachain-primitives = { workspace = true }
-polkadot-runtime-metrics = { workspace = true }
-polkadot-core-primitives = { workspace = true }
 
 [dev-dependencies]
 polkadot-primitives = { workspace = true, features = ["test"] }
 
+assert_matches = { workspace = true }
+frame-support-test = { workspace = true }
 futures = { workspace = true }
 hex-literal = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-frame-support-test = { workspace = true }
-sc-keystore = { workspace = true, default-features = true }
 polkadot-primitives-test-helpers = { workspace = true }
-sp-tracing = { workspace = true, default-features = true }
-sp-crypto-hashing = { workspace = true, default-features = true }
-thousands = { workspace = true }
-assert_matches = { workspace = true }
 rstest = { workspace = true }
+sc-keystore = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
+sp-crypto-hashing = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
+thousands = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/runtime/parachains/src/disputes/benchmarking.rs b/polkadot/runtime/parachains/src/disputes/benchmarking.rs
index 05f4b3f1ac81..571c44d1ac24 100644
--- a/polkadot/runtime/parachains/src/disputes/benchmarking.rs
+++ b/polkadot/runtime/parachains/src/disputes/benchmarking.rs
@@ -16,15 +16,21 @@
 
 use super::*;
 
-use frame_benchmarking::benchmarks;
+use frame_benchmarking::v2::*;
 use frame_system::RawOrigin;
 use sp_runtime::traits::One;
 
-benchmarks! {
-	force_unfreeze {
+#[benchmarks]
+mod benchmarks {
+	use super::*;
+
+	#[benchmark]
+	fn force_unfreeze() {
 		Frozen::<T>::set(Some(One::one()));
-	}: _(RawOrigin::Root)
-	verify {
+
+		#[extrinsic_call]
+		_(RawOrigin::Root);
+
 		assert!(Frozen::<T>::get().is_none())
 	}
 
diff --git a/polkadot/runtime/parachains/src/disputes/slashing.rs b/polkadot/runtime/parachains/src/disputes/slashing.rs
index 2e09ea667f74..95dbf2ba42bb 100644
--- a/polkadot/runtime/parachains/src/disputes/slashing.rs
+++ b/polkadot/runtime/parachains/src/disputes/slashing.rs
@@ -355,12 +355,12 @@ impl<T: Config> HandleReports<T> for () {
 }
 
 pub trait WeightInfo {
-	fn report_dispute_lost(validator_count: ValidatorSetCount) -> Weight;
+	fn report_dispute_lost_unsigned(validator_count: ValidatorSetCount) -> Weight;
 }
 
 pub struct TestWeightInfo;
 impl WeightInfo for TestWeightInfo {
-	fn report_dispute_lost(_validator_count: ValidatorSetCount) -> Weight {
+	fn report_dispute_lost_unsigned(_validator_count: ValidatorSetCount) -> Weight {
 		Weight::zero()
 	}
 }
@@ -445,7 +445,7 @@ pub mod pallet {
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		#[pallet::call_index(0)]
-		#[pallet::weight(<T as Config>::WeightInfo::report_dispute_lost(
+		#[pallet::weight(<T as Config>::WeightInfo::report_dispute_lost_unsigned(
 			key_owner_proof.validator_count()
 		))]
 		pub fn report_dispute_lost_unsigned(
diff --git a/polkadot/runtime/parachains/src/disputes/slashing/benchmarking.rs b/polkadot/runtime/parachains/src/disputes/slashing/benchmarking.rs
index b53f98caeea3..bfd46d752438 100644
--- a/polkadot/runtime/parachains/src/disputes/slashing/benchmarking.rs
+++ b/polkadot/runtime/parachains/src/disputes/slashing/benchmarking.rs
@@ -18,7 +18,7 @@ use super::*;
 
 use crate::{disputes::SlashingHandler, initializer, shared};
 use codec::Decode;
-use frame_benchmarking::{benchmarks, whitelist_account};
+use frame_benchmarking::v2::*;
 use frame_support::traits::{OnFinalize, OnInitialize};
 use frame_system::{pallet_prelude::BlockNumberFor, RawOrigin};
 use pallet_staking::testing_utils::create_validators;
@@ -29,6 +29,11 @@ use sp_session::MembershipProof;
 // Candidate hash of the disputed candidate.
 const CANDIDATE_HASH: CandidateHash = CandidateHash(Hash::zero());
 
+// Simplify getting the value in the benchmark
+pub const fn max_validators_for<T: super::Config>() -> u32 {
+	<<T>::BenchmarkingConfig as BenchmarkingConfiguration>::MAX_VALIDATORS
+}
+
 pub trait Config:
 	pallet_session::Config
 	+ pallet_session::historical::Config
@@ -106,6 +111,7 @@ where
 	(session_index, key_owner_proof, validator_id)
 }
 
+/// Submits a single `ForInvalid` dispute.
 fn setup_dispute<T>(session_index: SessionIndex, validator_id: ValidatorId) -> DisputeProof
 where
 	T: Config,
@@ -125,6 +131,7 @@ where
 	dispute_proof(session_index, validator_id, validator_index)
 }
 
+/// Creates a `ForInvalid` dispute proof.
 fn dispute_proof(
 	session_index: SessionIndex,
 	validator_id: ValidatorId,
@@ -136,27 +143,20 @@ fn dispute_proof(
 	DisputeProof { time_slot, kind, validator_index, validator_id }
 }
 
-benchmarks! {
-	where_clause {
-		where T: Config<KeyOwnerProof = MembershipProof>,
-	}
-
-	// in this setup we have a single `ForInvalid` dispute
-	// submitted for a past session
-	report_dispute_lost {
-		let n in 4..<<T as super::Config>::BenchmarkingConfig as BenchmarkingConfiguration>::MAX_VALIDATORS;
+#[benchmarks(where T: Config<KeyOwnerProof = MembershipProof>)]
+mod benchmarks {
+	use super::*;
 
-		let origin = RawOrigin::None.into();
+	#[benchmark]
+	fn report_dispute_lost_unsigned(n: Linear<4, { max_validators_for::<T>() }>) {
 		let (session_index, key_owner_proof, validator_id) = setup_validator_set::<T>(n);
+
+		// submit a single `ForInvalid` dispute for a past session.
 		let dispute_proof = setup_dispute::<T>(session_index, validator_id);
-	}: {
-		let result = Pallet::<T>::report_dispute_lost_unsigned(
-			origin,
-			Box::new(dispute_proof),
-			key_owner_proof,
-		);
-		assert!(result.is_ok());
-	} verify {
+
+		#[extrinsic_call]
+		_(RawOrigin::None, Box::new(dispute_proof), key_owner_proof);
+
 		let unapplied = <UnappliedSlashes<T>>::get(session_index, CANDIDATE_HASH);
 		assert!(unapplied.is_none());
 	}
diff --git a/polkadot/runtime/rococo/Cargo.toml b/polkadot/runtime/rococo/Cargo.toml
index 1fd32c5d0c32..e7f463566e3a 100644
--- a/polkadot/runtime/rococo/Cargo.toml
+++ b/polkadot/runtime/rococo/Cargo.toml
@@ -13,39 +13,44 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+bitvec = { features = ["alloc"], workspace = true }
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 serde = { workspace = true }
 serde_derive = { optional = true, workspace = true }
 serde_json = { features = ["alloc"], workspace = true }
-static_assertions = { workspace = true, default-features = true }
 smallvec = { workspace = true, default-features = true }
-bitvec = { features = ["alloc"], workspace = true }
+static_assertions = { workspace = true, default-features = true }
 
+binary-merkle-tree = { workspace = true }
+rococo-runtime-constants = { workspace = true }
+sp-api = { workspace = true }
+sp-arithmetic = { workspace = true }
 sp-authority-discovery = { workspace = true }
+sp-block-builder = { workspace = true }
 sp-consensus-babe = { workspace = true }
 sp-consensus-beefy = { workspace = true }
 sp-consensus-grandpa = { workspace = true }
-binary-merkle-tree = { workspace = true }
-rococo-runtime-constants = { workspace = true }
-sp-api = { workspace = true }
+sp-core = { workspace = true }
 sp-genesis-builder = { workspace = true }
 sp-inherents = { workspace = true }
-sp-offchain = { workspace = true }
-sp-arithmetic = { workspace = true }
 sp-io = { workspace = true }
+sp-keyring = { workspace = true }
 sp-mmr-primitives = { workspace = true }
+sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
-sp-staking = { workspace = true }
-sp-core = { workspace = true }
 sp-session = { workspace = true }
+sp-staking = { workspace = true }
 sp-storage = { workspace = true }
-sp-version = { workspace = true }
 sp-transaction-pool = { workspace = true }
-sp-block-builder = { workspace = true }
-sp-keyring = { workspace = true }
+sp-version = { workspace = true }
 
+frame-executive = { workspace = true }
+frame-support = { features = ["tuples-96"], workspace = true }
+frame-system = { workspace = true }
+frame-system-rpc-runtime-api = { workspace = true }
+pallet-asset-rate = { workspace = true }
 pallet-authority-discovery = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-babe = { workspace = true }
@@ -54,15 +59,10 @@ pallet-beefy = { workspace = true }
 pallet-beefy-mmr = { workspace = true }
 pallet-bounties = { workspace = true }
 pallet-child-bounties = { workspace = true }
-pallet-state-trie-migration = { workspace = true }
-pallet-transaction-payment = { workspace = true }
-pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-collective = { workspace = true }
 pallet-conviction-voting = { workspace = true }
 pallet-democracy = { workspace = true }
 pallet-elections-phragmen = { workspace = true }
-pallet-asset-rate = { workspace = true }
-frame-executive = { workspace = true }
 pallet-grandpa = { workspace = true }
 pallet-identity = { workspace = true }
 pallet-indices = { workspace = true }
@@ -79,48 +79,48 @@ pallet-proxy = { workspace = true }
 pallet-ranked-collective = { workspace = true }
 pallet-recovery = { workspace = true }
 pallet-referenda = { workspace = true }
+pallet-root-testing = { workspace = true }
 pallet-scheduler = { workspace = true }
 pallet-session = { workspace = true }
 pallet-society = { workspace = true }
-pallet-sudo = { workspace = true }
-frame-support = { features = ["tuples-96"], workspace = true }
 pallet-staking = { workspace = true }
-frame-system = { workspace = true }
-frame-system-rpc-runtime-api = { workspace = true }
+pallet-state-trie-migration = { workspace = true }
+pallet-sudo = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-tips = { workspace = true }
+pallet-transaction-payment = { workspace = true }
+pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-treasury = { workspace = true }
 pallet-utility = { workspace = true }
 pallet-vesting = { workspace = true }
 pallet-whitelist = { workspace = true }
 pallet-xcm = { workspace = true }
 pallet-xcm-benchmarks = { optional = true, workspace = true }
-pallet-root-testing = { workspace = true }
 
 frame-benchmarking = { optional = true, workspace = true }
 frame-metadata-hash-extension = { workspace = true }
-frame-try-runtime = { optional = true, workspace = true }
 frame-system-benchmarking = { optional = true, workspace = true }
+frame-try-runtime = { optional = true, workspace = true }
 hex-literal = { workspace = true, default-features = true }
 
+polkadot-parachain-primitives = { workspace = true }
+polkadot-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
 polkadot-runtime-parachains = { workspace = true }
-polkadot-primitives = { workspace = true }
-polkadot-parachain-primitives = { workspace = true }
 
 xcm = { workspace = true }
-xcm-executor = { workspace = true }
 xcm-builder = { workspace = true }
+xcm-executor = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 [dev-dependencies]
-tiny-keccak = { features = ["keccak"], workspace = true }
-sp-keyring = { workspace = true, default-features = true }
 remote-externalities = { workspace = true, default-features = true }
-sp-trie = { workspace = true, default-features = true }
 separator = { workspace = true }
 serde_json = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 sp-tracing = { workspace = true }
+sp-trie = { workspace = true, default-features = true }
+tiny-keccak = { features = ["keccak"], workspace = true }
 tokio = { features = ["macros"], workspace = true, default-features = true }
 
 [build-dependencies]
diff --git a/polkadot/runtime/rococo/constants/Cargo.toml b/polkadot/runtime/rococo/constants/Cargo.toml
index 921bc8f5fe92..cc62d230d2c0 100644
--- a/polkadot/runtime/rococo/constants/Cargo.toml
+++ b/polkadot/runtime/rococo/constants/Cargo.toml
@@ -20,9 +20,9 @@ smallvec = { workspace = true, default-features = true }
 frame-support = { workspace = true }
 polkadot-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
+sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 sp-weights = { workspace = true }
-sp-core = { workspace = true }
 
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
diff --git a/polkadot/runtime/rococo/src/genesis_config_presets.rs b/polkadot/runtime/rococo/src/genesis_config_presets.rs
index bdbf6f37d92c..a96a509b0e4d 100644
--- a/polkadot/runtime/rococo/src/genesis_config_presets.rs
+++ b/polkadot/runtime/rococo/src/genesis_config_presets.rs
@@ -129,7 +129,9 @@ fn default_parachains_host_configuration(
 			allowed_ancestry_len: 2,
 		},
 		node_features: bitvec::vec::BitVec::from_element(
-			1u8 << (FeatureIndex::ElasticScalingMVP as usize),
+			1u8 << (FeatureIndex::ElasticScalingMVP as usize) |
+				1u8 << (FeatureIndex::EnableAssignmentsV2 as usize) |
+				1u8 << (FeatureIndex::CandidateReceiptV2 as usize),
 		),
 		scheduler_params: SchedulerParams {
 			lookahead: 2,
diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs
index 3304f89fc0cc..4034f8bc1431 100644
--- a/polkadot/runtime/rococo/src/lib.rs
+++ b/polkadot/runtime/rococo/src/lib.rs
@@ -20,6 +20,17 @@
 // `construct_runtime!` does a lot of recursion and requires us to increase the limit.
 #![recursion_limit = "512"]
 
+#[cfg(all(any(target_arch = "riscv32", target_arch = "riscv64"), target_feature = "e"))]
+// Allocate 2 MiB stack.
+//
+// TODO: A workaround. Invoke polkavm_derive::min_stack_size!() instead
+// later on.
+::core::arch::global_asm!(
+	".pushsection .polkavm_min_stack_size,\"R\",@note\n",
+	".4byte 2097152",
+	".popsection\n",
+);
+
 extern crate alloc;
 
 use alloc::{
@@ -171,7 +182,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: alloc::borrow::Cow::Borrowed("rococo"),
 	impl_name: alloc::borrow::Cow::Borrowed("parity-rococo-v2.0"),
 	authoring_version: 0,
-	spec_version: 1_016_001,
+	spec_version: 1_017_001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 26,
@@ -781,6 +792,7 @@ impl pallet_recovery::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = ();
 	type RuntimeCall = RuntimeCall;
+	type BlockNumberProvider = System;
 	type Currency = Balances;
 	type ConfigDepositBase = ConfigDepositBase;
 	type FriendDepositFactor = FriendDepositFactor;
diff --git a/polkadot/runtime/rococo/src/weights/pallet_xcm.rs b/polkadot/runtime/rococo/src/weights/pallet_xcm.rs
index d5cf33515e6b..b60165934f92 100644
--- a/polkadot/runtime/rococo/src/weights/pallet_xcm.rs
+++ b/polkadot/runtime/rococo/src/weights/pallet_xcm.rs
@@ -17,27 +17,27 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-02-29, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-12-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-bn-ce5rx-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `65a7f4d3191f`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot
+// target/production/polkadot
 // benchmark
 // pallet
+// --extrinsic=*
 // --chain=rococo-dev
+// --pallet=pallet_xcm
+// --header=/__w/polkadot-sdk/polkadot-sdk/polkadot/file_header.txt
+// --output=./polkadot/runtime/rococo/src/weights
+// --wasm-execution=compiled
 // --steps=50
 // --repeat=20
+// --heap-pages=4096
 // --no-storage-info
-// --no-median-slopes
 // --no-min-squares
-// --pallet=pallet_xcm
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./polkadot/file_header.txt
-// --output=./polkadot/runtime/rococo/src/weights/
+// --no-median-slopes
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -56,38 +56,46 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Paras::Heads` (r:1 w:0)
+	/// Proof: `Paras::Heads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn send() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `180`
-		//  Estimated: `3645`
-		// Minimum execution time: 25_521_000 picoseconds.
-		Weight::from_parts(25_922_000, 0)
-			.saturating_add(Weight::from_parts(0, 3645))
-			.saturating_add(T::DbWeight::get().reads(4))
+		//  Measured:  `245`
+		//  Estimated: `3710`
+		// Minimum execution time: 37_787_000 picoseconds.
+		Weight::from_parts(39_345_000, 0)
+			.saturating_add(Weight::from_parts(0, 3710))
+			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `XcmPallet::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `XcmPallet::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Paras::Heads` (r:1 w:0)
+	/// Proof: `Paras::Heads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn teleport_assets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `180`
-		//  Estimated: `3645`
-		// Minimum execution time: 112_185_000 picoseconds.
-		Weight::from_parts(115_991_000, 0)
-			.saturating_add(Weight::from_parts(0, 3645))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Measured:  `245`
+		//  Estimated: `3710`
+		// Minimum execution time: 138_755_000 picoseconds.
+		Weight::from_parts(142_908_000, 0)
+			.saturating_add(Weight::from_parts(0, 3710))
+			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
+	/// Storage: `XcmPallet::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `XcmPallet::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
@@ -96,45 +104,54 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Paras::Heads` (r:1 w:0)
+	/// Proof: `Paras::Heads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn reserve_transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `232`
-		//  Estimated: `3697`
-		// Minimum execution time: 108_693_000 picoseconds.
-		Weight::from_parts(111_853_000, 0)
-			.saturating_add(Weight::from_parts(0, 3697))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Measured:  `297`
+		//  Estimated: `3762`
+		// Minimum execution time: 134_917_000 picoseconds.
+		Weight::from_parts(138_809_000, 0)
+			.saturating_add(Weight::from_parts(0, 3762))
+			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `XcmPallet::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `XcmPallet::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Paras::Heads` (r:1 w:0)
+	/// Proof: `Paras::Heads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `180`
-		//  Estimated: `3645`
-		// Minimum execution time: 113_040_000 picoseconds.
-		Weight::from_parts(115_635_000, 0)
-			.saturating_add(Weight::from_parts(0, 3645))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Measured:  `245`
+		//  Estimated: `3710`
+		// Minimum execution time: 141_303_000 picoseconds.
+		Weight::from_parts(144_640_000, 0)
+			.saturating_add(Weight::from_parts(0, 3710))
+			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
+	/// Storage: `XcmPallet::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `XcmPallet::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn execute() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_979_000 picoseconds.
-		Weight::from_parts(7_342_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
+		//  Estimated: `1485`
+		// Minimum execution time: 9_872_000 picoseconds.
+		Weight::from_parts(10_402_000, 0)
+			.saturating_add(Weight::from_parts(0, 1485))
+			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	/// Storage: `XcmPallet::SupportedVersion` (r:0 w:1)
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -142,8 +159,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_144_000 picoseconds.
-		Weight::from_parts(7_297_000, 0)
+		// Minimum execution time: 8_312_000 picoseconds.
+		Weight::from_parts(8_867_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -151,8 +168,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_886_000 picoseconds.
-		Weight::from_parts(1_995_000, 0)
+		// Minimum execution time: 2_524_000 picoseconds.
+		Weight::from_parts(2_800_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	/// Storage: `XcmPallet::VersionNotifiers` (r:1 w:1)
@@ -165,18 +182,20 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Paras::Heads` (r:1 w:0)
+	/// Proof: `Paras::Heads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmPallet::Queries` (r:0 w:1)
 	/// Proof: `XcmPallet::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_subscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `180`
-		//  Estimated: `3645`
-		// Minimum execution time: 31_238_000 picoseconds.
-		Weight::from_parts(31_955_000, 0)
-			.saturating_add(Weight::from_parts(0, 3645))
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Measured:  `245`
+		//  Estimated: `3710`
+		// Minimum execution time: 45_426_000 picoseconds.
+		Weight::from_parts(48_021_000, 0)
+			.saturating_add(Weight::from_parts(0, 3710))
+			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
 	/// Storage: `XcmPallet::VersionNotifiers` (r:1 w:1)
@@ -187,18 +206,20 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Paras::Heads` (r:1 w:0)
+	/// Proof: `Paras::Heads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmPallet::Queries` (r:0 w:1)
 	/// Proof: `XcmPallet::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_unsubscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `360`
-		//  Estimated: `3825`
-		// Minimum execution time: 37_237_000 picoseconds.
-		Weight::from_parts(38_569_000, 0)
-			.saturating_add(Weight::from_parts(0, 3825))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Measured:  `425`
+		//  Estimated: `3890`
+		// Minimum execution time: 50_854_000 picoseconds.
+		Weight::from_parts(52_044_000, 0)
+			.saturating_add(Weight::from_parts(0, 3890))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: `XcmPallet::XcmExecutionSuspended` (r:0 w:1)
@@ -207,45 +228,45 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_884_000 picoseconds.
-		Weight::from_parts(2_028_000, 0)
+		// Minimum execution time: 2_566_000 picoseconds.
+		Weight::from_parts(2_771_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `XcmPallet::SupportedVersion` (r:5 w:2)
+	/// Storage: `XcmPallet::SupportedVersion` (r:6 w:2)
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `22`
-		//  Estimated: `13387`
-		// Minimum execution time: 16_048_000 picoseconds.
-		Weight::from_parts(16_617_000, 0)
-			.saturating_add(Weight::from_parts(0, 13387))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15862`
+		// Minimum execution time: 21_854_000 picoseconds.
+		Weight::from_parts(22_528_000, 0)
+			.saturating_add(Weight::from_parts(0, 15862))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `XcmPallet::VersionNotifiers` (r:5 w:2)
+	/// Storage: `XcmPallet::VersionNotifiers` (r:6 w:2)
 	/// Proof: `XcmPallet::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `26`
-		//  Estimated: `13391`
-		// Minimum execution time: 16_073_000 picoseconds.
-		Weight::from_parts(16_672_000, 0)
-			.saturating_add(Weight::from_parts(0, 13391))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15866`
+		// Minimum execution time: 21_821_000 picoseconds.
+		Weight::from_parts(22_368_000, 0)
+			.saturating_add(Weight::from_parts(0, 15866))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `XcmPallet::VersionNotifyTargets` (r:6 w:0)
+	/// Storage: `XcmPallet::VersionNotifyTargets` (r:7 w:0)
 	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `40`
-		//  Estimated: `15880`
-		// Minimum execution time: 18_422_000 picoseconds.
-		Weight::from_parts(18_900_000, 0)
-			.saturating_add(Weight::from_parts(0, 15880))
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Estimated: `18355`
+		// Minimum execution time: 25_795_000 picoseconds.
+		Weight::from_parts(26_284_000, 0)
+			.saturating_add(Weight::from_parts(0, 18355))
+			.saturating_add(T::DbWeight::get().reads(7))
 	}
 	/// Storage: `XcmPallet::VersionNotifyTargets` (r:2 w:1)
 	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -253,62 +274,62 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
+	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:0)
 	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
-	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Paras::Heads` (r:1 w:0)
+	/// Proof: `Paras::Heads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_current_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `216`
-		//  Estimated: `6156`
-		// Minimum execution time: 30_373_000 picoseconds.
-		Weight::from_parts(30_972_000, 0)
-			.saturating_add(Weight::from_parts(0, 6156))
+		//  Measured:  `244`
+		//  Estimated: `6184`
+		// Minimum execution time: 33_182_000 picoseconds.
+		Weight::from_parts(34_506_000, 0)
+			.saturating_add(Weight::from_parts(0, 6184))
 			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(3))
+			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `XcmPallet::VersionNotifyTargets` (r:4 w:0)
+	/// Storage: `XcmPallet::VersionNotifyTargets` (r:5 w:0)
 	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `69`
-		//  Estimated: `10959`
-		// Minimum execution time: 11_863_000 picoseconds.
-		Weight::from_parts(12_270_000, 0)
-			.saturating_add(Weight::from_parts(0, 10959))
-			.saturating_add(T::DbWeight::get().reads(4))
+		//  Measured:  `40`
+		//  Estimated: `13405`
+		// Minimum execution time: 17_573_000 picoseconds.
+		Weight::from_parts(18_154_000, 0)
+			.saturating_add(Weight::from_parts(0, 13405))
+			.saturating_add(T::DbWeight::get().reads(5))
 	}
-	/// Storage: `XcmPallet::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `XcmPallet::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `33`
-		//  Estimated: `13398`
-		// Minimum execution time: 16_733_000 picoseconds.
-		Weight::from_parts(17_094_000, 0)
-			.saturating_add(Weight::from_parts(0, 13398))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15873`
+		// Minimum execution time: 22_491_000 picoseconds.
+		Weight::from_parts(22_793_000, 0)
+			.saturating_add(Weight::from_parts(0, 15873))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `XcmPallet::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `XcmPallet::VersionNotifyTargets` (r:6 w:1)
 	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
+	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:0)
 	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
-	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Paras::Heads` (r:1 w:0)
+	/// Proof: `Paras::Heads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `216`
-		//  Estimated: `13581`
-		// Minimum execution time: 39_236_000 picoseconds.
-		Weight::from_parts(40_587_000, 0)
-			.saturating_add(Weight::from_parts(0, 13581))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(4))
+		//  Measured:  `244`
+		//  Estimated: `16084`
+		// Minimum execution time: 44_441_000 picoseconds.
+		Weight::from_parts(45_782_000, 0)
+			.saturating_add(Weight::from_parts(0, 16084))
+			.saturating_add(T::DbWeight::get().reads(10))
+			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	/// Storage: `XcmPallet::QueryCounter` (r:1 w:1)
 	/// Proof: `XcmPallet::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -318,8 +339,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `1485`
-		// Minimum execution time: 2_145_000 picoseconds.
-		Weight::from_parts(2_255_000, 0)
+		// Minimum execution time: 2_809_000 picoseconds.
+		Weight::from_parts(2_960_000, 0)
 			.saturating_add(Weight::from_parts(0, 1485))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -330,22 +351,24 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `7576`
 		//  Estimated: `11041`
-		// Minimum execution time: 22_518_000 picoseconds.
-		Weight::from_parts(22_926_000, 0)
+		// Minimum execution time: 26_248_000 picoseconds.
+		Weight::from_parts(26_996_000, 0)
 			.saturating_add(Weight::from_parts(0, 11041))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `XcmPallet::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `XcmPallet::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmPallet::AssetTraps` (r:1 w:1)
 	/// Proof: `XcmPallet::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn claim_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `23`
 		//  Estimated: `3488`
-		// Minimum execution time: 34_438_000 picoseconds.
-		Weight::from_parts(35_514_000, 0)
+		// Minimum execution time: 40_299_000 picoseconds.
+		Weight::from_parts(41_396_000, 0)
 			.saturating_add(Weight::from_parts(0, 3488))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 }
diff --git a/polkadot/runtime/test-runtime/Cargo.toml b/polkadot/runtime/test-runtime/Cargo.toml
index 8b33bf9cebc6..f35bb53ac904 100644
--- a/polkadot/runtime/test-runtime/Cargo.toml
+++ b/polkadot/runtime/test-runtime/Cargo.toml
@@ -16,59 +16,59 @@ log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { workspace = true }
 
+frame-election-provider-support = { workspace = true }
+sp-api = { workspace = true }
 sp-authority-discovery = { workspace = true }
+sp-block-builder = { workspace = true }
 sp-consensus-babe = { workspace = true }
 sp-consensus-beefy = { workspace = true }
-sp-api = { workspace = true }
-sp-inherents = { workspace = true }
-sp-offchain = { workspace = true }
-sp-io = { workspace = true }
-sp-runtime = { workspace = true }
-sp-staking = { workspace = true }
 sp-core = { workspace = true }
 sp-genesis-builder = { workspace = true }
+sp-inherents = { workspace = true }
+sp-io = { workspace = true }
 sp-mmr-primitives = { workspace = true }
+sp-offchain = { workspace = true }
+sp-runtime = { workspace = true }
 sp-session = { workspace = true }
-sp-version = { workspace = true }
-frame-election-provider-support = { workspace = true }
+sp-staking = { workspace = true }
 sp-transaction-pool = { workspace = true }
-sp-block-builder = { workspace = true }
+sp-version = { workspace = true }
 
+frame-executive = { workspace = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
+frame-system-rpc-runtime-api = { workspace = true }
 pallet-authority-discovery = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-babe = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-transaction-payment = { workspace = true }
-pallet-transaction-payment-rpc-runtime-api = { workspace = true }
-frame-executive = { workspace = true }
 pallet-grandpa = { workspace = true }
 pallet-indices = { workspace = true }
 pallet-offences = { workspace = true }
 pallet-session = { workspace = true }
-frame-support = { workspace = true }
 pallet-staking = { workspace = true }
 pallet-staking-reward-curve = { workspace = true, default-features = true }
-frame-system = { workspace = true }
-frame-system-rpc-runtime-api = { workspace = true }
-test-runtime-constants = { workspace = true }
-pallet-timestamp = { workspace = true }
 pallet-sudo = { workspace = true }
+pallet-timestamp = { workspace = true }
+pallet-transaction-payment = { workspace = true }
+pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-vesting = { workspace = true }
+test-runtime-constants = { workspace = true }
 
-polkadot-runtime-common = { workspace = true }
-polkadot-primitives = { workspace = true }
 pallet-xcm = { workspace = true }
+polkadot-primitives = { workspace = true }
+polkadot-runtime-common = { workspace = true }
 polkadot-runtime-parachains = { workspace = true }
+xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
-xcm = { workspace = true }
 
 [dev-dependencies]
 hex-literal = { workspace = true, default-features = true }
-tiny-keccak = { features = ["keccak"], workspace = true }
+serde_json = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 sp-trie = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
+tiny-keccak = { features = ["keccak"], workspace = true }
 
 [build-dependencies]
 substrate-wasm-builder = { workspace = true, default-features = true }
diff --git a/polkadot/runtime/westend/Cargo.toml b/polkadot/runtime/westend/Cargo.toml
index 13e39b5aa317..e945e64e7fc0 100644
--- a/polkadot/runtime/westend/Cargo.toml
+++ b/polkadot/runtime/westend/Cargo.toml
@@ -15,36 +15,36 @@ workspace = true
 [dependencies]
 bitvec = { features = ["alloc"], workspace = true }
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 serde = { workspace = true }
 serde_derive = { optional = true, workspace = true }
 serde_json = { features = ["alloc"], workspace = true }
 smallvec = { workspace = true, default-features = true }
 
-sp-authority-discovery = { workspace = true }
-sp-consensus-babe = { workspace = true }
-sp-consensus-beefy = { workspace = true }
-sp-consensus-grandpa = { workspace = true }
 binary-merkle-tree = { workspace = true }
-sp-inherents = { workspace = true }
-sp-offchain = { workspace = true }
 sp-api = { workspace = true }
 sp-application-crypto = { workspace = true }
 sp-arithmetic = { workspace = true }
+sp-authority-discovery = { workspace = true }
+sp-block-builder = { workspace = true }
+sp-consensus-babe = { workspace = true }
+sp-consensus-beefy = { workspace = true }
+sp-consensus-grandpa = { workspace = true }
+sp-core = { workspace = true }
 sp-genesis-builder = { workspace = true }
+sp-inherents = { workspace = true }
 sp-io = { workspace = true }
+sp-keyring = { workspace = true }
 sp-mmr-primitives = { workspace = true }
+sp-npos-elections = { workspace = true }
+sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
-sp-staking = { workspace = true }
-sp-core = { workspace = true }
 sp-session = { workspace = true }
+sp-staking = { workspace = true }
 sp-storage = { workspace = true }
-sp-version = { workspace = true }
 sp-transaction-pool = { workspace = true }
-sp-block-builder = { workspace = true }
-sp-npos-elections = { workspace = true }
-sp-keyring = { workspace = true }
+sp-version = { workspace = true }
 
 frame-election-provider-support = { workspace = true }
 frame-executive = { workspace = true }
@@ -52,7 +52,6 @@ frame-metadata-hash-extension = { workspace = true }
 frame-support = { features = ["experimental", "tuples-96"], workspace = true }
 frame-system = { workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
-westend-runtime-constants = { workspace = true }
 pallet-asset-rate = { workspace = true }
 pallet-authority-discovery = { workspace = true }
 pallet-authorship = { workspace = true }
@@ -62,9 +61,11 @@ pallet-balances = { workspace = true }
 pallet-beefy = { workspace = true }
 pallet-beefy-mmr = { workspace = true }
 pallet-collective = { workspace = true }
+pallet-conviction-voting = { workspace = true }
+pallet-delegated-staking = { workspace = true }
 pallet-democracy = { workspace = true }
-pallet-elections-phragmen = { workspace = true }
 pallet-election-provider-multi-phase = { workspace = true }
+pallet-elections-phragmen = { workspace = true }
 pallet-fast-unstake = { workspace = true }
 pallet-grandpa = { workspace = true }
 pallet-identity = { workspace = true }
@@ -75,60 +76,59 @@ pallet-migrations = { workspace = true }
 pallet-mmr = { workspace = true }
 pallet-multisig = { workspace = true }
 pallet-nomination-pools = { workspace = true }
-pallet-conviction-voting = { workspace = true }
+pallet-nomination-pools-runtime-api = { workspace = true }
 pallet-offences = { workspace = true }
 pallet-parameters = { workspace = true }
 pallet-preimage = { workspace = true }
 pallet-proxy = { workspace = true }
 pallet-recovery = { workspace = true }
 pallet-referenda = { workspace = true }
+pallet-root-testing = { workspace = true }
 pallet-scheduler = { workspace = true }
 pallet-session = { workspace = true }
 pallet-society = { workspace = true }
 pallet-staking = { workspace = true }
 pallet-staking-runtime-api = { workspace = true }
-pallet-delegated-staking = { workspace = true }
 pallet-state-trie-migration = { workspace = true }
 pallet-sudo = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
-pallet-nomination-pools-runtime-api = { workspace = true }
 pallet-treasury = { workspace = true }
 pallet-utility = { workspace = true }
 pallet-vesting = { workspace = true }
 pallet-whitelist = { workspace = true }
 pallet-xcm = { workspace = true }
 pallet-xcm-benchmarks = { optional = true, workspace = true }
-pallet-root-testing = { workspace = true }
+westend-runtime-constants = { workspace = true }
 
 frame-benchmarking = { optional = true, workspace = true }
-frame-try-runtime = { optional = true, workspace = true }
 frame-system-benchmarking = { optional = true, workspace = true }
+frame-try-runtime = { optional = true, workspace = true }
+hex-literal = { workspace = true, default-features = true }
 pallet-election-provider-support-benchmarking = { optional = true, workspace = true }
 pallet-nomination-pools-benchmarking = { optional = true, workspace = true }
 pallet-offences-benchmarking = { optional = true, workspace = true }
 pallet-session-benchmarking = { optional = true, workspace = true }
-hex-literal = { workspace = true, default-features = true }
 
-polkadot-runtime-common = { workspace = true }
-polkadot-primitives = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
+polkadot-primitives = { workspace = true }
+polkadot-runtime-common = { workspace = true }
 polkadot-runtime-parachains = { workspace = true }
 
 xcm = { workspace = true }
-xcm-executor = { workspace = true }
 xcm-builder = { workspace = true }
+xcm-executor = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 [dev-dependencies]
 approx = { workspace = true }
-tiny-keccak = { features = ["keccak"], workspace = true }
-sp-keyring = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
 remote-externalities = { workspace = true, default-features = true }
-tokio = { features = ["macros"], workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 sp-tracing = { workspace = true }
+tiny-keccak = { features = ["keccak"], workspace = true }
+tokio = { features = ["macros"], workspace = true, default-features = true }
 
 [build-dependencies]
 substrate-wasm-builder = { workspace = true, default-features = true }
diff --git a/polkadot/runtime/westend/constants/Cargo.toml b/polkadot/runtime/westend/constants/Cargo.toml
index a50e2f9cc639..f3dbcc309ee1 100644
--- a/polkadot/runtime/westend/constants/Cargo.toml
+++ b/polkadot/runtime/westend/constants/Cargo.toml
@@ -20,9 +20,9 @@ smallvec = { workspace = true, default-features = true }
 frame-support = { workspace = true }
 polkadot-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
+sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 sp-weights = { workspace = true }
-sp-core = { workspace = true }
 
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
diff --git a/polkadot/runtime/westend/src/genesis_config_presets.rs b/polkadot/runtime/westend/src/genesis_config_presets.rs
index b8f7710089e0..ea5aff554e8c 100644
--- a/polkadot/runtime/westend/src/genesis_config_presets.rs
+++ b/polkadot/runtime/westend/src/genesis_config_presets.rs
@@ -133,7 +133,8 @@ fn default_parachains_host_configuration(
 		},
 		node_features: bitvec::vec::BitVec::from_element(
 			1u8 << (FeatureIndex::ElasticScalingMVP as usize) |
-				1u8 << (FeatureIndex::EnableAssignmentsV2 as usize),
+				1u8 << (FeatureIndex::EnableAssignmentsV2 as usize) |
+				1u8 << (FeatureIndex::CandidateReceiptV2 as usize),
 		),
 		scheduler_params: SchedulerParams {
 			lookahead: 2,
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index f9ef74fee29c..cd8eb4d2505a 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -172,10 +172,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: alloc::borrow::Cow::Borrowed("westend"),
 	impl_name: alloc::borrow::Cow::Borrowed("parity-westend"),
 	authoring_version: 2,
-	spec_version: 1_016_001,
+	spec_version: 1_017_001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 26,
+	transaction_version: 27,
 	system_version: 1,
 };
 
@@ -1018,6 +1018,7 @@ impl pallet_recovery::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = ();
 	type RuntimeCall = RuntimeCall;
+	type BlockNumberProvider = System;
 	type Currency = Balances;
 	type ConfigDepositBase = ConfigDepositBase;
 	type FriendDepositFactor = FriendDepositFactor;
diff --git a/polkadot/runtime/westend/src/weights/pallet_xcm.rs b/polkadot/runtime/westend/src/weights/pallet_xcm.rs
index 10725cecf249..e2c0232139fb 100644
--- a/polkadot/runtime/westend/src/weights/pallet_xcm.rs
+++ b/polkadot/runtime/westend/src/weights/pallet_xcm.rs
@@ -17,25 +17,27 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-02-20, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-12-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-bn-ce5rx-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `3a528d69c69e`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("westend-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // target/production/polkadot
 // benchmark
 // pallet
-// --steps=50
-// --repeat=20
 // --extrinsic=*
+// --chain=westend-dev
+// --pallet=pallet_xcm
+// --header=/__w/polkadot-sdk/polkadot-sdk/polkadot/file_header.txt
+// --output=./polkadot/runtime/westend/src/weights
 // --wasm-execution=compiled
+// --steps=50
+// --repeat=20
 // --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
-// --pallet=pallet_xcm
-// --chain=westend-dev
-// --header=./polkadot/file_header.txt
-// --output=./polkadot/runtime/westend/src/weights/
+// --no-storage-info
+// --no-min-squares
+// --no-median-slopes
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -54,38 +56,46 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Paras::Heads` (r:1 w:0)
+	/// Proof: `Paras::Heads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn send() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `147`
-		//  Estimated: `3612`
-		// Minimum execution time: 25_725_000 picoseconds.
-		Weight::from_parts(26_174_000, 0)
-			.saturating_add(Weight::from_parts(0, 3612))
-			.saturating_add(T::DbWeight::get().reads(4))
+		//  Measured:  `212`
+		//  Estimated: `3677`
+		// Minimum execution time: 41_425_000 picoseconds.
+		Weight::from_parts(43_275_000, 0)
+			.saturating_add(Weight::from_parts(0, 3677))
+			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `XcmPallet::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `XcmPallet::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Paras::Heads` (r:1 w:0)
+	/// Proof: `Paras::Heads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn teleport_assets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `250`
+		//  Measured:  `315`
 		//  Estimated: `6196`
-		// Minimum execution time: 113_140_000 picoseconds.
-		Weight::from_parts(116_204_000, 0)
+		// Minimum execution time: 145_227_000 picoseconds.
+		Weight::from_parts(151_656_000, 0)
 			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
+	/// Storage: `XcmPallet::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `XcmPallet::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
@@ -94,47 +104,54 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Paras::Heads` (r:1 w:0)
+	/// Proof: `Paras::Heads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn reserve_transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `302`
+		//  Measured:  `367`
 		//  Estimated: `6196`
-		// Minimum execution time: 108_571_000 picoseconds.
-		Weight::from_parts(110_650_000, 0)
+		// Minimum execution time: 141_439_000 picoseconds.
+		Weight::from_parts(146_252_000, 0)
 			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `XcmPallet::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `XcmPallet::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Paras::Heads` (r:1 w:0)
+	/// Proof: `Paras::Heads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `250`
+		//  Measured:  `315`
 		//  Estimated: `6196`
-		// Minimum execution time: 111_836_000 picoseconds.
-		Weight::from_parts(114_435_000, 0)
+		// Minimum execution time: 146_651_000 picoseconds.
+		Weight::from_parts(150_134_000, 0)
 			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
-	/// Storage: `Benchmark::Override` (r:0 w:0)
-	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `XcmPallet::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn execute() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
-		Weight::from_parts(18_446_744_073_709_551_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
+		//  Estimated: `1485`
+		// Minimum execution time: 9_663_000 picoseconds.
+		Weight::from_parts(10_012_000, 0)
+			.saturating_add(Weight::from_parts(0, 1485))
+			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	/// Storage: `XcmPallet::SupportedVersion` (r:0 w:1)
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -142,8 +159,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_160_000 picoseconds.
-		Weight::from_parts(7_477_000, 0)
+		// Minimum execution time: 8_113_000 picoseconds.
+		Weight::from_parts(8_469_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -151,8 +168,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_934_000 picoseconds.
-		Weight::from_parts(2_053_000, 0)
+		// Minimum execution time: 2_493_000 picoseconds.
+		Weight::from_parts(2_630_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	/// Storage: `XcmPallet::VersionNotifiers` (r:1 w:1)
@@ -165,18 +182,20 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Paras::Heads` (r:1 w:0)
+	/// Proof: `Paras::Heads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmPallet::Queries` (r:0 w:1)
 	/// Proof: `XcmPallet::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_subscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `147`
-		//  Estimated: `3612`
-		// Minimum execution time: 31_123_000 picoseconds.
-		Weight::from_parts(31_798_000, 0)
-			.saturating_add(Weight::from_parts(0, 3612))
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Measured:  `212`
+		//  Estimated: `3677`
+		// Minimum execution time: 47_890_000 picoseconds.
+		Weight::from_parts(49_994_000, 0)
+			.saturating_add(Weight::from_parts(0, 3677))
+			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
 	/// Storage: `XcmPallet::VersionNotifiers` (r:1 w:1)
@@ -187,18 +206,20 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Paras::Heads` (r:1 w:0)
+	/// Proof: `Paras::Heads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmPallet::Queries` (r:0 w:1)
 	/// Proof: `XcmPallet::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_unsubscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `327`
-		//  Estimated: `3792`
-		// Minimum execution time: 35_175_000 picoseconds.
-		Weight::from_parts(36_098_000, 0)
-			.saturating_add(Weight::from_parts(0, 3792))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Measured:  `392`
+		//  Estimated: `3857`
+		// Minimum execution time: 52_967_000 picoseconds.
+		Weight::from_parts(55_345_000, 0)
+			.saturating_add(Weight::from_parts(0, 3857))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: `XcmPallet::XcmExecutionSuspended` (r:0 w:1)
@@ -207,45 +228,45 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_974_000 picoseconds.
-		Weight::from_parts(2_096_000, 0)
+		// Minimum execution time: 2_451_000 picoseconds.
+		Weight::from_parts(2_623_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `XcmPallet::SupportedVersion` (r:5 w:2)
+	/// Storage: `XcmPallet::SupportedVersion` (r:6 w:2)
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `22`
-		//  Estimated: `13387`
-		// Minimum execution time: 16_626_000 picoseconds.
-		Weight::from_parts(17_170_000, 0)
-			.saturating_add(Weight::from_parts(0, 13387))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15862`
+		// Minimum execution time: 22_292_000 picoseconds.
+		Weight::from_parts(22_860_000, 0)
+			.saturating_add(Weight::from_parts(0, 15862))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `XcmPallet::VersionNotifiers` (r:5 w:2)
+	/// Storage: `XcmPallet::VersionNotifiers` (r:6 w:2)
 	/// Proof: `XcmPallet::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `26`
-		//  Estimated: `13391`
-		// Minimum execution time: 16_937_000 picoseconds.
-		Weight::from_parts(17_447_000, 0)
-			.saturating_add(Weight::from_parts(0, 13391))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15866`
+		// Minimum execution time: 21_847_000 picoseconds.
+		Weight::from_parts(22_419_000, 0)
+			.saturating_add(Weight::from_parts(0, 15866))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `XcmPallet::VersionNotifyTargets` (r:6 w:0)
+	/// Storage: `XcmPallet::VersionNotifyTargets` (r:7 w:0)
 	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `40`
-		//  Estimated: `15880`
-		// Minimum execution time: 19_157_000 picoseconds.
-		Weight::from_parts(19_659_000, 0)
-			.saturating_add(Weight::from_parts(0, 15880))
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Estimated: `18355`
+		// Minimum execution time: 24_764_000 picoseconds.
+		Weight::from_parts(25_873_000, 0)
+			.saturating_add(Weight::from_parts(0, 18355))
+			.saturating_add(T::DbWeight::get().reads(7))
 	}
 	/// Storage: `XcmPallet::VersionNotifyTargets` (r:2 w:1)
 	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -253,62 +274,62 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
+	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:0)
 	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
-	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Paras::Heads` (r:1 w:0)
+	/// Proof: `Paras::Heads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_current_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `183`
-		//  Estimated: `6123`
-		// Minimum execution time: 30_699_000 picoseconds.
-		Weight::from_parts(31_537_000, 0)
-			.saturating_add(Weight::from_parts(0, 6123))
+		//  Measured:  `211`
+		//  Estimated: `6151`
+		// Minimum execution time: 36_482_000 picoseconds.
+		Weight::from_parts(37_672_000, 0)
+			.saturating_add(Weight::from_parts(0, 6151))
 			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(3))
+			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `XcmPallet::VersionNotifyTargets` (r:4 w:0)
+	/// Storage: `XcmPallet::VersionNotifyTargets` (r:5 w:0)
 	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `69`
-		//  Estimated: `10959`
-		// Minimum execution time: 12_303_000 picoseconds.
-		Weight::from_parts(12_670_000, 0)
-			.saturating_add(Weight::from_parts(0, 10959))
-			.saturating_add(T::DbWeight::get().reads(4))
+		//  Measured:  `40`
+		//  Estimated: `13405`
+		// Minimum execution time: 17_580_000 picoseconds.
+		Weight::from_parts(17_908_000, 0)
+			.saturating_add(Weight::from_parts(0, 13405))
+			.saturating_add(T::DbWeight::get().reads(5))
 	}
-	/// Storage: `XcmPallet::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `XcmPallet::VersionNotifyTargets` (r:6 w:2)
 	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `33`
-		//  Estimated: `13398`
-		// Minimum execution time: 17_129_000 picoseconds.
-		Weight::from_parts(17_668_000, 0)
-			.saturating_add(Weight::from_parts(0, 13398))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `15873`
+		// Minimum execution time: 21_946_000 picoseconds.
+		Weight::from_parts(22_548_000, 0)
+			.saturating_add(Weight::from_parts(0, 15873))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `XcmPallet::VersionNotifyTargets` (r:5 w:2)
+	/// Storage: `XcmPallet::VersionNotifyTargets` (r:6 w:1)
 	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
 	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
+	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:0)
 	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
-	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Paras::Heads` (r:1 w:0)
+	/// Proof: `Paras::Heads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `183`
-		//  Estimated: `13548`
-		// Minimum execution time: 39_960_000 picoseconds.
-		Weight::from_parts(41_068_000, 0)
-			.saturating_add(Weight::from_parts(0, 13548))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(4))
+		//  Measured:  `211`
+		//  Estimated: `16051`
+		// Minimum execution time: 47_261_000 picoseconds.
+		Weight::from_parts(48_970_000, 0)
+			.saturating_add(Weight::from_parts(0, 16051))
+			.saturating_add(T::DbWeight::get().reads(10))
+			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	/// Storage: `XcmPallet::QueryCounter` (r:1 w:1)
 	/// Proof: `XcmPallet::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -318,8 +339,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `1485`
-		// Minimum execution time: 2_333_000 picoseconds.
-		Weight::from_parts(2_504_000, 0)
+		// Minimum execution time: 2_794_000 picoseconds.
+		Weight::from_parts(2_895_000, 0)
 			.saturating_add(Weight::from_parts(0, 1485))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -330,22 +351,24 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `7576`
 		//  Estimated: `11041`
-		// Minimum execution time: 22_932_000 picoseconds.
-		Weight::from_parts(23_307_000, 0)
+		// Minimum execution time: 25_946_000 picoseconds.
+		Weight::from_parts(26_503_000, 0)
 			.saturating_add(Weight::from_parts(0, 11041))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `XcmPallet::ShouldRecordXcm` (r:1 w:0)
+	/// Proof: `XcmPallet::ShouldRecordXcm` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmPallet::AssetTraps` (r:1 w:1)
 	/// Proof: `XcmPallet::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn claim_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `23`
 		//  Estimated: `3488`
-		// Minimum execution time: 34_558_000 picoseconds.
-		Weight::from_parts(35_299_000, 0)
+		// Minimum execution time: 40_780_000 picoseconds.
+		Weight::from_parts(41_910_000, 0)
 			.saturating_add(Weight::from_parts(0, 3488))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 }
diff --git a/polkadot/runtime/westend/src/weights/polkadot_runtime_parachains_disputes_slashing.rs b/polkadot/runtime/westend/src/weights/polkadot_runtime_parachains_disputes_slashing.rs
index a035ea2b0b5e..f4dbca0f29ff 100644
--- a/polkadot/runtime/westend/src/weights/polkadot_runtime_parachains_disputes_slashing.rs
+++ b/polkadot/runtime/westend/src/weights/polkadot_runtime_parachains_disputes_slashing.rs
@@ -85,7 +85,7 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::disputes::slashing::W
 	/// Storage: Staking UnappliedSlashes (r:1 w:1)
 	/// Proof Skipped: Staking UnappliedSlashes (max_values: None, max_size: None, mode: Measured)
 	/// The range of component `n` is `[4, 300]`.
-	fn report_dispute_lost(n: u32, ) -> Weight {
+	fn report_dispute_lost_unsigned(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `4531 + n * (189 ±0)`
 		//  Estimated: `7843 + n * (192 ±0)`
diff --git a/polkadot/statement-table/Cargo.toml b/polkadot/statement-table/Cargo.toml
index d9519dafe12d..1155600f3d0c 100644
--- a/polkadot/statement-table/Cargo.toml
+++ b/polkadot/statement-table/Cargo.toml
@@ -13,6 +13,6 @@ workspace = true
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-sp-core = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 gum = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
diff --git a/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml b/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml
index 206ca8cf19a9..1a6c23e0518e 100644
--- a/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml
+++ b/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml
@@ -13,10 +13,10 @@ workspace = true
 westend-runtime = { workspace = true }
 westend-runtime-constants = { workspace = true, default-features = true }
 
-pallet-bags-list-remote-tests = { workspace = true }
-sp-tracing = { workspace = true, default-features = true }
 frame-system = { workspace = true, default-features = true }
+pallet-bags-list-remote-tests = { workspace = true }
 sp-core = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 
 clap = { features = ["derive"], workspace = true }
 log = { workspace = true, default-features = true }
diff --git a/polkadot/xcm/Cargo.toml b/polkadot/xcm/Cargo.toml
index 7ac12dc1e377..e90354e4e6ac 100644
--- a/polkadot/xcm/Cargo.toml
+++ b/polkadot/xcm/Cargo.toml
@@ -14,23 +14,23 @@ workspace = true
 [dependencies]
 array-bytes = { workspace = true, default-features = true }
 bounded-collections = { features = ["serde"], workspace = true }
+codec = { features = ["derive", "max-encoded-len"], workspace = true }
 derivative = { features = ["use_core"], workspace = true }
+environmental = { workspace = true }
+frame-support = { workspace = true }
+hex-literal = { workspace = true, default-features = true }
 impl-trait-for-tuples = { workspace = true }
 log = { workspace = true }
-codec = { features = ["derive", "max-encoded-len"], workspace = true }
 scale-info = { features = ["derive", "serde"], workspace = true }
+schemars = { default-features = true, optional = true, workspace = true }
+serde = { features = ["alloc", "derive", "rc"], workspace = true }
 sp-runtime = { workspace = true }
 sp-weights = { features = ["serde"], workspace = true }
-serde = { features = ["alloc", "derive", "rc"], workspace = true }
-schemars = { default-features = true, optional = true, workspace = true }
 xcm-procedural = { workspace = true, default-features = true }
-environmental = { workspace = true }
-hex-literal = { workspace = true, default-features = true }
-frame-support = { workspace = true }
 
 [dev-dependencies]
-sp-io = { workspace = true, default-features = true }
 hex = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/xcm/docs/Cargo.toml b/polkadot/xcm/docs/Cargo.toml
index 9d8f4c0a6430..6fa7ea9a23a9 100644
--- a/polkadot/xcm/docs/Cargo.toml
+++ b/polkadot/xcm/docs/Cargo.toml
@@ -10,30 +10,30 @@ publish = false
 
 [dependencies]
 # For XCM stuff
+pallet-xcm = { workspace = true, default-features = true }
 xcm = { workspace = true, default-features = true }
-xcm-executor = { workspace = true, default-features = true }
 xcm-builder = { workspace = true, default-features = true }
+xcm-executor = { workspace = true, default-features = true }
 xcm-simulator = { workspace = true, default-features = true }
-pallet-xcm = { workspace = true, default-features = true }
 
 # For building FRAME runtimes
-frame = { features = ["experimental", "runtime"], workspace = true, default-features = true }
 codec = { workspace = true, default-features = true }
-scale-info = { workspace = true }
+frame = { features = ["experimental", "runtime"], workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
-polkadot-runtime-parachains = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
+polkadot-runtime-parachains = { workspace = true, default-features = true }
+scale-info = { workspace = true }
+sp-io = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-std = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
 
 # Some pallets
-pallet-message-queue = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
+pallet-message-queue = { workspace = true, default-features = true }
 
 # For building docs
-simple-mermaid = { git = "https://github.com/kianenigma/simple-mermaid.git", branch = "main" }
 docify = { workspace = true }
+simple-mermaid = { git = "https://github.com/kianenigma/simple-mermaid.git", branch = "main" }
 
 [dev-dependencies]
 test-log = { workspace = true }
diff --git a/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml b/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml
index d4131cc53ee6..5d5926ae01e0 100644
--- a/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml
+++ b/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml
@@ -16,20 +16,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
+frame-benchmarking = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-sp-runtime = { workspace = true }
+log = { workspace = true, default-features = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-io = { workspace = true }
-xcm-executor = { workspace = true }
-frame-benchmarking = { workspace = true }
+sp-runtime = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
-log = { workspace = true, default-features = true }
+xcm-executor = { workspace = true }
 
 [dev-dependencies]
-pallet-balances = { workspace = true, default-features = true }
 pallet-assets = { workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 xcm = { workspace = true, default-features = true }
 # temp
diff --git a/polkadot/xcm/pallet-xcm/Cargo.toml b/polkadot/xcm/pallet-xcm/Cargo.toml
index 81fcea05cac2..85beba03b157 100644
--- a/polkadot/xcm/pallet-xcm/Cargo.toml
+++ b/polkadot/xcm/pallet-xcm/Cargo.toml
@@ -25,8 +25,8 @@ sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
 xcm = { workspace = true }
-xcm-executor = { workspace = true }
 xcm-builder = { workspace = true }
+xcm-executor = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 # marked optional, used in benchmarking
@@ -35,8 +35,8 @@ pallet-balances = { optional = true, workspace = true }
 
 [dev-dependencies]
 pallet-assets = { workspace = true, default-features = true }
-polkadot-runtime-parachains = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-runtime-parachains = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/xcm/pallet-xcm/src/benchmarking.rs b/polkadot/xcm/pallet-xcm/src/benchmarking.rs
index dd3c58c5dc77..3ca048057ee4 100644
--- a/polkadot/xcm/pallet-xcm/src/benchmarking.rs
+++ b/polkadot/xcm/pallet-xcm/src/benchmarking.rs
@@ -15,7 +15,7 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use super::*;
-use frame_benchmarking::{benchmarks, whitelisted_caller, BenchmarkError, BenchmarkResult};
+use frame_benchmarking::v2::*;
 use frame_support::{assert_ok, weights::Weight};
 use frame_system::RawOrigin;
 use xcm::latest::prelude::*;
@@ -83,32 +83,41 @@ pub trait Config: crate::Config {
 	fn get_asset() -> Asset;
 }
 
-benchmarks! {
-	send {
+#[benchmarks]
+mod benchmarks {
+	use super::*;
+
+	#[benchmark]
+	fn send() -> Result<(), BenchmarkError> {
 		let send_origin =
 			T::SendXcmOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
 		if T::SendXcmOrigin::try_origin(send_origin.clone()).is_err() {
 			return Err(BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))
 		}
 		let msg = Xcm(vec![ClearOrigin]);
-		let versioned_dest: VersionedLocation = T::reachable_dest().ok_or(
-			BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)),
-		)?
-		.into();
+		let versioned_dest: VersionedLocation = T::reachable_dest()
+			.ok_or(BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))?
+			.into();
 		let versioned_msg = VersionedXcm::from(msg);
 
-		// Ensure that origin can send to destination (e.g. setup delivery fees, ensure router setup, ...)
+		// Ensure that origin can send to destination
+		// (e.g. setup delivery fees, ensure router setup, ...)
 		T::DeliveryHelper::ensure_successful_delivery(
 			&Default::default(),
 			&versioned_dest.clone().try_into().unwrap(),
 			FeeReason::ChargeFees,
 		);
-	}: _<RuntimeOrigin<T>>(send_origin, Box::new(versioned_dest), Box::new(versioned_msg))
 
-	teleport_assets {
-		let (asset, destination) = T::teleportable_asset_and_dest().ok_or(
-			BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)),
-		)?;
+		#[extrinsic_call]
+		_(send_origin as RuntimeOrigin<T>, Box::new(versioned_dest), Box::new(versioned_msg));
+
+		Ok(())
+	}
+
+	#[benchmark]
+	fn teleport_assets() -> Result<(), BenchmarkError> {
+		let (asset, destination) = T::teleportable_asset_and_dest()
+			.ok_or(BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))?;
 
 		let assets: Assets = asset.clone().into();
 
@@ -116,11 +125,13 @@ benchmarks! {
 		let send_origin = RawOrigin::Signed(caller.clone());
 		let origin_location = T::ExecuteXcmOrigin::try_origin(send_origin.clone().into())
 			.map_err(|_| BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))?;
-		if !T::XcmTeleportFilter::contains(&(origin_location.clone(), assets.clone().into_inner())) {
+		if !T::XcmTeleportFilter::contains(&(origin_location.clone(), assets.clone().into_inner()))
+		{
 			return Err(BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))
 		}
 
-		// Ensure that origin can send to destination (e.g. setup delivery fees, ensure router setup, ...)
+		// Ensure that origin can send to destination
+		// (e.g. setup delivery fees, ensure router setup, ...)
 		let (_, _) = T::DeliveryHelper::ensure_successful_delivery(
 			&origin_location,
 			&destination,
@@ -134,18 +145,23 @@ benchmarks! {
 					&Asset { fun: Fungible(*amount), id: asset.id },
 					&origin_location,
 					None,
-				).map_err(|error| {
-				  tracing::error!("Fungible asset couldn't be deposited, error: {:?}", error);
-				  BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX))
+				)
+				.map_err(|error| {
+					tracing::error!("Fungible asset couldn't be deposited, error: {:?}", error);
+					BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX))
+				})?;
+			},
+			NonFungible(_instance) => {
+				<T::XcmExecutor as XcmAssetTransfers>::AssetTransactor::deposit_asset(
+					&asset,
+					&origin_location,
+					None,
+				)
+				.map_err(|error| {
+					tracing::error!("Nonfungible asset couldn't be deposited, error: {:?}", error);
+					BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX))
 				})?;
 			},
-			NonFungible(instance) => {
-				<T::XcmExecutor as XcmAssetTransfers>::AssetTransactor::deposit_asset(&asset, &origin_location, None)
-					.map_err(|error| {
-						tracing::error!("Nonfungible asset couldn't be deposited, error: {:?}", error);
-						BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX))
-					})?;
-			}
 		};
 
 		let recipient = [0u8; 32];
@@ -153,12 +169,23 @@ benchmarks! {
 		let versioned_beneficiary: VersionedLocation =
 			AccountId32 { network: None, id: recipient.into() }.into();
 		let versioned_assets: VersionedAssets = assets.into();
-	}: _<RuntimeOrigin<T>>(send_origin.into(), Box::new(versioned_dest), Box::new(versioned_beneficiary), Box::new(versioned_assets), 0)
 
-	reserve_transfer_assets {
-		let (asset, destination) = T::reserve_transferable_asset_and_dest().ok_or(
-			BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)),
-		)?;
+		#[extrinsic_call]
+		_(
+			send_origin,
+			Box::new(versioned_dest),
+			Box::new(versioned_beneficiary),
+			Box::new(versioned_assets),
+			0,
+		);
+
+		Ok(())
+	}
+
+	#[benchmark]
+	fn reserve_transfer_assets() -> Result<(), BenchmarkError> {
+		let (asset, destination) = T::reserve_transferable_asset_and_dest()
+			.ok_or(BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))?;
 
 		let assets: Assets = asset.clone().into();
 
@@ -166,12 +193,16 @@ benchmarks! {
 		let send_origin = RawOrigin::Signed(caller.clone());
 		let origin_location = T::ExecuteXcmOrigin::try_origin(send_origin.clone().into())
 			.map_err(|_| BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))?;
-		if !T::XcmReserveTransferFilter::contains(&(origin_location.clone(), assets.clone().into_inner())) {
+		if !T::XcmReserveTransferFilter::contains(&(
+			origin_location.clone(),
+			assets.clone().into_inner(),
+		)) {
 			return Err(BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))
 		}
 
-		// Ensure that origin can send to destination (e.g. setup delivery fees, ensure router setup, ...)
-		T::DeliveryHelper::ensure_successful_delivery(
+		// Ensure that origin can send to destination
+		// (e.g. setup delivery fees, ensure router setup, ...)
+		let (_, _) = T::DeliveryHelper::ensure_successful_delivery(
 			&origin_location,
 			&destination,
 			FeeReason::ChargeFees,
@@ -184,18 +215,23 @@ benchmarks! {
 					&Asset { fun: Fungible(*amount), id: asset.id.clone() },
 					&origin_location,
 					None,
-				).map_err(|error| {
-				  tracing::error!("Fungible asset couldn't be deposited, error: {:?}", error);
-				  BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX))
+				)
+				.map_err(|error| {
+					tracing::error!("Fungible asset couldn't be deposited, error: {:?}", error);
+					BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX))
+				})?;
+			},
+			NonFungible(_instance) => {
+				<T::XcmExecutor as XcmAssetTransfers>::AssetTransactor::deposit_asset(
+					&asset,
+					&origin_location,
+					None,
+				)
+				.map_err(|error| {
+					tracing::error!("Nonfungible asset couldn't be deposited, error: {:?}", error);
+					BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX))
 				})?;
 			},
-			NonFungible(instance) => {
-				<T::XcmExecutor as XcmAssetTransfers>::AssetTransactor::deposit_asset(&asset, &origin_location, None)
-					.map_err(|error| {
-						tracing::error!("Nonfungible asset couldn't be deposited, error: {:?}", error);
-						BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX))
-					})?;
-			}
 		};
 
 		let recipient = [0u8; 32];
@@ -203,8 +239,16 @@ benchmarks! {
 		let versioned_beneficiary: VersionedLocation =
 			AccountId32 { network: None, id: recipient.into() }.into();
 		let versioned_assets: VersionedAssets = assets.into();
-	}: _<RuntimeOrigin<T>>(send_origin.into(), Box::new(versioned_dest), Box::new(versioned_beneficiary), Box::new(versioned_assets), 0)
-	verify {
+
+		#[extrinsic_call]
+		_(
+			send_origin,
+			Box::new(versioned_dest),
+			Box::new(versioned_beneficiary),
+			Box::new(versioned_assets),
+			0,
+		);
+
 		match &asset.fun {
 			Fungible(amount) => {
 				assert_ok!(<T::XcmExecutor as XcmAssetTransfers>::AssetTransactor::withdraw_asset(
@@ -213,20 +257,22 @@ benchmarks! {
 					None,
 				));
 			},
-			NonFungible(instance) => {
+			NonFungible(_instance) => {
 				assert_ok!(<T::XcmExecutor as XcmAssetTransfers>::AssetTransactor::withdraw_asset(
 					&asset,
 					&destination,
 					None,
 				));
-			}
+			},
 		};
+
+		Ok(())
 	}
 
-	transfer_assets {
-		let (assets, fee_index, destination, verify) = T::set_up_complex_asset_transfer().ok_or(
-			BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)),
-		)?;
+	#[benchmark]
+	fn transfer_assets() -> Result<(), BenchmarkError> {
+		let (assets, _fee_index, destination, verify_fn) = T::set_up_complex_asset_transfer()
+			.ok_or(BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))?;
 		let caller: T::AccountId = whitelisted_caller();
 		let send_origin = RawOrigin::Signed(caller.clone());
 		let recipient = [0u8; 32];
@@ -235,19 +281,31 @@ benchmarks! {
 			AccountId32 { network: None, id: recipient.into() }.into();
 		let versioned_assets: VersionedAssets = assets.into();
 
-		// Ensure that origin can send to destination (e.g. setup delivery fees, ensure router setup, ...)
+		// Ensure that origin can send to destination
+		// (e.g. setup delivery fees, ensure router setup, ...)
 		T::DeliveryHelper::ensure_successful_delivery(
 			&Default::default(),
 			&versioned_dest.clone().try_into().unwrap(),
 			FeeReason::ChargeFees,
 		);
-	}: _<RuntimeOrigin<T>>(send_origin.into(), Box::new(versioned_dest), Box::new(versioned_beneficiary), Box::new(versioned_assets), 0, WeightLimit::Unlimited)
-	verify {
+
+		#[extrinsic_call]
+		_(
+			send_origin,
+			Box::new(versioned_dest),
+			Box::new(versioned_beneficiary),
+			Box::new(versioned_assets),
+			0,
+			WeightLimit::Unlimited,
+		);
+
 		// run provided verification function
-		verify();
+		verify_fn();
+		Ok(())
 	}
 
-	execute {
+	#[benchmark]
+	fn execute() -> Result<(), BenchmarkError> {
 		let execute_origin =
 			T::ExecuteXcmOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
 		let origin_location = T::ExecuteXcmOrigin::try_origin(execute_origin.clone())
@@ -257,39 +315,59 @@ benchmarks! {
 			return Err(BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))
 		}
 		let versioned_msg = VersionedXcm::from(msg);
-	}: _<RuntimeOrigin<T>>(execute_origin, Box::new(versioned_msg), Weight::MAX)
 
-	force_xcm_version {
-		let loc = T::reachable_dest().ok_or(
-			BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)),
-		)?;
+		#[extrinsic_call]
+		_(execute_origin as RuntimeOrigin<T>, Box::new(versioned_msg), Weight::MAX);
+
+		Ok(())
+	}
+
+	#[benchmark]
+	fn force_xcm_version() -> Result<(), BenchmarkError> {
+		let loc = T::reachable_dest()
+			.ok_or(BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))?;
 		let xcm_version = 2;
-	}: _(RawOrigin::Root, Box::new(loc), xcm_version)
 
-	force_default_xcm_version {}: _(RawOrigin::Root, Some(2))
+		#[extrinsic_call]
+		_(RawOrigin::Root, Box::new(loc), xcm_version);
+
+		Ok(())
+	}
 
-	force_subscribe_version_notify {
-		let versioned_loc: VersionedLocation = T::reachable_dest().ok_or(
-			BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)),
-		)?
-		.into();
+	#[benchmark]
+	fn force_default_xcm_version() {
+		#[extrinsic_call]
+		_(RawOrigin::Root, Some(2))
+	}
 
-		// Ensure that origin can send to destination (e.g. setup delivery fees, ensure router setup, ...)
+	#[benchmark]
+	fn force_subscribe_version_notify() -> Result<(), BenchmarkError> {
+		let versioned_loc: VersionedLocation = T::reachable_dest()
+			.ok_or(BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))?
+			.into();
+
+		// Ensure that origin can send to destination
+		// (e.g. setup delivery fees, ensure router setup, ...)
 		T::DeliveryHelper::ensure_successful_delivery(
 			&Default::default(),
 			&versioned_loc.clone().try_into().unwrap(),
 			FeeReason::ChargeFees,
 		);
 
-	}: _(RawOrigin::Root, Box::new(versioned_loc))
+		#[extrinsic_call]
+		_(RawOrigin::Root, Box::new(versioned_loc));
+
+		Ok(())
+	}
 
-	force_unsubscribe_version_notify {
-		let loc = T::reachable_dest().ok_or(
-			BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)),
-		)?;
+	#[benchmark]
+	fn force_unsubscribe_version_notify() -> Result<(), BenchmarkError> {
+		let loc = T::reachable_dest()
+			.ok_or(BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))?;
 		let versioned_loc: VersionedLocation = loc.clone().into();
 
-		// Ensure that origin can send to destination (e.g. setup delivery fees, ensure router setup, ...)
+		// Ensure that origin can send to destination
+		// (e.g. setup delivery fees, ensure router setup, ...)
 		T::DeliveryHelper::ensure_successful_delivery(
 			&Default::default(),
 			&versioned_loc.clone().try_into().unwrap(),
@@ -297,123 +375,227 @@ benchmarks! {
 		);
 
 		let _ = crate::Pallet::<T>::request_version_notify(loc);
-	}: _(RawOrigin::Root, Box::new(versioned_loc))
 
-	force_suspension {}: _(RawOrigin::Root, true)
+		#[extrinsic_call]
+		_(RawOrigin::Root, Box::new(versioned_loc));
+
+		Ok(())
+	}
 
-	migrate_supported_version {
+	#[benchmark]
+	fn force_suspension() {
+		#[extrinsic_call]
+		_(RawOrigin::Root, true)
+	}
+
+	#[benchmark]
+	fn migrate_supported_version() {
 		let old_version = XCM_VERSION - 1;
 		let loc = VersionedLocation::from(Location::from(Parent));
 		SupportedVersion::<T>::insert(old_version, loc, old_version);
-	}: {
-		crate::Pallet::<T>::check_xcm_version_change(VersionMigrationStage::MigrateSupportedVersion, Weight::zero());
+
+		#[block]
+		{
+			crate::Pallet::<T>::check_xcm_version_change(
+				VersionMigrationStage::MigrateSupportedVersion,
+				Weight::zero(),
+			);
+		}
 	}
 
-	migrate_version_notifiers {
+	#[benchmark]
+	fn migrate_version_notifiers() {
 		let old_version = XCM_VERSION - 1;
 		let loc = VersionedLocation::from(Location::from(Parent));
 		VersionNotifiers::<T>::insert(old_version, loc, 0);
-	}: {
-		crate::Pallet::<T>::check_xcm_version_change(VersionMigrationStage::MigrateVersionNotifiers, Weight::zero());
+
+		#[block]
+		{
+			crate::Pallet::<T>::check_xcm_version_change(
+				VersionMigrationStage::MigrateVersionNotifiers,
+				Weight::zero(),
+			);
+		}
 	}
 
-	already_notified_target {
-		let loc = T::reachable_dest().ok_or(
-			BenchmarkError::Override(BenchmarkResult::from_weight(T::DbWeight::get().reads(1))),
-		)?;
+	#[benchmark]
+	fn already_notified_target() -> Result<(), BenchmarkError> {
+		let loc = T::reachable_dest().ok_or(BenchmarkError::Override(
+			BenchmarkResult::from_weight(T::DbWeight::get().reads(1)),
+		))?;
 		let loc = VersionedLocation::from(loc);
 		let current_version = T::AdvertisedXcmVersion::get();
-		VersionNotifyTargets::<T>::insert(current_version, loc, (0, Weight::zero(), current_version));
-	}: {
-		crate::Pallet::<T>::check_xcm_version_change(VersionMigrationStage::NotifyCurrentTargets(None), Weight::zero());
+		VersionNotifyTargets::<T>::insert(
+			current_version,
+			loc,
+			(0, Weight::zero(), current_version),
+		);
+
+		#[block]
+		{
+			crate::Pallet::<T>::check_xcm_version_change(
+				VersionMigrationStage::NotifyCurrentTargets(None),
+				Weight::zero(),
+			);
+		}
+
+		Ok(())
 	}
 
-	notify_current_targets {
-		let loc = T::reachable_dest().ok_or(
-			BenchmarkError::Override(BenchmarkResult::from_weight(T::DbWeight::get().reads_writes(1, 3))),
-		)?;
+	#[benchmark]
+	fn notify_current_targets() -> Result<(), BenchmarkError> {
+		let loc = T::reachable_dest().ok_or(BenchmarkError::Override(
+			BenchmarkResult::from_weight(T::DbWeight::get().reads_writes(1, 3)),
+		))?;
 		let loc = VersionedLocation::from(loc);
 		let current_version = T::AdvertisedXcmVersion::get();
 		let old_version = current_version - 1;
 		VersionNotifyTargets::<T>::insert(current_version, loc, (0, Weight::zero(), old_version));
-	}: {
-		crate::Pallet::<T>::check_xcm_version_change(VersionMigrationStage::NotifyCurrentTargets(None), Weight::zero());
+
+		#[block]
+		{
+			crate::Pallet::<T>::check_xcm_version_change(
+				VersionMigrationStage::NotifyCurrentTargets(None),
+				Weight::zero(),
+			);
+		}
+
+		Ok(())
 	}
 
-	notify_target_migration_fail {
+	#[benchmark]
+	fn notify_target_migration_fail() {
 		let newer_xcm_version = xcm::prelude::XCM_VERSION;
 		let older_xcm_version = newer_xcm_version - 1;
-		let bad_location: Location = Plurality {
-			id: BodyId::Unit,
-			part: BodyPart::Voice,
-		}.into();
+		let bad_location: Location = Plurality { id: BodyId::Unit, part: BodyPart::Voice }.into();
 		let bad_location = VersionedLocation::from(bad_location)
 			.into_version(older_xcm_version)
 			.expect("Version convertion should work");
 		let current_version = T::AdvertisedXcmVersion::get();
-		VersionNotifyTargets::<T>::insert(current_version, bad_location, (0, Weight::zero(), current_version));
-	}: {
-		crate::Pallet::<T>::check_xcm_version_change(VersionMigrationStage::MigrateAndNotifyOldTargets, Weight::zero());
+		VersionNotifyTargets::<T>::insert(
+			current_version,
+			bad_location,
+			(0, Weight::zero(), current_version),
+		);
+
+		#[block]
+		{
+			crate::Pallet::<T>::check_xcm_version_change(
+				VersionMigrationStage::MigrateAndNotifyOldTargets,
+				Weight::zero(),
+			);
+		}
 	}
 
-	migrate_version_notify_targets {
+	#[benchmark]
+	fn migrate_version_notify_targets() {
 		let current_version = T::AdvertisedXcmVersion::get();
 		let old_version = current_version - 1;
 		let loc = VersionedLocation::from(Location::from(Parent));
 		VersionNotifyTargets::<T>::insert(old_version, loc, (0, Weight::zero(), current_version));
-	}: {
-		crate::Pallet::<T>::check_xcm_version_change(VersionMigrationStage::MigrateAndNotifyOldTargets, Weight::zero());
+
+		#[block]
+		{
+			crate::Pallet::<T>::check_xcm_version_change(
+				VersionMigrationStage::MigrateAndNotifyOldTargets,
+				Weight::zero(),
+			);
+		}
 	}
 
-	migrate_and_notify_old_targets {
-		let loc = T::reachable_dest().ok_or(
-			BenchmarkError::Override(BenchmarkResult::from_weight(T::DbWeight::get().reads_writes(1, 3))),
-		)?;
+	#[benchmark]
+	fn migrate_and_notify_old_targets() -> Result<(), BenchmarkError> {
+		let loc = T::reachable_dest().ok_or(BenchmarkError::Override(
+			BenchmarkResult::from_weight(T::DbWeight::get().reads_writes(1, 3)),
+		))?;
 		let loc = VersionedLocation::from(loc);
 		let old_version = T::AdvertisedXcmVersion::get() - 1;
 		VersionNotifyTargets::<T>::insert(old_version, loc, (0, Weight::zero(), old_version));
-	}: {
-		crate::Pallet::<T>::check_xcm_version_change(VersionMigrationStage::MigrateAndNotifyOldTargets, Weight::zero());
+
+		#[block]
+		{
+			crate::Pallet::<T>::check_xcm_version_change(
+				VersionMigrationStage::MigrateAndNotifyOldTargets,
+				Weight::zero(),
+			);
+		}
+
+		Ok(())
 	}
 
-	new_query {
+	#[benchmark]
+	fn new_query() {
 		let responder = Location::from(Parent);
 		let timeout = 1u32.into();
 		let match_querier = Location::from(Here);
-	}: {
-		crate::Pallet::<T>::new_query(responder, timeout, match_querier);
+
+		#[block]
+		{
+			crate::Pallet::<T>::new_query(responder, timeout, match_querier);
+		}
 	}
 
-	take_response {
+	#[benchmark]
+	fn take_response() {
 		let responder = Location::from(Parent);
 		let timeout = 1u32.into();
 		let match_querier = Location::from(Here);
 		let query_id = crate::Pallet::<T>::new_query(responder, timeout, match_querier);
-		let infos = (0 .. xcm::v3::MaxPalletsInfo::get()).map(|_| PalletInfo::new(
-			u32::MAX,
-			(0..xcm::v3::MaxPalletNameLen::get()).map(|_| 97u8).collect::<Vec<_>>().try_into().unwrap(),
-			(0..xcm::v3::MaxPalletNameLen::get()).map(|_| 97u8).collect::<Vec<_>>().try_into().unwrap(),
-			u32::MAX,
-			u32::MAX,
-			u32::MAX,
-		).unwrap()).collect::<Vec<_>>();
-		crate::Pallet::<T>::expect_response(query_id, Response::PalletsInfo(infos.try_into().unwrap()));
-	}: {
-		<crate::Pallet::<T> as QueryHandler>::take_response(query_id);
+		let infos = (0..xcm::v3::MaxPalletsInfo::get())
+			.map(|_| {
+				PalletInfo::new(
+					u32::MAX,
+					(0..xcm::v3::MaxPalletNameLen::get())
+						.map(|_| 97u8)
+						.collect::<Vec<_>>()
+						.try_into()
+						.unwrap(),
+					(0..xcm::v3::MaxPalletNameLen::get())
+						.map(|_| 97u8)
+						.collect::<Vec<_>>()
+						.try_into()
+						.unwrap(),
+					u32::MAX,
+					u32::MAX,
+					u32::MAX,
+				)
+				.unwrap()
+			})
+			.collect::<Vec<_>>();
+		crate::Pallet::<T>::expect_response(
+			query_id,
+			Response::PalletsInfo(infos.try_into().unwrap()),
+		);
+
+		#[block]
+		{
+			<crate::Pallet<T> as QueryHandler>::take_response(query_id);
+		}
 	}
 
-	claim_assets {
+	#[benchmark]
+	fn claim_assets() -> Result<(), BenchmarkError> {
 		let claim_origin = RawOrigin::Signed(whitelisted_caller());
-		let claim_location = T::ExecuteXcmOrigin::try_origin(claim_origin.clone().into()).map_err(|_| BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))?;
+		let claim_location = T::ExecuteXcmOrigin::try_origin(claim_origin.clone().into())
+			.map_err(|_| BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))?;
 		let asset: Asset = T::get_asset();
 		// Trap assets for claiming later
 		crate::Pallet::<T>::drop_assets(
 			&claim_location,
 			asset.clone().into(),
-			&XcmContext { origin: None, message_id: [0u8; 32], topic: None }
+			&XcmContext { origin: None, message_id: [0u8; 32], topic: None },
 		);
 		let versioned_assets = VersionedAssets::from(Assets::from(asset));
-	}: _<RuntimeOrigin<T>>(claim_origin.into(), Box::new(versioned_assets), Box::new(VersionedLocation::from(claim_location)))
+
+		#[extrinsic_call]
+		_(
+			claim_origin,
+			Box::new(versioned_assets),
+			Box::new(VersionedLocation::from(claim_location)),
+		);
+
+		Ok(())
+	}
 
 	impl_benchmark_test_suite!(
 		Pallet,
diff --git a/polkadot/xcm/procedural/Cargo.toml b/polkadot/xcm/procedural/Cargo.toml
index 88ed3c94ddf4..0843da86f038 100644
--- a/polkadot/xcm/procedural/Cargo.toml
+++ b/polkadot/xcm/procedural/Cargo.toml
@@ -16,10 +16,10 @@ workspace = true
 proc-macro = true
 
 [dependencies]
+Inflector = { workspace = true }
 proc-macro2 = { workspace = true }
 quote = { workspace = true }
 syn = { workspace = true }
-Inflector = { workspace = true }
 
 [dev-dependencies]
 trybuild = { features = ["diff"], workspace = true }
diff --git a/polkadot/xcm/xcm-builder/Cargo.toml b/polkadot/xcm/xcm-builder/Cargo.toml
index e64ab1928132..f75c984c068e 100644
--- a/polkadot/xcm/xcm-builder/Cargo.toml
+++ b/polkadot/xcm/xcm-builder/Cargo.toml
@@ -12,35 +12,35 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-impl-trait-for-tuples = { workspace = true }
 codec = { features = ["derive"], workspace = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
+impl-trait-for-tuples = { workspace = true }
+log = { workspace = true }
+pallet-asset-conversion = { workspace = true }
+pallet-transaction-payment = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
-xcm = { workspace = true }
-xcm-executor = { workspace = true }
 sp-arithmetic = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-weights = { workspace = true }
-frame-support = { workspace = true }
-frame-system = { workspace = true }
-pallet-transaction-payment = { workspace = true }
-pallet-asset-conversion = { workspace = true }
-log = { workspace = true }
+xcm = { workspace = true }
+xcm-executor = { workspace = true }
 
 # Polkadot dependencies
 polkadot-parachain-primitives = { workspace = true }
 
 [dev-dependencies]
-sp-core = { workspace = true, default-features = true }
-primitive-types = { features = ["codec", "num-traits", "scale-info"], workspace = true }
+assert_matches = { workspace = true }
+pallet-assets = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
-pallet-xcm = { workspace = true, default-features = true }
 pallet-salary = { workspace = true, default-features = true }
-pallet-assets = { workspace = true, default-features = true }
+pallet-xcm = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
 polkadot-runtime-parachains = { workspace = true, default-features = true }
-assert_matches = { workspace = true }
 polkadot-test-runtime = { workspace = true }
+primitive-types = { features = ["codec", "num-traits", "scale-info"], workspace = true }
+sp-core = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/xcm/xcm-executor/Cargo.toml b/polkadot/xcm/xcm-executor/Cargo.toml
index eb558c0fcc19..381dca54a5fb 100644
--- a/polkadot/xcm/xcm-executor/Cargo.toml
+++ b/polkadot/xcm/xcm-executor/Cargo.toml
@@ -12,19 +12,19 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-impl-trait-for-tuples = { workspace = true }
-environmental = { workspace = true }
 codec = { features = ["derive"], workspace = true }
+environmental = { workspace = true }
+frame-benchmarking = { optional = true, workspace = true }
+frame-support = { workspace = true }
+impl-trait-for-tuples = { workspace = true }
 scale-info = { features = ["derive", "serde"], workspace = true }
-xcm = { workspace = true }
-sp-io = { workspace = true }
 sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
+sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-weights = { workspace = true }
-frame-support = { workspace = true }
 tracing = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
+xcm = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/xcm/xcm-executor/integration-tests/Cargo.toml b/polkadot/xcm/xcm-executor/integration-tests/Cargo.toml
index a89dd74a44fa..6c2e56669bc3 100644
--- a/polkadot/xcm/xcm-executor/integration-tests/Cargo.toml
+++ b/polkadot/xcm/xcm-executor/integration-tests/Cargo.toml
@@ -15,21 +15,21 @@ codec = { workspace = true, default-features = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true, default-features = true }
 futures = { workspace = true }
-pallet-transaction-payment = { workspace = true, default-features = true }
 pallet-sudo = { workspace = true, default-features = true }
+pallet-transaction-payment = { workspace = true, default-features = true }
 pallet-xcm = { workspace = true, default-features = true }
 polkadot-runtime-parachains = { workspace = true, default-features = true }
 polkadot-test-client = { workspace = true }
 polkadot-test-runtime = { workspace = true }
 polkadot-test-service = { workspace = true }
 sp-consensus = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 sp-runtime = { workspace = true }
 sp-state-machine = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 xcm = { workspace = true }
 xcm-executor = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/xcm/xcm-runtime-apis/Cargo.toml b/polkadot/xcm/xcm-runtime-apis/Cargo.toml
index 9ada69a1933b..96afb10e5397 100644
--- a/polkadot/xcm/xcm-runtime-apis/Cargo.toml
+++ b/polkadot/xcm/xcm-runtime-apis/Cargo.toml
@@ -21,17 +21,17 @@ xcm = { workspace = true }
 xcm-executor = { workspace = true }
 
 [dev-dependencies]
+frame-executive = { workspace = true }
 frame-system = { workspace = true }
-sp-io = { workspace = true }
-xcm-builder = { workspace = true }
 hex-literal = { workspace = true }
-pallet-xcm = { workspace = true }
-pallet-balances = { workspace = true }
-pallet-assets = { workspace = true }
-xcm-executor = { workspace = true }
-frame-executive = { workspace = true }
 log = { workspace = true }
+pallet-assets = { workspace = true }
+pallet-balances = { workspace = true }
+pallet-xcm = { workspace = true }
+sp-io = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
+xcm-builder = { workspace = true }
+xcm-executor = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/xcm/xcm-simulator/Cargo.toml b/polkadot/xcm/xcm-simulator/Cargo.toml
index 47900e226d48..10c6f14bc8b9 100644
--- a/polkadot/xcm/xcm-simulator/Cargo.toml
+++ b/polkadot/xcm/xcm-simulator/Cargo.toml
@@ -13,19 +13,19 @@ workspace = true
 
 [dependencies]
 codec = { workspace = true, default-features = true }
-scale-info = { workspace = true }
 paste = { workspace = true, default-features = true }
+scale-info = { workspace = true }
 
 frame-support = { workspace = true, default-features = true }
 frame-system = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-sp-std = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+sp-std = { workspace = true, default-features = true }
 
-xcm = { workspace = true, default-features = true }
-xcm-executor = { workspace = true, default-features = true }
-xcm-builder = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-core-primitives = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 polkadot-runtime-parachains = { workspace = true, default-features = true }
+xcm = { workspace = true, default-features = true }
+xcm-builder = { workspace = true, default-features = true }
+xcm-executor = { workspace = true, default-features = true }
diff --git a/polkadot/xcm/xcm-simulator/example/Cargo.toml b/polkadot/xcm/xcm-simulator/example/Cargo.toml
index 43f36fc8991a..ccf0ecc39c4c 100644
--- a/polkadot/xcm/xcm-simulator/example/Cargo.toml
+++ b/polkadot/xcm/xcm-simulator/example/Cargo.toml
@@ -13,28 +13,28 @@ workspace = true
 
 [dependencies]
 codec = { workspace = true, default-features = true }
-scale-info = { features = ["derive"], workspace = true, default-features = true }
 log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true, default-features = true }
 
-frame-system = { workspace = true, default-features = true }
 frame-support = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
 pallet-message-queue = { workspace = true, default-features = true }
 pallet-uniques = { workspace = true, default-features = true }
-sp-std = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-std = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 
-xcm = { workspace = true, default-features = true }
-xcm-simulator = { workspace = true, default-features = true }
-xcm-executor = { workspace = true, default-features = true }
-xcm-builder = { workspace = true, default-features = true }
 pallet-xcm = { workspace = true, default-features = true }
 polkadot-core-primitives = { workspace = true, default-features = true }
-polkadot-runtime-parachains = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-runtime-parachains = { workspace = true, default-features = true }
+xcm = { workspace = true, default-features = true }
+xcm-builder = { workspace = true, default-features = true }
+xcm-executor = { workspace = true, default-features = true }
+xcm-simulator = { workspace = true, default-features = true }
 
 [features]
 default = []
diff --git a/polkadot/xcm/xcm-simulator/fuzzer/Cargo.toml b/polkadot/xcm/xcm-simulator/fuzzer/Cargo.toml
index a2e36db95ba6..62a047975c87 100644
--- a/polkadot/xcm/xcm-simulator/fuzzer/Cargo.toml
+++ b/polkadot/xcm/xcm-simulator/fuzzer/Cargo.toml
@@ -11,30 +11,30 @@ publish = false
 workspace = true
 
 [dependencies]
+arbitrary = { workspace = true }
 codec = { workspace = true, default-features = true }
 honggfuzz = { workspace = true }
-arbitrary = { workspace = true }
 scale-info = { features = ["derive"], workspace = true, default-features = true }
 
-frame-system = { workspace = true, default-features = true }
-frame-support = { workspace = true, default-features = true }
 frame-executive = { workspace = true, default-features = true }
+frame-support = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
 frame-try-runtime = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
 pallet-message-queue = { workspace = true, default-features = true }
-sp-std = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-std = { workspace = true, default-features = true }
 
-xcm = { workspace = true, default-features = true }
-xcm-simulator = { workspace = true, default-features = true }
-xcm-executor = { workspace = true, default-features = true }
-xcm-builder = { workspace = true, default-features = true }
 pallet-xcm = { workspace = true, default-features = true }
 polkadot-core-primitives = { workspace = true, default-features = true }
-polkadot-runtime-parachains = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-runtime-parachains = { workspace = true, default-features = true }
+xcm = { workspace = true, default-features = true }
+xcm-builder = { workspace = true, default-features = true }
+xcm-executor = { workspace = true, default-features = true }
+xcm-simulator = { workspace = true, default-features = true }
 
 [features]
 try-runtime = [
diff --git a/polkadot/zombienet-sdk-tests/Cargo.toml b/polkadot/zombienet-sdk-tests/Cargo.toml
index 4eac7af49f8a..120857c9a42e 100644
--- a/polkadot/zombienet-sdk-tests/Cargo.toml
+++ b/polkadot/zombienet-sdk-tests/Cargo.toml
@@ -8,16 +8,16 @@ license.workspace = true
 publish = false
 
 [dependencies]
+anyhow = { workspace = true }
+codec = { workspace = true, features = ["derive"] }
 env_logger = { workspace = true }
 log = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 subxt = { workspace = true, features = ["substrate-compat"] }
 subxt-signer = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread"] }
-anyhow = { workspace = true }
 zombienet-sdk = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-codec = { workspace = true, features = ["derive"] }
 
 [features]
 zombie-metadata = []
diff --git a/polkadot/zombienet-sdk-tests/build.rs b/polkadot/zombienet-sdk-tests/build.rs
index 240d86386af2..f7a62a53a8ac 100644
--- a/polkadot/zombienet-sdk-tests/build.rs
+++ b/polkadot/zombienet-sdk-tests/build.rs
@@ -25,39 +25,47 @@ fn make_env_key(k: &str) -> String {
 	replace_dashes(&k.to_ascii_uppercase())
 }
 
+fn wasm_sub_path(chain: &str) -> String {
+	let (package, runtime_name) =
+		if let Some(cumulus_test_runtime) = chain.strip_prefix("cumulus-test-runtime-") {
+			(
+				"cumulus-test-runtime".to_string(),
+				format!("wasm_binary_{}.rs", replace_dashes(cumulus_test_runtime)),
+			)
+		} else {
+			(format!("{chain}-runtime"), replace_dashes(&format!("{chain}-runtime")))
+		};
+
+	format!("{}/{}.wasm", package, runtime_name)
+}
+
 fn find_wasm(chain: &str) -> Option<PathBuf> {
 	const PROFILES: [&str; 2] = ["release", "testnet"];
 	let manifest_path = env::var("CARGO_WORKSPACE_ROOT_DIR").unwrap();
 	let manifest_path = manifest_path.strip_suffix('/').unwrap();
 	debug_output!("manifest_path is  : {}", manifest_path);
-	let package = format!("{chain}-runtime");
+
+	let sub_path = wasm_sub_path(chain);
+
 	let profile = PROFILES.into_iter().find(|p| {
-		let full_path = format!(
-			"{}/target/{}/wbuild/{}/{}.wasm",
-			manifest_path,
-			p,
-			&package,
-			replace_dashes(&package)
-		);
+		let full_path = format!("{}/target/{}/wbuild/{}", manifest_path, p, sub_path);
 		debug_output!("checking wasm at : {}", full_path);
 		matches!(path::PathBuf::from(&full_path).try_exists(), Ok(true))
 	});
 
 	debug_output!("profile is : {:?}", profile);
 	profile.map(|profile| {
-		PathBuf::from(&format!(
-			"{}/target/{}/wbuild/{}/{}.wasm",
-			manifest_path,
-			profile,
-			&package,
-			replace_dashes(&package)
-		))
+		PathBuf::from(&format!("{}/target/{}/wbuild/{}", manifest_path, profile, sub_path))
 	})
 }
 
 // based on https://gist.github.com/s0me0ne-unkn0wn/bbd83fe32ce10327086adbf13e750eec
 fn build_wasm(chain: &str) -> PathBuf {
-	let package = format!("{chain}-runtime");
+	let package = if chain.starts_with("cumulus-test-runtime-") {
+		String::from("cumulus-test-runtime")
+	} else {
+		format!("{chain}-runtime")
+	};
 
 	let cargo = env::var("CARGO").unwrap();
 	let target = env::var("TARGET").unwrap();
@@ -81,11 +89,7 @@ fn build_wasm(chain: &str) -> PathBuf {
 		.status()
 		.unwrap();
 
-	let wasm_path = &format!(
-		"{target_dir}/{target}/release/wbuild/{}/{}.wasm",
-		&package,
-		replace_dashes(&package)
-	);
+	let wasm_path = &format!("{target_dir}/{target}/release/wbuild/{}", wasm_sub_path(chain));
 	PathBuf::from(wasm_path)
 }
 
@@ -128,6 +132,10 @@ fn main() {
 	const METADATA_DIR: &str = "metadata-files";
 	const CHAINS: [&str; 2] = ["rococo", "coretime-rococo"];
 
+	// Add some cumulus test runtimes if needed. Formatted like
+	// "cumulus-test-runtime-elastic-scaling".
+	const CUMULUS_TEST_RUNTIMES: [&str; 0] = [];
+
 	let metadata_path = format!("{manifest_path}/{METADATA_DIR}");
 
 	for chain in CHAINS {
@@ -145,6 +153,21 @@ fn main() {
 		};
 	}
 
+	for chain in CUMULUS_TEST_RUNTIMES {
+		let full_path = format!("{metadata_path}/{chain}-local.scale");
+		let output_path = path::PathBuf::from(&full_path);
+
+		match output_path.try_exists() {
+			Ok(true) => {
+				debug_output!("got: {}", full_path);
+			},
+			_ => {
+				debug_output!("needs: {}", full_path);
+				fetch_metadata_file(chain, &output_path);
+			},
+		};
+	}
+
 	substrate_build_script_utils::generate_cargo_keys();
 	substrate_build_script_utils::rerun_if_git_head_changed();
 	println!("cargo:rerun-if-changed={}", metadata_path);
diff --git a/polkadot/zombienet-sdk-tests/tests/elastic_scaling/helpers.rs b/polkadot/zombienet-sdk-tests/tests/elastic_scaling/helpers.rs
new file mode 100644
index 000000000000..7d4ad4a1dd8b
--- /dev/null
+++ b/polkadot/zombienet-sdk-tests/tests/elastic_scaling/helpers.rs
@@ -0,0 +1,60 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+use super::rococo;
+use std::{collections::HashMap, ops::Range};
+use subxt::{OnlineClient, PolkadotConfig};
+
+// Helper function for asserting the throughput of parachains (total number of backed candidates in
+// a window of relay chain blocks), after the first session change.
+pub async fn assert_para_throughput(
+	relay_client: &OnlineClient<PolkadotConfig>,
+	stop_at: u32,
+	expected_candidate_ranges: HashMap<u32, Range<u32>>,
+) -> Result<(), anyhow::Error> {
+	let mut blocks_sub = relay_client.blocks().subscribe_finalized().await?;
+	let mut candidate_count: HashMap<u32, u32> = HashMap::new();
+	let mut current_block_count = 0;
+	let mut had_first_session_change = false;
+
+	while let Some(block) = blocks_sub.next().await {
+		let block = block?;
+		log::debug!("Finalized relay chain block {}", block.number());
+		let events = block.events().await?;
+		let is_session_change = events.has::<rococo::session::events::NewSession>()?;
+
+		if !had_first_session_change && is_session_change {
+			had_first_session_change = true;
+		}
+
+		if had_first_session_change && !is_session_change {
+			current_block_count += 1;
+
+			for event in events.find::<rococo::para_inclusion::events::CandidateBacked>() {
+				*(candidate_count.entry(event?.0.descriptor.para_id.0).or_default()) += 1;
+			}
+		}
+
+		if current_block_count == stop_at {
+			break;
+		}
+	}
+
+	log::info!(
+		"Reached {} finalized relay chain blocks that contain backed candidates. The per-parachain distribution is: {:#?}",
+		stop_at,
+		candidate_count
+	);
+
+	for (para_id, expected_candidate_range) in expected_candidate_ranges {
+		let actual = candidate_count
+			.get(&para_id)
+			.expect("ParaId did not have any backed candidates");
+		assert!(
+			expected_candidate_range.contains(actual),
+			"Candidate count {actual} not within range {expected_candidate_range:?}"
+		);
+	}
+
+	Ok(())
+}
diff --git a/polkadot/zombienet-sdk-tests/tests/elastic_scaling/mod.rs b/polkadot/zombienet-sdk-tests/tests/elastic_scaling/mod.rs
new file mode 100644
index 000000000000..bb296a419df1
--- /dev/null
+++ b/polkadot/zombienet-sdk-tests/tests/elastic_scaling/mod.rs
@@ -0,0 +1,8 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+#[subxt::subxt(runtime_metadata_path = "metadata-files/rococo-local.scale")]
+pub mod rococo {}
+
+mod helpers;
+mod slot_based_3cores;
diff --git a/polkadot/zombienet-sdk-tests/tests/elastic_scaling/slot_based_3cores.rs b/polkadot/zombienet-sdk-tests/tests/elastic_scaling/slot_based_3cores.rs
new file mode 100644
index 000000000000..41ec1250ecc4
--- /dev/null
+++ b/polkadot/zombienet-sdk-tests/tests/elastic_scaling/slot_based_3cores.rs
@@ -0,0 +1,166 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Test that parachains that use a single slot-based collator with elastic scaling MVP and with
+// elastic scaling with RFC103 can achieve full throughput of 3 candidates per block.
+
+use anyhow::anyhow;
+
+use super::{
+	helpers::assert_para_throughput,
+	rococo,
+	rococo::runtime_types::{
+		pallet_broker::coretime_interface::CoreAssignment,
+		polkadot_runtime_parachains::assigner_coretime::PartsOf57600,
+	},
+};
+use serde_json::json;
+use subxt::{OnlineClient, PolkadotConfig};
+use subxt_signer::sr25519::dev;
+use zombienet_sdk::NetworkConfigBuilder;
+
+#[tokio::test(flavor = "multi_thread")]
+async fn slot_based_3cores_test() -> Result<(), anyhow::Error> {
+	let _ = env_logger::try_init_from_env(
+		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
+	);
+
+	let images = zombienet_sdk::environment::get_images_from_env();
+
+	let config = NetworkConfigBuilder::new()
+		.with_relaychain(|r| {
+			let r = r
+				.with_chain("rococo-local")
+				.with_default_command("polkadot")
+				.with_default_image(images.polkadot.as_str())
+				.with_default_args(vec![("-lparachain=debug").into()])
+				.with_genesis_overrides(json!({
+					"configuration": {
+						"config": {
+							"scheduler_params": {
+								// Num cores is 4, because 2 extra will be added automatically when registering the paras.
+								"num_cores": 4,
+								"max_validators_per_core": 2
+							},
+							"async_backing_params": {
+								"max_candidate_depth": 6,
+								"allowed_ancestry_len": 2
+							}
+						}
+					}
+				}))
+				// Have to set a `with_node` outside of the loop below, so that `r` has the right
+				// type.
+				.with_node(|node| node.with_name("validator-0"));
+
+			(1..12)
+				.fold(r, |acc, i| acc.with_node(|node| node.with_name(&format!("validator-{i}"))))
+		})
+		.with_parachain(|p| {
+			// Para 2100 uses the old elastic scaling mvp, which doesn't send the new UMP signal
+			// commitment for selecting the core index.
+			p.with_id(2100)
+				.with_default_command("test-parachain")
+				.with_default_image(images.cumulus.as_str())
+				.with_chain("elastic-scaling-mvp")
+				.with_default_args(vec![("--experimental-use-slot-based").into()])
+				.with_default_args(vec![
+					("--experimental-use-slot-based").into(),
+					("-lparachain=debug,aura=debug").into(),
+				])
+				.with_collator(|n| n.with_name("collator-elastic-mvp"))
+		})
+		.with_parachain(|p| {
+			// Para 2200 uses the new RFC103-enabled collator which sends the UMP signal commitment
+			// for selecting the core index
+			p.with_id(2200)
+				.with_default_command("test-parachain")
+				.with_default_image(images.cumulus.as_str())
+				.with_chain("elastic-scaling")
+				.with_default_args(vec![
+					("--experimental-use-slot-based").into(),
+					("-lparachain=debug,aura=debug").into(),
+				])
+				.with_collator(|n| n.with_name("collator-elastic"))
+		})
+		.build()
+		.map_err(|e| {
+			let errs = e.into_iter().map(|e| e.to_string()).collect::<Vec<_>>().join(" ");
+			anyhow!("config errs: {errs}")
+		})?;
+
+	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let network = spawn_fn(config).await?;
+
+	let relay_node = network.get_node("validator-0")?;
+
+	let relay_client: OnlineClient<PolkadotConfig> = relay_node.wait_client().await?;
+	let alice = dev::alice();
+
+	// Assign two extra cores to each parachain.
+	relay_client
+		.tx()
+		.sign_and_submit_then_watch_default(
+			&rococo::tx()
+				.sudo()
+				.sudo(rococo::runtime_types::rococo_runtime::RuntimeCall::Utility(
+					rococo::runtime_types::pallet_utility::pallet::Call::batch {
+						calls: vec![
+							rococo::runtime_types::rococo_runtime::RuntimeCall::Coretime(
+								rococo::runtime_types::polkadot_runtime_parachains::coretime::pallet::Call::assign_core {
+									core: 0,
+									begin: 0,
+									assignment: vec![(CoreAssignment::Task(2100), PartsOf57600(57600))],
+									end_hint: None
+								}
+							),
+							rococo::runtime_types::rococo_runtime::RuntimeCall::Coretime(
+								rococo::runtime_types::polkadot_runtime_parachains::coretime::pallet::Call::assign_core {
+									core: 1,
+									begin: 0,
+									assignment: vec![(CoreAssignment::Task(2100), PartsOf57600(57600))],
+									end_hint: None
+								}
+							),
+							rococo::runtime_types::rococo_runtime::RuntimeCall::Coretime(
+								rococo::runtime_types::polkadot_runtime_parachains::coretime::pallet::Call::assign_core {
+									core: 2,
+									begin: 0,
+									assignment: vec![(CoreAssignment::Task(2200), PartsOf57600(57600))],
+									end_hint: None
+								}
+							),
+							rococo::runtime_types::rococo_runtime::RuntimeCall::Coretime(
+								rococo::runtime_types::polkadot_runtime_parachains::coretime::pallet::Call::assign_core {
+									core: 3,
+									begin: 0,
+									assignment: vec![(CoreAssignment::Task(2200), PartsOf57600(57600))],
+									end_hint: None
+								}
+							)
+						],
+					},
+				)),
+			&alice,
+		)
+		.await?
+		.wait_for_finalized_success()
+		.await?;
+
+	log::info!("2 more cores assigned to each parachain");
+
+	// Expect a backed candidate count of at least 39 for each parachain in 15 relay chain blocks
+	// (2.6 candidates per para per relay chain block).
+	// Note that only blocks after the first session change and blocks that don't contain a session
+	// change will be counted.
+	assert_para_throughput(
+		&relay_client,
+		15,
+		[(2100, 39..46), (2200, 39..46)].into_iter().collect(),
+	)
+	.await?;
+
+	log::info!("Test finished successfully");
+
+	Ok(())
+}
diff --git a/polkadot/zombienet-sdk-tests/tests/lib.rs b/polkadot/zombienet-sdk-tests/tests/lib.rs
index 74cdc0765600..977e0f90b1c9 100644
--- a/polkadot/zombienet-sdk-tests/tests/lib.rs
+++ b/polkadot/zombienet-sdk-tests/tests/lib.rs
@@ -1,4 +1,7 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
+#[cfg(feature = "zombie-metadata")]
+mod elastic_scaling;
+#[cfg(feature = "zombie-metadata")]
 mod smoke;
diff --git a/polkadot/zombienet-sdk-tests/tests/smoke/coretime_revenue.rs b/polkadot/zombienet-sdk-tests/tests/smoke/coretime_revenue.rs
index 7880dc782d05..2da2436a1111 100644
--- a/polkadot/zombienet-sdk-tests/tests/smoke/coretime_revenue.rs
+++ b/polkadot/zombienet-sdk-tests/tests/smoke/coretime_revenue.rs
@@ -180,7 +180,7 @@ where
 
 #[tokio::test(flavor = "multi_thread")]
 async fn coretime_revenue_test() -> Result<(), anyhow::Error> {
-	env_logger::init_from_env(
+	let _ = env_logger::try_init_from_env(
 		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
 	);
 
@@ -499,7 +499,7 @@ async fn coretime_revenue_test() -> Result<(), anyhow::Error> {
 
 	assert_total_issuance(relay_client.clone(), para_client.clone(), total_issuance).await;
 
-	log::info!("Test finished successfuly");
+	log::info!("Test finished successfully");
 
 	Ok(())
 }
diff --git a/polkadot/zombienet-sdk-tests/tests/smoke/mod.rs b/polkadot/zombienet-sdk-tests/tests/smoke/mod.rs
index a3fe15382674..072a9d54ecda 100644
--- a/polkadot/zombienet-sdk-tests/tests/smoke/mod.rs
+++ b/polkadot/zombienet-sdk-tests/tests/smoke/mod.rs
@@ -1,5 +1,4 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
-#[cfg(feature = "zombie-metadata")]
 mod coretime_revenue;
diff --git a/prdoc/pr_4273.prdoc b/prdoc/pr_4273.prdoc
new file mode 100644
index 000000000000..1ff0a5782a41
--- /dev/null
+++ b/prdoc/pr_4273.prdoc
@@ -0,0 +1,19 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: "[pallet-broker] add extrinsic to reserve a system core without having to wait two sale boundaries"
+
+doc:
+  - audience: Runtime User
+    description: |
+      When calling the reserve extrinsic after sales have started, the assignment will be reserved,
+      but two sale period boundaries must pass before the core is actually assigned. A new
+      `force_reserve` extrinsic is introduced to allow a core to be immediately assigned.
+
+crates:
+  - name: pallet-broker
+    bump: major
+  - name: coretime-rococo-runtime
+    bump: patch
+  - name: coretime-westend-runtime
+    bump: patch
diff --git a/prdoc/pr_6248.prdoc b/prdoc/pr_6248.prdoc
new file mode 100644
index 000000000000..71fb0891cac6
--- /dev/null
+++ b/prdoc/pr_6248.prdoc
@@ -0,0 +1,16 @@
+title: Upgrade libp2p to 0.54.1
+
+doc:
+  - audience: [Node Dev, Node Operator]
+    description: |
+      Upgrade libp2p from 0.52.4 to 0.54.1
+
+crates:
+  - name: sc-network
+    bump: major
+  - name: sc-network-types
+    bump: minor
+  - name: sc-network-sync
+    bump: patch
+  - name: sc-telemetry
+    bump: minor
diff --git a/prdoc/pr_6446.prdoc b/prdoc/pr_6446.prdoc
new file mode 100644
index 000000000000..3bfe7d0c7a60
--- /dev/null
+++ b/prdoc/pr_6446.prdoc
@@ -0,0 +1,16 @@
+title: Make pallet-recovery supports `BlockNumberProvider`
+doc:
+- audience: Runtime Dev
+  description: |-
+      pallet-recovery now allows configuring the block provider to be utilized within this pallet. This block is employed for the delay in the recovery process.
+
+      A new associated type has been introduced in the `Config` trait: `BlockNumberProvider`. This can be assigned to `System` to maintain the previous behavior, or it can be set to another block number provider, such as `RelayChain`.
+
+      If the block provider is configured with a value different from `System`, a migration will be necessary for the `Recoverable` and `ActiveRecoveries` storage items.
+crates:
+- name: rococo-runtime
+  bump: major
+- name: westend-runtime
+  bump: major
+- name: pallet-recovery
+  bump: major
diff --git a/prdoc/pr_6452.prdoc b/prdoc/pr_6452.prdoc
new file mode 100644
index 000000000000..f2cb69875e95
--- /dev/null
+++ b/prdoc/pr_6452.prdoc
@@ -0,0 +1,16 @@
+title: "elastic scaling RFC 103 end-to-end tests"
+
+doc:
+  - audience: [Node Dev, Runtime Dev]
+    description: |
+      Adds end-to-end zombienet-sdk tests for elastic scaling using the RFC103 implementation.
+      Only notable user-facing change is that the default chain configurations of westend and rococo
+      now enable by default the CandidateReceiptV2 node feature.
+
+crates:
+  - name: westend-runtime
+    bump: patch
+  - name: rococo-runtime
+    bump: patch
+  - name: rococo-parachain-runtime
+    bump: patch
diff --git a/prdoc/pr_6533.prdoc b/prdoc/pr_6533.prdoc
new file mode 100644
index 000000000000..eb72a97db0f8
--- /dev/null
+++ b/prdoc/pr_6533.prdoc
@@ -0,0 +1,20 @@
+title: "Migrate executor into PolkaVM 0.18.0"
+doc:
+  - audience: Runtime Dev
+    description: |
+      Bump `polkavm` to 0.18.0, and update `sc-polkavm-executor` to be
+      compatible with the API changes. In addition, bump also `polkavm-derive`
+      and `polkavm-linker` in order to make sure that the all parts of the
+      Polkadot SDK use the exact same ABI for `.polkavm` binaries.
+
+      Purely relying on RV32E/RV64E ABI is not possible, as PolkaVM uses a
+      RISCV-V alike ISA, which is derived from RV32E/RV64E but it is still its
+      own microarchitecture, i.e. not fully binary compatible.
+
+crates:
+  - name: sc-executor-common
+    bump: major
+  - name: sc-executor-polkavm
+    bump: minor
+  - name: substrate-wasm-builder
+    bump: minor
diff --git a/prdoc/pr_6880.prdoc b/prdoc/pr_6880.prdoc
new file mode 100644
index 000000000000..9d59382f0e0b
--- /dev/null
+++ b/prdoc/pr_6880.prdoc
@@ -0,0 +1,14 @@
+title: '[pallet-revive] implement the call data copy API'
+doc:
+- audience: Runtime Dev
+  description: |-
+    This PR implements the call data copy API by adjusting the input method.
+
+    Closes #6770
+crates:
+- name: pallet-revive-fixtures
+  bump: major
+- name: pallet-revive
+  bump: major
+- name: pallet-revive-uapi
+  bump: major
\ No newline at end of file
diff --git a/prdoc/pr_6889.prdoc b/prdoc/pr_6889.prdoc
new file mode 100644
index 000000000000..01edd49b685a
--- /dev/null
+++ b/prdoc/pr_6889.prdoc
@@ -0,0 +1,13 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: Remove polkadot-omni-node-lib unused dependency 
+
+doc:
+  - audience: Node Dev
+    description: 
+      Removed an unused dependency for `polkadot-omni-node-lib`.
+
+crates:
+  - name: polkadot-omni-node-lib
+    bump: patch
diff --git a/prdoc/pr_6896.prdoc b/prdoc/pr_6896.prdoc
new file mode 100644
index 000000000000..a56e4303d9af
--- /dev/null
+++ b/prdoc/pr_6896.prdoc
@@ -0,0 +1,16 @@
+title: 'pallet-revive: Fix docs.rs'
+doc:
+- audience: Runtime Dev
+  description: |-
+    - Fixed failing docs.rs build for `pallet-revive-uapi` by fixing a writing attribute in the manifest (we were using `default-target` instead of `targets`)
+    - Removed the macros defining host functions because the cfg attributes introduced in #6866 won't work on them
+    - Added an docs.rs specific attribute so that the `unstable-hostfn` feature tag will show up on the functions that are guarded behind it.
+crates:
+- name: pallet-contracts-uapi
+  bump: major
+- name: pallet-revive-uapi
+  bump: major
+- name: pallet-revive-fixtures
+  bump: major
+- name: pallet-revive-proc-macro
+  bump: major
diff --git a/prdoc/pr_6908.prdoc b/prdoc/pr_6908.prdoc
new file mode 100644
index 000000000000..0be9e613f88a
--- /dev/null
+++ b/prdoc/pr_6908.prdoc
@@ -0,0 +1,12 @@
+title: '[pallet-revive] implement the ref_time_left API'
+doc:
+- audience: Runtime Dev
+  description: This PR implements the ref_time_left API method. Solidity knows only
+    a single "gas" dimension; Solidity contracts will use this to query the gas left.
+crates:
+- name: pallet-revive-fixtures
+  bump: minor
+- name: pallet-revive
+  bump: minor
+- name: pallet-revive-uapi
+  bump: minor
diff --git a/prdoc/pr_6917.prdoc b/prdoc/pr_6917.prdoc
new file mode 100644
index 000000000000..dd7f59b95126
--- /dev/null
+++ b/prdoc/pr_6917.prdoc
@@ -0,0 +1,14 @@
+title: Remove unused dependencies from pallet_revive
+doc:
+- audience: Runtime Dev
+  description: Removing apparently unused dependencies from `pallet_revive` and related
+    crates.
+crates:
+- name: pallet-revive
+  bump: major
+- name: pallet-revive-fixtures
+  bump: major
+- name: pallet-revive-mock-network
+  bump: major
+- name: pallet-revive-eth-rpc
+  bump: major
diff --git a/prdoc/pr_6920.prdoc b/prdoc/pr_6920.prdoc
new file mode 100644
index 000000000000..d80a77e0a71f
--- /dev/null
+++ b/prdoc/pr_6920.prdoc
@@ -0,0 +1,14 @@
+title: '[pallet-revive] change some getter APIs to return value in register'
+doc:
+- audience: Runtime Dev
+  description: Call data, return data and code sizes can never exceed `u32::MAX`;
+    they are also not generic. Hence we know that they are guaranteed to always fit
+    into a 64bit register and `revive` can just zero extend them into a 256bit integer
+    value. Which is slightly more efficient than passing them on the stack.
+crates:
+- name: pallet-revive-fixtures
+  bump: major
+- name: pallet-revive
+  bump: major
+- name: pallet-revive-uapi
+  bump: major
diff --git a/prdoc/pr_6923.prdoc b/prdoc/pr_6923.prdoc
new file mode 100644
index 000000000000..5d88d7158e7f
--- /dev/null
+++ b/prdoc/pr_6923.prdoc
@@ -0,0 +1,12 @@
+title: 'omni-node: Tolerate failing metadata check'
+doc:
+- audience: Node Operator
+  description: |-
+    #6450 introduced metadata checks. Supported are metadata v14 and higher.
+
+    However, of course old chain-specs have a genesis code blob that might be on older version. This needs to be tolerated. We should just skip the checks in that case.
+
+    Fixes #6921
+crates:
+- name: polkadot-omni-node-lib
+  bump: patch
diff --git a/prdoc/pr_6926.prdoc b/prdoc/pr_6926.prdoc
new file mode 100644
index 000000000000..788d6c110873
--- /dev/null
+++ b/prdoc/pr_6926.prdoc
@@ -0,0 +1,13 @@
+title: '[pallet-revive] implement the gas limit API'
+doc:
+- audience: Runtime Dev
+  description: This PR implements the gas limit API, returning the maximum ref_time
+    per block. Solidity contracts only know a single weight dimension and can use
+    this method to get the block ref_time limit.
+crates:
+- name: pallet-revive-fixtures
+  bump: major
+- name: pallet-revive
+  bump: major
+- name: pallet-revive-uapi
+  bump: major
diff --git a/prdoc/pr_6928.prdoc b/prdoc/pr_6928.prdoc
new file mode 100644
index 000000000000..4b9023ab03a6
--- /dev/null
+++ b/prdoc/pr_6928.prdoc
@@ -0,0 +1,34 @@
+title: '[Backport] Version bumps and `prdocs` reordering form 2412'
+doc:
+- audience: Runtime Dev
+  description: This PR includes backport of the regular version bumps and `prdocs`
+    reordering from the `stable2412` branch back ro master
+crates:
+- name: polkadot-node-primitives
+  bump: none
+- name: asset-hub-rococo-runtime
+  bump: none
+- name: bridge-hub-rococo-runtime
+  bump: none
+- name: bridge-hub-westend-runtime
+  bump: none
+- name: collectives-westend-runtime
+  bump: none
+- name: contracts-rococo-runtime
+  bump: none
+- name: coretime-rococo-runtime
+  bump: none
+- name: coretime-westend-runtime
+  bump: none
+- name: glutton-westend-runtime
+  bump: none
+- name: people-rococo-runtime
+  bump: none
+- name: people-westend-runtime
+  bump: none
+- name: rococo-runtime
+  bump: none
+- name: westend-runtime
+  bump: none
+- name: asset-hub-westend-runtime
+  bump: none
diff --git a/prdoc/pr_6937.prdoc b/prdoc/pr_6937.prdoc
new file mode 100644
index 000000000000..5c6806df0b5c
--- /dev/null
+++ b/prdoc/pr_6937.prdoc
@@ -0,0 +1,12 @@
+title: '[pallet-revive] bump polkavm to 0.18'
+doc:
+- audience: Runtime Dev
+  description: Update to the latest polkavm version, containing a linker fix I need
+    for revive.
+crates:
+- name: pallet-revive
+  bump: patch
+- name: pallet-revive-fixtures
+  bump: patch
+- name: pallet-revive-uapi
+  bump: patch
diff --git a/prdoc/pr_6954.prdoc b/prdoc/pr_6954.prdoc
new file mode 100644
index 000000000000..8e8faf5fffd2
--- /dev/null
+++ b/prdoc/pr_6954.prdoc
@@ -0,0 +1,13 @@
+title: '[pallet-revive] implement the gas price API'
+doc:
+- audience: Runtime Dev
+  description: This PR implements the EVM gas price syscall API method. Currently
+    this is a compile time constant in revive, but in the EVM it is an opcode. Thus
+    we should provide an opcode for this in the pallet.
+crates:
+- name: pallet-revive-fixtures
+  bump: minor
+- name: pallet-revive
+  bump: minor
+- name: pallet-revive-uapi
+  bump: minor
diff --git a/prdoc/pr_6963.prdoc b/prdoc/pr_6963.prdoc
new file mode 100644
index 000000000000..7657349277b3
--- /dev/null
+++ b/prdoc/pr_6963.prdoc
@@ -0,0 +1,10 @@
+title: 'grandpa: Ensure `WarpProof` stays in its limits'
+doc:
+- audience: Node Dev
+  description: |-
+    There was the chance that a `WarpProof` was bigger than the maximum warp sync proof size. This could have happened when inserting the last justification, which then may pushed the total proof size above the maximum. The solution is simply to ensure that the last justfication also fits into the limits.
+
+    Close: https://github.com/paritytech/polkadot-sdk/issues/6957
+crates:
+- name: sc-consensus-grandpa
+  bump: patch
diff --git a/prdoc/pr_6964.prdoc b/prdoc/pr_6964.prdoc
new file mode 100644
index 000000000000..3a88fa72e963
--- /dev/null
+++ b/prdoc/pr_6964.prdoc
@@ -0,0 +1,15 @@
+title: '[pallet-revive] implement the base fee API'
+doc:
+- audience: Runtime Dev
+  description: This PR implements the base fee syscall API method. Currently this
+    is implemented as a compile time constant in the revive compiler, returning 0.
+    However, since this is an opocde, if we ever need to implement it for compatibility
+    reasons with [EIP-1559](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1559.md),
+    it would break already deployed contracts. Thus we provide a syscall method instead.
+crates:
+- name: pallet-revive-fixtures
+  bump: minor
+- name: pallet-revive
+  bump: minor
+- name: pallet-revive-uapi
+  bump: minor
diff --git a/prdoc/pr_6979.prdoc b/prdoc/pr_6979.prdoc
new file mode 100644
index 000000000000..fae7feeec2df
--- /dev/null
+++ b/prdoc/pr_6979.prdoc
@@ -0,0 +1,8 @@
+title: Update prometheus binding failure logging format
+doc:
+- audience: Node Dev
+  description: |-
+    Using `{:#?}` for the error details is a bit annoying, this change makes a more consistent formatting style for error messages.
+crates:
+- name: substrate-prometheus-endpoint
+  bump: patch
diff --git a/prdoc/pr_6989.prdoc b/prdoc/pr_6989.prdoc
new file mode 100644
index 000000000000..86c56698d41e
--- /dev/null
+++ b/prdoc/pr_6989.prdoc
@@ -0,0 +1,10 @@
+title: 'paras-registrar: Improve error reporting'
+doc:
+- audience: Runtime User
+  description: |-
+    This pr improves the error reporting by paras registrar when an owner wants to access a locked parachain.
+
+    Closes: https://github.com/paritytech/polkadot-sdk/issues/6745
+crates:
+- name: polkadot-runtime-common
+  bump: patch
diff --git a/prdoc/pr_3151.prdoc b/prdoc/stable2412/pr_3151.prdoc
similarity index 100%
rename from prdoc/pr_3151.prdoc
rename to prdoc/stable2412/pr_3151.prdoc
diff --git a/prdoc/pr_3685.prdoc b/prdoc/stable2412/pr_3685.prdoc
similarity index 100%
rename from prdoc/pr_3685.prdoc
rename to prdoc/stable2412/pr_3685.prdoc
diff --git a/prdoc/pr_3881.prdoc b/prdoc/stable2412/pr_3881.prdoc
similarity index 100%
rename from prdoc/pr_3881.prdoc
rename to prdoc/stable2412/pr_3881.prdoc
diff --git a/prdoc/pr_3970.prdoc b/prdoc/stable2412/pr_3970.prdoc
similarity index 100%
rename from prdoc/pr_3970.prdoc
rename to prdoc/stable2412/pr_3970.prdoc
diff --git a/prdoc/pr_4012.prdoc b/prdoc/stable2412/pr_4012.prdoc
similarity index 100%
rename from prdoc/pr_4012.prdoc
rename to prdoc/stable2412/pr_4012.prdoc
diff --git a/prdoc/pr_4251.prdoc b/prdoc/stable2412/pr_4251.prdoc
similarity index 100%
rename from prdoc/pr_4251.prdoc
rename to prdoc/stable2412/pr_4251.prdoc
diff --git a/prdoc/pr_4257.prdoc b/prdoc/stable2412/pr_4257.prdoc
similarity index 100%
rename from prdoc/pr_4257.prdoc
rename to prdoc/stable2412/pr_4257.prdoc
diff --git a/prdoc/pr_4639.prdoc b/prdoc/stable2412/pr_4639.prdoc
similarity index 100%
rename from prdoc/pr_4639.prdoc
rename to prdoc/stable2412/pr_4639.prdoc
diff --git a/prdoc/pr_4826.prdoc b/prdoc/stable2412/pr_4826.prdoc
similarity index 100%
rename from prdoc/pr_4826.prdoc
rename to prdoc/stable2412/pr_4826.prdoc
diff --git a/prdoc/pr_4834.prdoc b/prdoc/stable2412/pr_4834.prdoc
similarity index 100%
rename from prdoc/pr_4834.prdoc
rename to prdoc/stable2412/pr_4834.prdoc
diff --git a/prdoc/pr_4837.prdoc b/prdoc/stable2412/pr_4837.prdoc
similarity index 100%
rename from prdoc/pr_4837.prdoc
rename to prdoc/stable2412/pr_4837.prdoc
diff --git a/prdoc/pr_4846.prdoc b/prdoc/stable2412/pr_4846.prdoc
similarity index 100%
rename from prdoc/pr_4846.prdoc
rename to prdoc/stable2412/pr_4846.prdoc
diff --git a/prdoc/pr_4849.prdoc b/prdoc/stable2412/pr_4849.prdoc
similarity index 100%
rename from prdoc/pr_4849.prdoc
rename to prdoc/stable2412/pr_4849.prdoc
diff --git a/prdoc/pr_4851.prdoc b/prdoc/stable2412/pr_4851.prdoc
similarity index 100%
rename from prdoc/pr_4851.prdoc
rename to prdoc/stable2412/pr_4851.prdoc
diff --git a/prdoc/pr_4889.prdoc b/prdoc/stable2412/pr_4889.prdoc
similarity index 100%
rename from prdoc/pr_4889.prdoc
rename to prdoc/stable2412/pr_4889.prdoc
diff --git a/prdoc/pr_4974.prdoc b/prdoc/stable2412/pr_4974.prdoc
similarity index 100%
rename from prdoc/pr_4974.prdoc
rename to prdoc/stable2412/pr_4974.prdoc
diff --git a/prdoc/pr_4982.prdoc b/prdoc/stable2412/pr_4982.prdoc
similarity index 100%
rename from prdoc/pr_4982.prdoc
rename to prdoc/stable2412/pr_4982.prdoc
diff --git a/prdoc/pr_5038.prdoc b/prdoc/stable2412/pr_5038.prdoc
similarity index 100%
rename from prdoc/pr_5038.prdoc
rename to prdoc/stable2412/pr_5038.prdoc
diff --git a/prdoc/pr_5194.prdoc b/prdoc/stable2412/pr_5194.prdoc
similarity index 100%
rename from prdoc/pr_5194.prdoc
rename to prdoc/stable2412/pr_5194.prdoc
diff --git a/prdoc/pr_5198.prdoc b/prdoc/stable2412/pr_5198.prdoc
similarity index 100%
rename from prdoc/pr_5198.prdoc
rename to prdoc/stable2412/pr_5198.prdoc
diff --git a/prdoc/pr_5201.prdoc b/prdoc/stable2412/pr_5201.prdoc
similarity index 100%
rename from prdoc/pr_5201.prdoc
rename to prdoc/stable2412/pr_5201.prdoc
diff --git a/prdoc/pr_5274.prdoc b/prdoc/stable2412/pr_5274.prdoc
similarity index 100%
rename from prdoc/pr_5274.prdoc
rename to prdoc/stable2412/pr_5274.prdoc
diff --git a/prdoc/pr_5311.prdoc b/prdoc/stable2412/pr_5311.prdoc
similarity index 100%
rename from prdoc/pr_5311.prdoc
rename to prdoc/stable2412/pr_5311.prdoc
diff --git a/prdoc/pr_5322.prdoc b/prdoc/stable2412/pr_5322.prdoc
similarity index 100%
rename from prdoc/pr_5322.prdoc
rename to prdoc/stable2412/pr_5322.prdoc
diff --git a/prdoc/pr_5343.prdoc b/prdoc/stable2412/pr_5343.prdoc
similarity index 100%
rename from prdoc/pr_5343.prdoc
rename to prdoc/stable2412/pr_5343.prdoc
diff --git a/prdoc/pr_5372.prdoc b/prdoc/stable2412/pr_5372.prdoc
similarity index 100%
rename from prdoc/pr_5372.prdoc
rename to prdoc/stable2412/pr_5372.prdoc
diff --git a/prdoc/pr_5390.prdoc b/prdoc/stable2412/pr_5390.prdoc
similarity index 100%
rename from prdoc/pr_5390.prdoc
rename to prdoc/stable2412/pr_5390.prdoc
diff --git a/prdoc/pr_5420.prdoc b/prdoc/stable2412/pr_5420.prdoc
similarity index 100%
rename from prdoc/pr_5420.prdoc
rename to prdoc/stable2412/pr_5420.prdoc
diff --git a/prdoc/pr_5423.prdoc b/prdoc/stable2412/pr_5423.prdoc
similarity index 100%
rename from prdoc/pr_5423.prdoc
rename to prdoc/stable2412/pr_5423.prdoc
diff --git a/prdoc/pr_5435.prdoc b/prdoc/stable2412/pr_5435.prdoc
similarity index 100%
rename from prdoc/pr_5435.prdoc
rename to prdoc/stable2412/pr_5435.prdoc
diff --git a/prdoc/pr_5461.prdoc b/prdoc/stable2412/pr_5461.prdoc
similarity index 100%
rename from prdoc/pr_5461.prdoc
rename to prdoc/stable2412/pr_5461.prdoc
diff --git a/prdoc/pr_5469.prdoc b/prdoc/stable2412/pr_5469.prdoc
similarity index 100%
rename from prdoc/pr_5469.prdoc
rename to prdoc/stable2412/pr_5469.prdoc
diff --git a/prdoc/pr_5502.prdoc b/prdoc/stable2412/pr_5502.prdoc
similarity index 100%
rename from prdoc/pr_5502.prdoc
rename to prdoc/stable2412/pr_5502.prdoc
diff --git a/prdoc/pr_5515.prdoc b/prdoc/stable2412/pr_5515.prdoc
similarity index 100%
rename from prdoc/pr_5515.prdoc
rename to prdoc/stable2412/pr_5515.prdoc
diff --git a/prdoc/pr_5521.prdoc b/prdoc/stable2412/pr_5521.prdoc
similarity index 100%
rename from prdoc/pr_5521.prdoc
rename to prdoc/stable2412/pr_5521.prdoc
diff --git a/prdoc/pr_5526.prdoc b/prdoc/stable2412/pr_5526.prdoc
similarity index 100%
rename from prdoc/pr_5526.prdoc
rename to prdoc/stable2412/pr_5526.prdoc
diff --git a/prdoc/pr_5540.prdoc b/prdoc/stable2412/pr_5540.prdoc
similarity index 100%
rename from prdoc/pr_5540.prdoc
rename to prdoc/stable2412/pr_5540.prdoc
diff --git a/prdoc/pr_5548.prdoc b/prdoc/stable2412/pr_5548.prdoc
similarity index 100%
rename from prdoc/pr_5548.prdoc
rename to prdoc/stable2412/pr_5548.prdoc
diff --git a/prdoc/pr_5554.prdoc b/prdoc/stable2412/pr_5554.prdoc
similarity index 100%
rename from prdoc/pr_5554.prdoc
rename to prdoc/stable2412/pr_5554.prdoc
diff --git a/prdoc/pr_5555.prdoc b/prdoc/stable2412/pr_5555.prdoc
similarity index 100%
rename from prdoc/pr_5555.prdoc
rename to prdoc/stable2412/pr_5555.prdoc
diff --git a/prdoc/pr_5556.prdoc b/prdoc/stable2412/pr_5556.prdoc
similarity index 100%
rename from prdoc/pr_5556.prdoc
rename to prdoc/stable2412/pr_5556.prdoc
diff --git a/prdoc/pr_5572.prdoc b/prdoc/stable2412/pr_5572.prdoc
similarity index 100%
rename from prdoc/pr_5572.prdoc
rename to prdoc/stable2412/pr_5572.prdoc
diff --git a/prdoc/pr_5585.prdoc b/prdoc/stable2412/pr_5585.prdoc
similarity index 100%
rename from prdoc/pr_5585.prdoc
rename to prdoc/stable2412/pr_5585.prdoc
diff --git a/prdoc/pr_5592.prdoc b/prdoc/stable2412/pr_5592.prdoc
similarity index 100%
rename from prdoc/pr_5592.prdoc
rename to prdoc/stable2412/pr_5592.prdoc
diff --git a/prdoc/pr_5601.prdoc b/prdoc/stable2412/pr_5601.prdoc
similarity index 100%
rename from prdoc/pr_5601.prdoc
rename to prdoc/stable2412/pr_5601.prdoc
diff --git a/prdoc/pr_5606.prdoc b/prdoc/stable2412/pr_5606.prdoc
similarity index 100%
rename from prdoc/pr_5606.prdoc
rename to prdoc/stable2412/pr_5606.prdoc
diff --git a/prdoc/pr_5608.prdoc b/prdoc/stable2412/pr_5608.prdoc
similarity index 100%
rename from prdoc/pr_5608.prdoc
rename to prdoc/stable2412/pr_5608.prdoc
diff --git a/prdoc/pr_5609.prdoc b/prdoc/stable2412/pr_5609.prdoc
similarity index 100%
rename from prdoc/pr_5609.prdoc
rename to prdoc/stable2412/pr_5609.prdoc
diff --git a/prdoc/pr_5616.prdoc b/prdoc/stable2412/pr_5616.prdoc
similarity index 100%
rename from prdoc/pr_5616.prdoc
rename to prdoc/stable2412/pr_5616.prdoc
diff --git a/prdoc/pr_5623.prdoc b/prdoc/stable2412/pr_5623.prdoc
similarity index 100%
rename from prdoc/pr_5623.prdoc
rename to prdoc/stable2412/pr_5623.prdoc
diff --git a/prdoc/pr_5630.prdoc b/prdoc/stable2412/pr_5630.prdoc
similarity index 100%
rename from prdoc/pr_5630.prdoc
rename to prdoc/stable2412/pr_5630.prdoc
diff --git a/prdoc/pr_5635.prdoc b/prdoc/stable2412/pr_5635.prdoc
similarity index 100%
rename from prdoc/pr_5635.prdoc
rename to prdoc/stable2412/pr_5635.prdoc
diff --git a/prdoc/pr_5640.prdoc b/prdoc/stable2412/pr_5640.prdoc
similarity index 100%
rename from prdoc/pr_5640.prdoc
rename to prdoc/stable2412/pr_5640.prdoc
diff --git a/prdoc/pr_5664.prdoc b/prdoc/stable2412/pr_5664.prdoc
similarity index 100%
rename from prdoc/pr_5664.prdoc
rename to prdoc/stable2412/pr_5664.prdoc
diff --git a/prdoc/pr_5665.prdoc b/prdoc/stable2412/pr_5665.prdoc
similarity index 100%
rename from prdoc/pr_5665.prdoc
rename to prdoc/stable2412/pr_5665.prdoc
diff --git a/prdoc/pr_5666.prdoc b/prdoc/stable2412/pr_5666.prdoc
similarity index 100%
rename from prdoc/pr_5666.prdoc
rename to prdoc/stable2412/pr_5666.prdoc
diff --git a/prdoc/pr_5675.prdoc b/prdoc/stable2412/pr_5675.prdoc
similarity index 100%
rename from prdoc/pr_5675.prdoc
rename to prdoc/stable2412/pr_5675.prdoc
diff --git a/prdoc/pr_5676.prdoc b/prdoc/stable2412/pr_5676.prdoc
similarity index 100%
rename from prdoc/pr_5676.prdoc
rename to prdoc/stable2412/pr_5676.prdoc
diff --git a/prdoc/pr_5679.prdoc b/prdoc/stable2412/pr_5679.prdoc
similarity index 100%
rename from prdoc/pr_5679.prdoc
rename to prdoc/stable2412/pr_5679.prdoc
diff --git a/prdoc/pr_5682.prdoc b/prdoc/stable2412/pr_5682.prdoc
similarity index 100%
rename from prdoc/pr_5682.prdoc
rename to prdoc/stable2412/pr_5682.prdoc
diff --git a/prdoc/pr_5684.prdoc b/prdoc/stable2412/pr_5684.prdoc
similarity index 100%
rename from prdoc/pr_5684.prdoc
rename to prdoc/stable2412/pr_5684.prdoc
diff --git a/prdoc/pr_5686.prdoc b/prdoc/stable2412/pr_5686.prdoc
similarity index 100%
rename from prdoc/pr_5686.prdoc
rename to prdoc/stable2412/pr_5686.prdoc
diff --git a/prdoc/pr_5687.prdoc b/prdoc/stable2412/pr_5687.prdoc
similarity index 100%
rename from prdoc/pr_5687.prdoc
rename to prdoc/stable2412/pr_5687.prdoc
diff --git a/prdoc/pr_5693.prdoc b/prdoc/stable2412/pr_5693.prdoc
similarity index 100%
rename from prdoc/pr_5693.prdoc
rename to prdoc/stable2412/pr_5693.prdoc
diff --git a/prdoc/pr_5701.prdoc b/prdoc/stable2412/pr_5701.prdoc
similarity index 100%
rename from prdoc/pr_5701.prdoc
rename to prdoc/stable2412/pr_5701.prdoc
diff --git a/prdoc/pr_5707.prdoc b/prdoc/stable2412/pr_5707.prdoc
similarity index 100%
rename from prdoc/pr_5707.prdoc
rename to prdoc/stable2412/pr_5707.prdoc
diff --git a/prdoc/pr_5716.prdoc b/prdoc/stable2412/pr_5716.prdoc
similarity index 100%
rename from prdoc/pr_5716.prdoc
rename to prdoc/stable2412/pr_5716.prdoc
diff --git a/prdoc/pr_5726.prdoc b/prdoc/stable2412/pr_5726.prdoc
similarity index 100%
rename from prdoc/pr_5726.prdoc
rename to prdoc/stable2412/pr_5726.prdoc
diff --git a/prdoc/pr_5732.prdoc b/prdoc/stable2412/pr_5732.prdoc
similarity index 100%
rename from prdoc/pr_5732.prdoc
rename to prdoc/stable2412/pr_5732.prdoc
diff --git a/prdoc/pr_5737.prdoc b/prdoc/stable2412/pr_5737.prdoc
similarity index 100%
rename from prdoc/pr_5737.prdoc
rename to prdoc/stable2412/pr_5737.prdoc
diff --git a/prdoc/pr_5741.prdoc b/prdoc/stable2412/pr_5741.prdoc
similarity index 100%
rename from prdoc/pr_5741.prdoc
rename to prdoc/stable2412/pr_5741.prdoc
diff --git a/prdoc/pr_5743.prdoc b/prdoc/stable2412/pr_5743.prdoc
similarity index 100%
rename from prdoc/pr_5743.prdoc
rename to prdoc/stable2412/pr_5743.prdoc
diff --git a/prdoc/pr_5745.prdoc b/prdoc/stable2412/pr_5745.prdoc
similarity index 100%
rename from prdoc/pr_5745.prdoc
rename to prdoc/stable2412/pr_5745.prdoc
diff --git a/prdoc/pr_5756.prdoc b/prdoc/stable2412/pr_5756.prdoc
similarity index 100%
rename from prdoc/pr_5756.prdoc
rename to prdoc/stable2412/pr_5756.prdoc
diff --git a/prdoc/pr_5762.prdoc b/prdoc/stable2412/pr_5762.prdoc
similarity index 100%
rename from prdoc/pr_5762.prdoc
rename to prdoc/stable2412/pr_5762.prdoc
diff --git a/prdoc/pr_5765.prdoc b/prdoc/stable2412/pr_5765.prdoc
similarity index 100%
rename from prdoc/pr_5765.prdoc
rename to prdoc/stable2412/pr_5765.prdoc
diff --git a/prdoc/pr_5768.prdoc b/prdoc/stable2412/pr_5768.prdoc
similarity index 100%
rename from prdoc/pr_5768.prdoc
rename to prdoc/stable2412/pr_5768.prdoc
diff --git a/prdoc/pr_5774.prdoc b/prdoc/stable2412/pr_5774.prdoc
similarity index 100%
rename from prdoc/pr_5774.prdoc
rename to prdoc/stable2412/pr_5774.prdoc
diff --git a/prdoc/pr_5779.prdoc b/prdoc/stable2412/pr_5779.prdoc
similarity index 100%
rename from prdoc/pr_5779.prdoc
rename to prdoc/stable2412/pr_5779.prdoc
diff --git a/prdoc/pr_5787.prdoc b/prdoc/stable2412/pr_5787.prdoc
similarity index 100%
rename from prdoc/pr_5787.prdoc
rename to prdoc/stable2412/pr_5787.prdoc
diff --git a/prdoc/pr_5789.prdoc b/prdoc/stable2412/pr_5789.prdoc
similarity index 100%
rename from prdoc/pr_5789.prdoc
rename to prdoc/stable2412/pr_5789.prdoc
diff --git a/prdoc/pr_5796.prdoc b/prdoc/stable2412/pr_5796.prdoc
similarity index 100%
rename from prdoc/pr_5796.prdoc
rename to prdoc/stable2412/pr_5796.prdoc
diff --git a/prdoc/pr_5804.prdoc b/prdoc/stable2412/pr_5804.prdoc
similarity index 100%
rename from prdoc/pr_5804.prdoc
rename to prdoc/stable2412/pr_5804.prdoc
diff --git a/prdoc/pr_5807.prdoc b/prdoc/stable2412/pr_5807.prdoc
similarity index 100%
rename from prdoc/pr_5807.prdoc
rename to prdoc/stable2412/pr_5807.prdoc
diff --git a/prdoc/pr_5811.prdoc b/prdoc/stable2412/pr_5811.prdoc
similarity index 100%
rename from prdoc/pr_5811.prdoc
rename to prdoc/stable2412/pr_5811.prdoc
diff --git a/prdoc/pr_5813.prdoc b/prdoc/stable2412/pr_5813.prdoc
similarity index 100%
rename from prdoc/pr_5813.prdoc
rename to prdoc/stable2412/pr_5813.prdoc
diff --git a/prdoc/pr_5824.prdoc b/prdoc/stable2412/pr_5824.prdoc
similarity index 100%
rename from prdoc/pr_5824.prdoc
rename to prdoc/stable2412/pr_5824.prdoc
diff --git a/prdoc/pr_5830.prdoc b/prdoc/stable2412/pr_5830.prdoc
similarity index 100%
rename from prdoc/pr_5830.prdoc
rename to prdoc/stable2412/pr_5830.prdoc
diff --git a/prdoc/pr_5838.prdoc b/prdoc/stable2412/pr_5838.prdoc
similarity index 100%
rename from prdoc/pr_5838.prdoc
rename to prdoc/stable2412/pr_5838.prdoc
diff --git a/prdoc/pr_5839.prdoc b/prdoc/stable2412/pr_5839.prdoc
similarity index 100%
rename from prdoc/pr_5839.prdoc
rename to prdoc/stable2412/pr_5839.prdoc
diff --git a/prdoc/pr_5845.prdoc b/prdoc/stable2412/pr_5845.prdoc
similarity index 100%
rename from prdoc/pr_5845.prdoc
rename to prdoc/stable2412/pr_5845.prdoc
diff --git a/prdoc/pr_5847.prdoc b/prdoc/stable2412/pr_5847.prdoc
similarity index 100%
rename from prdoc/pr_5847.prdoc
rename to prdoc/stable2412/pr_5847.prdoc
diff --git a/prdoc/pr_5856.prdoc b/prdoc/stable2412/pr_5856.prdoc
similarity index 100%
rename from prdoc/pr_5856.prdoc
rename to prdoc/stable2412/pr_5856.prdoc
diff --git a/prdoc/pr_5857.prdoc b/prdoc/stable2412/pr_5857.prdoc
similarity index 100%
rename from prdoc/pr_5857.prdoc
rename to prdoc/stable2412/pr_5857.prdoc
diff --git a/prdoc/pr_5859.prdoc b/prdoc/stable2412/pr_5859.prdoc
similarity index 100%
rename from prdoc/pr_5859.prdoc
rename to prdoc/stable2412/pr_5859.prdoc
diff --git a/prdoc/pr_5861.prdoc b/prdoc/stable2412/pr_5861.prdoc
similarity index 100%
rename from prdoc/pr_5861.prdoc
rename to prdoc/stable2412/pr_5861.prdoc
diff --git a/prdoc/pr_5866.prdoc b/prdoc/stable2412/pr_5866.prdoc
similarity index 100%
rename from prdoc/pr_5866.prdoc
rename to prdoc/stable2412/pr_5866.prdoc
diff --git a/prdoc/pr_5872.prdoc b/prdoc/stable2412/pr_5872.prdoc
similarity index 100%
rename from prdoc/pr_5872.prdoc
rename to prdoc/stable2412/pr_5872.prdoc
diff --git a/prdoc/pr_5875.prdoc b/prdoc/stable2412/pr_5875.prdoc
similarity index 100%
rename from prdoc/pr_5875.prdoc
rename to prdoc/stable2412/pr_5875.prdoc
diff --git a/prdoc/pr_5876.prdoc b/prdoc/stable2412/pr_5876.prdoc
similarity index 100%
rename from prdoc/pr_5876.prdoc
rename to prdoc/stable2412/pr_5876.prdoc
diff --git a/prdoc/pr_5880.prdoc b/prdoc/stable2412/pr_5880.prdoc
similarity index 100%
rename from prdoc/pr_5880.prdoc
rename to prdoc/stable2412/pr_5880.prdoc
diff --git a/prdoc/pr_5883.prdoc b/prdoc/stable2412/pr_5883.prdoc
similarity index 100%
rename from prdoc/pr_5883.prdoc
rename to prdoc/stable2412/pr_5883.prdoc
diff --git a/prdoc/pr_5886.prdoc b/prdoc/stable2412/pr_5886.prdoc
similarity index 100%
rename from prdoc/pr_5886.prdoc
rename to prdoc/stable2412/pr_5886.prdoc
diff --git a/prdoc/pr_5888.prdoc b/prdoc/stable2412/pr_5888.prdoc
similarity index 100%
rename from prdoc/pr_5888.prdoc
rename to prdoc/stable2412/pr_5888.prdoc
diff --git a/prdoc/pr_5891.prdoc b/prdoc/stable2412/pr_5891.prdoc
similarity index 100%
rename from prdoc/pr_5891.prdoc
rename to prdoc/stable2412/pr_5891.prdoc
diff --git a/prdoc/pr_5892.prdoc b/prdoc/stable2412/pr_5892.prdoc
similarity index 100%
rename from prdoc/pr_5892.prdoc
rename to prdoc/stable2412/pr_5892.prdoc
diff --git a/prdoc/pr_5901.prdoc b/prdoc/stable2412/pr_5901.prdoc
similarity index 100%
rename from prdoc/pr_5901.prdoc
rename to prdoc/stable2412/pr_5901.prdoc
diff --git a/prdoc/pr_5908.prdoc b/prdoc/stable2412/pr_5908.prdoc
similarity index 100%
rename from prdoc/pr_5908.prdoc
rename to prdoc/stable2412/pr_5908.prdoc
diff --git a/prdoc/pr_5911.prdoc b/prdoc/stable2412/pr_5911.prdoc
similarity index 100%
rename from prdoc/pr_5911.prdoc
rename to prdoc/stable2412/pr_5911.prdoc
diff --git a/prdoc/pr_5915.prdoc b/prdoc/stable2412/pr_5915.prdoc
similarity index 100%
rename from prdoc/pr_5915.prdoc
rename to prdoc/stable2412/pr_5915.prdoc
diff --git a/prdoc/pr_5917.prdoc b/prdoc/stable2412/pr_5917.prdoc
similarity index 100%
rename from prdoc/pr_5917.prdoc
rename to prdoc/stable2412/pr_5917.prdoc
diff --git a/prdoc/pr_5919.prdoc b/prdoc/stable2412/pr_5919.prdoc
similarity index 100%
rename from prdoc/pr_5919.prdoc
rename to prdoc/stable2412/pr_5919.prdoc
diff --git a/prdoc/pr_5924.prdoc b/prdoc/stable2412/pr_5924.prdoc
similarity index 100%
rename from prdoc/pr_5924.prdoc
rename to prdoc/stable2412/pr_5924.prdoc
diff --git a/prdoc/pr_5939.prdoc b/prdoc/stable2412/pr_5939.prdoc
similarity index 100%
rename from prdoc/pr_5939.prdoc
rename to prdoc/stable2412/pr_5939.prdoc
diff --git a/prdoc/pr_5941.prdoc b/prdoc/stable2412/pr_5941.prdoc
similarity index 100%
rename from prdoc/pr_5941.prdoc
rename to prdoc/stable2412/pr_5941.prdoc
diff --git a/prdoc/pr_5946.prdoc b/prdoc/stable2412/pr_5946.prdoc
similarity index 100%
rename from prdoc/pr_5946.prdoc
rename to prdoc/stable2412/pr_5946.prdoc
diff --git a/prdoc/pr_5954.prdoc b/prdoc/stable2412/pr_5954.prdoc
similarity index 100%
rename from prdoc/pr_5954.prdoc
rename to prdoc/stable2412/pr_5954.prdoc
diff --git a/prdoc/pr_5961.prdoc b/prdoc/stable2412/pr_5961.prdoc
similarity index 100%
rename from prdoc/pr_5961.prdoc
rename to prdoc/stable2412/pr_5961.prdoc
diff --git a/prdoc/pr_5971.prdoc b/prdoc/stable2412/pr_5971.prdoc
similarity index 100%
rename from prdoc/pr_5971.prdoc
rename to prdoc/stable2412/pr_5971.prdoc
diff --git a/prdoc/pr_5984.prdoc b/prdoc/stable2412/pr_5984.prdoc
similarity index 100%
rename from prdoc/pr_5984.prdoc
rename to prdoc/stable2412/pr_5984.prdoc
diff --git a/prdoc/pr_5994.prdoc b/prdoc/stable2412/pr_5994.prdoc
similarity index 100%
rename from prdoc/pr_5994.prdoc
rename to prdoc/stable2412/pr_5994.prdoc
diff --git a/prdoc/pr_5995.prdoc b/prdoc/stable2412/pr_5995.prdoc
similarity index 100%
rename from prdoc/pr_5995.prdoc
rename to prdoc/stable2412/pr_5995.prdoc
diff --git a/prdoc/pr_5997.prdoc b/prdoc/stable2412/pr_5997.prdoc
similarity index 100%
rename from prdoc/pr_5997.prdoc
rename to prdoc/stable2412/pr_5997.prdoc
diff --git a/prdoc/pr_5998.prdoc b/prdoc/stable2412/pr_5998.prdoc
similarity index 100%
rename from prdoc/pr_5998.prdoc
rename to prdoc/stable2412/pr_5998.prdoc
diff --git a/prdoc/pr_5999.prdoc b/prdoc/stable2412/pr_5999.prdoc
similarity index 100%
rename from prdoc/pr_5999.prdoc
rename to prdoc/stable2412/pr_5999.prdoc
diff --git a/prdoc/pr_6011.prdoc b/prdoc/stable2412/pr_6011.prdoc
similarity index 100%
rename from prdoc/pr_6011.prdoc
rename to prdoc/stable2412/pr_6011.prdoc
diff --git a/prdoc/pr_6015.prdoc b/prdoc/stable2412/pr_6015.prdoc
similarity index 100%
rename from prdoc/pr_6015.prdoc
rename to prdoc/stable2412/pr_6015.prdoc
diff --git a/prdoc/pr_6016.prdoc b/prdoc/stable2412/pr_6016.prdoc
similarity index 100%
rename from prdoc/pr_6016.prdoc
rename to prdoc/stable2412/pr_6016.prdoc
diff --git a/prdoc/pr_6022.prdoc b/prdoc/stable2412/pr_6022.prdoc
similarity index 100%
rename from prdoc/pr_6022.prdoc
rename to prdoc/stable2412/pr_6022.prdoc
diff --git a/prdoc/pr_6023.prdoc b/prdoc/stable2412/pr_6023.prdoc
similarity index 100%
rename from prdoc/pr_6023.prdoc
rename to prdoc/stable2412/pr_6023.prdoc
diff --git a/prdoc/pr_6025.prdoc b/prdoc/stable2412/pr_6025.prdoc
similarity index 100%
rename from prdoc/pr_6025.prdoc
rename to prdoc/stable2412/pr_6025.prdoc
diff --git a/prdoc/pr_6027.prdoc b/prdoc/stable2412/pr_6027.prdoc
similarity index 100%
rename from prdoc/pr_6027.prdoc
rename to prdoc/stable2412/pr_6027.prdoc
diff --git a/prdoc/pr_6032.prdoc b/prdoc/stable2412/pr_6032.prdoc
similarity index 100%
rename from prdoc/pr_6032.prdoc
rename to prdoc/stable2412/pr_6032.prdoc
diff --git a/prdoc/pr_6039.prdoc b/prdoc/stable2412/pr_6039.prdoc
similarity index 100%
rename from prdoc/pr_6039.prdoc
rename to prdoc/stable2412/pr_6039.prdoc
diff --git a/prdoc/pr_6045.prdoc b/prdoc/stable2412/pr_6045.prdoc
similarity index 100%
rename from prdoc/pr_6045.prdoc
rename to prdoc/stable2412/pr_6045.prdoc
diff --git a/prdoc/pr_6058.prdoc b/prdoc/stable2412/pr_6058.prdoc
similarity index 100%
rename from prdoc/pr_6058.prdoc
rename to prdoc/stable2412/pr_6058.prdoc
diff --git a/prdoc/pr_6061.prdoc b/prdoc/stable2412/pr_6061.prdoc
similarity index 100%
rename from prdoc/pr_6061.prdoc
rename to prdoc/stable2412/pr_6061.prdoc
diff --git a/prdoc/pr_6073.prdoc b/prdoc/stable2412/pr_6073.prdoc
similarity index 100%
rename from prdoc/pr_6073.prdoc
rename to prdoc/stable2412/pr_6073.prdoc
diff --git a/prdoc/pr_6077.prdoc b/prdoc/stable2412/pr_6077.prdoc
similarity index 100%
rename from prdoc/pr_6077.prdoc
rename to prdoc/stable2412/pr_6077.prdoc
diff --git a/prdoc/pr_6080.prdoc b/prdoc/stable2412/pr_6080.prdoc
similarity index 100%
rename from prdoc/pr_6080.prdoc
rename to prdoc/stable2412/pr_6080.prdoc
diff --git a/prdoc/pr_6087.prdoc b/prdoc/stable2412/pr_6087.prdoc
similarity index 100%
rename from prdoc/pr_6087.prdoc
rename to prdoc/stable2412/pr_6087.prdoc
diff --git a/prdoc/pr_6088.prdoc b/prdoc/stable2412/pr_6088.prdoc
similarity index 100%
rename from prdoc/pr_6088.prdoc
rename to prdoc/stable2412/pr_6088.prdoc
diff --git a/prdoc/pr_6094.prdoc b/prdoc/stable2412/pr_6094.prdoc
similarity index 100%
rename from prdoc/pr_6094.prdoc
rename to prdoc/stable2412/pr_6094.prdoc
diff --git a/prdoc/pr_6096.prdoc b/prdoc/stable2412/pr_6096.prdoc
similarity index 100%
rename from prdoc/pr_6096.prdoc
rename to prdoc/stable2412/pr_6096.prdoc
diff --git a/prdoc/pr_6104.prdoc b/prdoc/stable2412/pr_6104.prdoc
similarity index 100%
rename from prdoc/pr_6104.prdoc
rename to prdoc/stable2412/pr_6104.prdoc
diff --git a/prdoc/pr_6105.prdoc b/prdoc/stable2412/pr_6105.prdoc
similarity index 100%
rename from prdoc/pr_6105.prdoc
rename to prdoc/stable2412/pr_6105.prdoc
diff --git a/prdoc/pr_6129.prdoc b/prdoc/stable2412/pr_6129.prdoc
similarity index 100%
rename from prdoc/pr_6129.prdoc
rename to prdoc/stable2412/pr_6129.prdoc
diff --git a/prdoc/pr_6141.prdoc b/prdoc/stable2412/pr_6141.prdoc
similarity index 100%
rename from prdoc/pr_6141.prdoc
rename to prdoc/stable2412/pr_6141.prdoc
diff --git a/prdoc/pr_6147.prdoc b/prdoc/stable2412/pr_6147.prdoc
similarity index 100%
rename from prdoc/pr_6147.prdoc
rename to prdoc/stable2412/pr_6147.prdoc
diff --git a/prdoc/pr_6148.prdoc b/prdoc/stable2412/pr_6148.prdoc
similarity index 100%
rename from prdoc/pr_6148.prdoc
rename to prdoc/stable2412/pr_6148.prdoc
diff --git a/prdoc/pr_6156.prdoc b/prdoc/stable2412/pr_6156.prdoc
similarity index 100%
rename from prdoc/pr_6156.prdoc
rename to prdoc/stable2412/pr_6156.prdoc
diff --git a/prdoc/pr_6169.prdoc b/prdoc/stable2412/pr_6169.prdoc
similarity index 100%
rename from prdoc/pr_6169.prdoc
rename to prdoc/stable2412/pr_6169.prdoc
diff --git a/prdoc/pr_6171.prdoc b/prdoc/stable2412/pr_6171.prdoc
similarity index 100%
rename from prdoc/pr_6171.prdoc
rename to prdoc/stable2412/pr_6171.prdoc
diff --git a/prdoc/pr_6174.prdoc b/prdoc/stable2412/pr_6174.prdoc
similarity index 100%
rename from prdoc/pr_6174.prdoc
rename to prdoc/stable2412/pr_6174.prdoc
diff --git a/prdoc/pr_6187.prdoc b/prdoc/stable2412/pr_6187.prdoc
similarity index 100%
rename from prdoc/pr_6187.prdoc
rename to prdoc/stable2412/pr_6187.prdoc
diff --git a/prdoc/pr_6192.prdoc b/prdoc/stable2412/pr_6192.prdoc
similarity index 100%
rename from prdoc/pr_6192.prdoc
rename to prdoc/stable2412/pr_6192.prdoc
diff --git a/prdoc/pr_6205.prdoc b/prdoc/stable2412/pr_6205.prdoc
similarity index 100%
rename from prdoc/pr_6205.prdoc
rename to prdoc/stable2412/pr_6205.prdoc
diff --git a/prdoc/pr_6212.prdoc b/prdoc/stable2412/pr_6212.prdoc
similarity index 100%
rename from prdoc/pr_6212.prdoc
rename to prdoc/stable2412/pr_6212.prdoc
diff --git a/prdoc/pr_6214.prdoc b/prdoc/stable2412/pr_6214.prdoc
similarity index 100%
rename from prdoc/pr_6214.prdoc
rename to prdoc/stable2412/pr_6214.prdoc
diff --git a/prdoc/pr_6217.prdoc b/prdoc/stable2412/pr_6217.prdoc
similarity index 100%
rename from prdoc/pr_6217.prdoc
rename to prdoc/stable2412/pr_6217.prdoc
diff --git a/prdoc/pr_6218.prdoc b/prdoc/stable2412/pr_6218.prdoc
similarity index 100%
rename from prdoc/pr_6218.prdoc
rename to prdoc/stable2412/pr_6218.prdoc
diff --git a/prdoc/pr_6221.prdoc b/prdoc/stable2412/pr_6221.prdoc
similarity index 100%
rename from prdoc/pr_6221.prdoc
rename to prdoc/stable2412/pr_6221.prdoc
diff --git a/prdoc/pr_6228.prdoc b/prdoc/stable2412/pr_6228.prdoc
similarity index 100%
rename from prdoc/pr_6228.prdoc
rename to prdoc/stable2412/pr_6228.prdoc
diff --git a/prdoc/pr_6246.prdoc b/prdoc/stable2412/pr_6246.prdoc
similarity index 100%
rename from prdoc/pr_6246.prdoc
rename to prdoc/stable2412/pr_6246.prdoc
diff --git a/prdoc/pr_6255.prdoc b/prdoc/stable2412/pr_6255.prdoc
similarity index 100%
rename from prdoc/pr_6255.prdoc
rename to prdoc/stable2412/pr_6255.prdoc
diff --git a/prdoc/pr_6257.prdoc b/prdoc/stable2412/pr_6257.prdoc
similarity index 100%
rename from prdoc/pr_6257.prdoc
rename to prdoc/stable2412/pr_6257.prdoc
diff --git a/prdoc/pr_6260.prdoc b/prdoc/stable2412/pr_6260.prdoc
similarity index 100%
rename from prdoc/pr_6260.prdoc
rename to prdoc/stable2412/pr_6260.prdoc
diff --git a/prdoc/pr_6261.prdoc b/prdoc/stable2412/pr_6261.prdoc
similarity index 100%
rename from prdoc/pr_6261.prdoc
rename to prdoc/stable2412/pr_6261.prdoc
diff --git a/prdoc/pr_6263.prdoc b/prdoc/stable2412/pr_6263.prdoc
similarity index 100%
rename from prdoc/pr_6263.prdoc
rename to prdoc/stable2412/pr_6263.prdoc
diff --git a/prdoc/pr_6264.prdoc b/prdoc/stable2412/pr_6264.prdoc
similarity index 100%
rename from prdoc/pr_6264.prdoc
rename to prdoc/stable2412/pr_6264.prdoc
diff --git a/prdoc/pr_6268.prdoc b/prdoc/stable2412/pr_6268.prdoc
similarity index 100%
rename from prdoc/pr_6268.prdoc
rename to prdoc/stable2412/pr_6268.prdoc
diff --git a/prdoc/pr_6278.prdoc b/prdoc/stable2412/pr_6278.prdoc
similarity index 100%
rename from prdoc/pr_6278.prdoc
rename to prdoc/stable2412/pr_6278.prdoc
diff --git a/prdoc/pr_6288.prdoc b/prdoc/stable2412/pr_6288.prdoc
similarity index 100%
rename from prdoc/pr_6288.prdoc
rename to prdoc/stable2412/pr_6288.prdoc
diff --git a/prdoc/pr_6291.prdoc b/prdoc/stable2412/pr_6291.prdoc
similarity index 100%
rename from prdoc/pr_6291.prdoc
rename to prdoc/stable2412/pr_6291.prdoc
diff --git a/prdoc/pr_6295.prdoc b/prdoc/stable2412/pr_6295.prdoc
similarity index 100%
rename from prdoc/pr_6295.prdoc
rename to prdoc/stable2412/pr_6295.prdoc
diff --git a/prdoc/pr_6296.prdoc b/prdoc/stable2412/pr_6296.prdoc
similarity index 100%
rename from prdoc/pr_6296.prdoc
rename to prdoc/stable2412/pr_6296.prdoc
diff --git a/prdoc/pr_6298.prdoc b/prdoc/stable2412/pr_6298.prdoc
similarity index 100%
rename from prdoc/pr_6298.prdoc
rename to prdoc/stable2412/pr_6298.prdoc
diff --git a/prdoc/pr_6299.prdoc b/prdoc/stable2412/pr_6299.prdoc
similarity index 100%
rename from prdoc/pr_6299.prdoc
rename to prdoc/stable2412/pr_6299.prdoc
diff --git a/prdoc/pr_6304.prdoc b/prdoc/stable2412/pr_6304.prdoc
similarity index 100%
rename from prdoc/pr_6304.prdoc
rename to prdoc/stable2412/pr_6304.prdoc
diff --git a/prdoc/pr_6305.prdoc b/prdoc/stable2412/pr_6305.prdoc
similarity index 100%
rename from prdoc/pr_6305.prdoc
rename to prdoc/stable2412/pr_6305.prdoc
diff --git a/prdoc/pr_6314.prdoc b/prdoc/stable2412/pr_6314.prdoc
similarity index 100%
rename from prdoc/pr_6314.prdoc
rename to prdoc/stable2412/pr_6314.prdoc
diff --git a/prdoc/pr_6315.prdoc b/prdoc/stable2412/pr_6315.prdoc
similarity index 100%
rename from prdoc/pr_6315.prdoc
rename to prdoc/stable2412/pr_6315.prdoc
diff --git a/prdoc/pr_6316.prdoc b/prdoc/stable2412/pr_6316.prdoc
similarity index 100%
rename from prdoc/pr_6316.prdoc
rename to prdoc/stable2412/pr_6316.prdoc
diff --git a/prdoc/pr_6317.prdoc b/prdoc/stable2412/pr_6317.prdoc
similarity index 100%
rename from prdoc/pr_6317.prdoc
rename to prdoc/stable2412/pr_6317.prdoc
diff --git a/prdoc/pr_6318.prdoc b/prdoc/stable2412/pr_6318.prdoc
similarity index 100%
rename from prdoc/pr_6318.prdoc
rename to prdoc/stable2412/pr_6318.prdoc
diff --git a/prdoc/pr_6323.prdoc b/prdoc/stable2412/pr_6323.prdoc
similarity index 100%
rename from prdoc/pr_6323.prdoc
rename to prdoc/stable2412/pr_6323.prdoc
diff --git a/prdoc/pr_6337.prdoc b/prdoc/stable2412/pr_6337.prdoc
similarity index 100%
rename from prdoc/pr_6337.prdoc
rename to prdoc/stable2412/pr_6337.prdoc
diff --git a/prdoc/pr_6353.prdoc b/prdoc/stable2412/pr_6353.prdoc
similarity index 100%
rename from prdoc/pr_6353.prdoc
rename to prdoc/stable2412/pr_6353.prdoc
diff --git a/prdoc/pr_6357.prdoc b/prdoc/stable2412/pr_6357.prdoc
similarity index 100%
rename from prdoc/pr_6357.prdoc
rename to prdoc/stable2412/pr_6357.prdoc
diff --git a/prdoc/pr_6360.prdoc b/prdoc/stable2412/pr_6360.prdoc
similarity index 100%
rename from prdoc/pr_6360.prdoc
rename to prdoc/stable2412/pr_6360.prdoc
diff --git a/prdoc/pr_6365.prdoc b/prdoc/stable2412/pr_6365.prdoc
similarity index 100%
rename from prdoc/pr_6365.prdoc
rename to prdoc/stable2412/pr_6365.prdoc
diff --git a/prdoc/pr_6373.prdoc b/prdoc/stable2412/pr_6373.prdoc
similarity index 100%
rename from prdoc/pr_6373.prdoc
rename to prdoc/stable2412/pr_6373.prdoc
diff --git a/prdoc/pr_6380.prdoc b/prdoc/stable2412/pr_6380.prdoc
similarity index 100%
rename from prdoc/pr_6380.prdoc
rename to prdoc/stable2412/pr_6380.prdoc
diff --git a/prdoc/pr_6382.prdoc b/prdoc/stable2412/pr_6382.prdoc
similarity index 100%
rename from prdoc/pr_6382.prdoc
rename to prdoc/stable2412/pr_6382.prdoc
diff --git a/prdoc/pr_6384.prdoc b/prdoc/stable2412/pr_6384.prdoc
similarity index 100%
rename from prdoc/pr_6384.prdoc
rename to prdoc/stable2412/pr_6384.prdoc
diff --git a/prdoc/pr_6406.prdoc b/prdoc/stable2412/pr_6406.prdoc
similarity index 100%
rename from prdoc/pr_6406.prdoc
rename to prdoc/stable2412/pr_6406.prdoc
diff --git a/prdoc/pr_6418.prdoc b/prdoc/stable2412/pr_6418.prdoc
similarity index 100%
rename from prdoc/pr_6418.prdoc
rename to prdoc/stable2412/pr_6418.prdoc
diff --git a/prdoc/pr_6454.prdoc b/prdoc/stable2412/pr_6454.prdoc
similarity index 100%
rename from prdoc/pr_6454.prdoc
rename to prdoc/stable2412/pr_6454.prdoc
diff --git a/prdoc/pr_6484.prdoc b/prdoc/stable2412/pr_6484.prdoc
similarity index 100%
rename from prdoc/pr_6484.prdoc
rename to prdoc/stable2412/pr_6484.prdoc
diff --git a/prdoc/pr_6505.prdoc b/prdoc/stable2412/pr_6505.prdoc
similarity index 100%
rename from prdoc/pr_6505.prdoc
rename to prdoc/stable2412/pr_6505.prdoc
diff --git a/prdoc/pr_6536.prdoc b/prdoc/stable2412/pr_6536.prdoc
similarity index 100%
rename from prdoc/pr_6536.prdoc
rename to prdoc/stable2412/pr_6536.prdoc
diff --git a/prdoc/pr_6566.prdoc b/prdoc/stable2412/pr_6566.prdoc
similarity index 100%
rename from prdoc/pr_6566.prdoc
rename to prdoc/stable2412/pr_6566.prdoc
diff --git a/prdoc/pr_6588.prdoc b/prdoc/stable2412/pr_6588.prdoc
similarity index 100%
rename from prdoc/pr_6588.prdoc
rename to prdoc/stable2412/pr_6588.prdoc
diff --git a/prdoc/pr_6603.prdoc b/prdoc/stable2412/pr_6603.prdoc
similarity index 100%
rename from prdoc/pr_6603.prdoc
rename to prdoc/stable2412/pr_6603.prdoc
diff --git a/prdoc/pr_6643.prdoc b/prdoc/stable2412/pr_6643.prdoc
similarity index 100%
rename from prdoc/pr_6643.prdoc
rename to prdoc/stable2412/pr_6643.prdoc
diff --git a/prdoc/pr_6645.prdoc b/prdoc/stable2412/pr_6645.prdoc
similarity index 100%
rename from prdoc/pr_6645.prdoc
rename to prdoc/stable2412/pr_6645.prdoc
diff --git a/prdoc/pr_6646.prdoc b/prdoc/stable2412/pr_6646.prdoc
similarity index 100%
rename from prdoc/pr_6646.prdoc
rename to prdoc/stable2412/pr_6646.prdoc
diff --git a/prdoc/pr_6652.prdoc b/prdoc/stable2412/pr_6652.prdoc
similarity index 100%
rename from prdoc/pr_6652.prdoc
rename to prdoc/stable2412/pr_6652.prdoc
diff --git a/prdoc/pr_6677.prdoc b/prdoc/stable2412/pr_6677.prdoc
similarity index 100%
rename from prdoc/pr_6677.prdoc
rename to prdoc/stable2412/pr_6677.prdoc
diff --git a/prdoc/pr_6690.prdoc b/prdoc/stable2412/pr_6690.prdoc
similarity index 100%
rename from prdoc/pr_6690.prdoc
rename to prdoc/stable2412/pr_6690.prdoc
diff --git a/prdoc/pr_6696.prdoc b/prdoc/stable2412/pr_6696.prdoc
similarity index 100%
rename from prdoc/pr_6696.prdoc
rename to prdoc/stable2412/pr_6696.prdoc
diff --git a/prdoc/pr_6729.prdoc b/prdoc/stable2412/pr_6729.prdoc
similarity index 100%
rename from prdoc/pr_6729.prdoc
rename to prdoc/stable2412/pr_6729.prdoc
diff --git a/prdoc/pr_6742.prdoc b/prdoc/stable2412/pr_6742.prdoc
similarity index 100%
rename from prdoc/pr_6742.prdoc
rename to prdoc/stable2412/pr_6742.prdoc
diff --git a/prdoc/pr_6760.prdoc b/prdoc/stable2412/pr_6760.prdoc
similarity index 100%
rename from prdoc/pr_6760.prdoc
rename to prdoc/stable2412/pr_6760.prdoc
diff --git a/prdoc/pr_6781.prdoc b/prdoc/stable2412/pr_6781.prdoc
similarity index 100%
rename from prdoc/pr_6781.prdoc
rename to prdoc/stable2412/pr_6781.prdoc
diff --git a/prdoc/pr_6814.prdoc b/prdoc/stable2412/pr_6814.prdoc
similarity index 100%
rename from prdoc/pr_6814.prdoc
rename to prdoc/stable2412/pr_6814.prdoc
diff --git a/prdoc/pr_6860.prdoc b/prdoc/stable2412/pr_6860.prdoc
similarity index 100%
rename from prdoc/pr_6860.prdoc
rename to prdoc/stable2412/pr_6860.prdoc
diff --git a/prdoc/pr_6863.prdoc b/prdoc/stable2412/pr_6863.prdoc
similarity index 100%
rename from prdoc/pr_6863.prdoc
rename to prdoc/stable2412/pr_6863.prdoc
diff --git a/prdoc/pr_6864.prdoc b/prdoc/stable2412/pr_6864.prdoc
similarity index 100%
rename from prdoc/pr_6864.prdoc
rename to prdoc/stable2412/pr_6864.prdoc
diff --git a/prdoc/stable2412/pr_6885.prdoc b/prdoc/stable2412/pr_6885.prdoc
new file mode 100644
index 000000000000..986d76962289
--- /dev/null
+++ b/prdoc/stable2412/pr_6885.prdoc
@@ -0,0 +1,11 @@
+title: 'Omni-node: Detect pending code in storage and send go ahead signal in dev-mode.'
+doc:
+- audience: Runtime Dev
+  description: |-
+    When using the polkadot-omni-node with manual seal (`--dev-block-time`), it is now possible to perform runtime
+    upgrades. The node will detect the pending validation code and send a go-ahead signal to the parachain.
+crates:
+- name: cumulus-client-parachain-inherent
+  bump: major
+- name: polkadot-omni-node-lib
+  bump: patch
diff --git a/substrate/bin/node/bench/Cargo.toml b/substrate/bin/node/bench/Cargo.toml
index 447f947107c1..83f7b82cd2b5 100644
--- a/substrate/bin/node/bench/Cargo.toml
+++ b/substrate/bin/node/bench/Cargo.toml
@@ -15,33 +15,33 @@ workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-async-trait = { workspace = true }
 array-bytes = { workspace = true, default-features = true }
+async-trait = { workspace = true }
 clap = { features = ["derive"], workspace = true }
+derive_more = { features = ["display"], workspace = true }
+fs_extra = { workspace = true }
+futures = { features = ["thread-pool"], workspace = true }
+hash-db = { workspace = true, default-features = true }
+kitchensink-runtime = { workspace = true }
+kvdb = { workspace = true }
+kvdb-rocksdb = { workspace = true }
 log = { workspace = true, default-features = true }
 node-primitives = { workspace = true, default-features = true }
 node-testing = { workspace = true }
-kitchensink-runtime = { workspace = true }
+parity-db = { workspace = true }
+rand = { features = ["small_rng"], workspace = true, default-features = true }
+sc-basic-authorship = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
-sp-state-machine = { workspace = true, default-features = true }
+sc-transaction-pool = { workspace = true, default-features = true }
+sc-transaction-pool-api = { workspace = true, default-features = true }
 serde = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
-derive_more = { features = ["display"], workspace = true }
-kvdb = { workspace = true }
-kvdb-rocksdb = { workspace = true }
-sp-trie = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
-sc-basic-authorship = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-state-machine = { workspace = true, default-features = true }
 sp-timestamp = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
-hash-db = { workspace = true, default-features = true }
+sp-trie = { workspace = true, default-features = true }
 tempfile = { workspace = true }
-fs_extra = { workspace = true }
-rand = { features = ["small_rng"], workspace = true, default-features = true }
-parity-db = { workspace = true }
-sc-transaction-pool = { workspace = true, default-features = true }
-sc-transaction-pool-api = { workspace = true, default-features = true }
-futures = { features = ["thread-pool"], workspace = true }
diff --git a/substrate/bin/node/cli/Cargo.toml b/substrate/bin/node/cli/Cargo.toml
index c179579c1885..9e063ee3cde0 100644
--- a/substrate/bin/node/cli/Cargo.toml
+++ b/substrate/bin/node/cli/Cargo.toml
@@ -40,11 +40,11 @@ crate-type = ["cdylib", "rlib"]
 array-bytes = { workspace = true, default-features = true }
 clap = { features = ["derive"], optional = true, workspace = true }
 codec = { workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-jsonrpsee = { features = ["server"], workspace = true }
 futures = { workspace = true }
+jsonrpsee = { features = ["server"], workspace = true }
 log = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
 subxt-signer = { workspace = true, features = ["unstable-eth"] }
 
@@ -135,32 +135,32 @@ polkadot-sdk = { features = [
 
 # Shared code between the staging node and kitchensink runtime:
 kitchensink-runtime = { workspace = true }
-node-rpc = { workspace = true }
-node-primitives = { workspace = true, default-features = true }
 node-inspect = { optional = true, workspace = true, default-features = true }
+node-primitives = { workspace = true, default-features = true }
+node-rpc = { workspace = true }
 
 [dev-dependencies]
-futures = { workspace = true }
-tempfile = { workspace = true }
 assert_cmd = { workspace = true }
+criterion = { features = ["async_tokio"], workspace = true, default-features = true }
+futures = { workspace = true }
 nix = { features = ["signal"], workspace = true }
-regex = { workspace = true }
 platforms = { workspace = true }
+pretty_assertions.workspace = true
+regex = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 soketto = { workspace = true }
-criterion = { features = ["async_tokio"], workspace = true, default-features = true }
+sp-keyring = { workspace = true }
+tempfile = { workspace = true }
 tokio = { features = ["macros", "parking_lot", "time"], workspace = true, default-features = true }
 tokio-util = { features = ["compat"], workspace = true }
 wait-timeout = { workspace = true }
 wat = { workspace = true }
-serde_json = { workspace = true, default-features = true }
-scale-info = { features = ["derive", "serde"], workspace = true, default-features = true }
-sp-keyring = { workspace = true }
-pretty_assertions.workspace = true
 
 # These testing-only dependencies are not exported by the Polkadot-SDK crate:
 node-testing = { workspace = true }
-substrate-cli-test-utils = { workspace = true }
 sc-service-test = { workspace = true }
+substrate-cli-test-utils = { workspace = true }
 
 [build-dependencies]
 clap = { optional = true, workspace = true }
diff --git a/substrate/bin/node/inspect/Cargo.toml b/substrate/bin/node/inspect/Cargo.toml
index 6c8a4e59f68d..0cf13bef71f1 100644
--- a/substrate/bin/node/inspect/Cargo.toml
+++ b/substrate/bin/node/inspect/Cargo.toml
@@ -17,7 +17,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 clap = { features = ["derive"], workspace = true }
 codec = { workspace = true, default-features = true }
-thiserror = { workspace = true }
 sc-cli = { workspace = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-service = { workspace = true }
@@ -26,6 +25,7 @@ sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-statement-store = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [features]
 runtime-benchmarks = [
diff --git a/substrate/bin/node/rpc/Cargo.toml b/substrate/bin/node/rpc/Cargo.toml
index 02f5d9a4a702..c8b20287650b 100644
--- a/substrate/bin/node/rpc/Cargo.toml
+++ b/substrate/bin/node/rpc/Cargo.toml
@@ -17,16 +17,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 jsonrpsee = { features = ["server"], workspace = true }
+mmr-rpc = { workspace = true, default-features = true }
 node-primitives = { workspace = true, default-features = true }
 pallet-transaction-payment-rpc = { workspace = true, default-features = true }
-mmr-rpc = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus-babe = { workspace = true, default-features = true }
 sc-consensus-babe-rpc = { workspace = true, default-features = true }
 sc-consensus-beefy = { workspace = true, default-features = true }
 sc-consensus-beefy-rpc = { workspace = true, default-features = true }
-sp-consensus-beefy = { workspace = true, default-features = true }
 sc-consensus-grandpa = { workspace = true, default-features = true }
 sc-consensus-grandpa-rpc = { workspace = true, default-features = true }
 sc-mixnet = { workspace = true, default-features = true }
@@ -34,13 +33,14 @@ sc-rpc = { workspace = true, default-features = true }
 sc-sync-state-rpc = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
+sp-application-crypto = { workspace = true, default-features = true }
 sp-block-builder = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-consensus-babe = { workspace = true, default-features = true }
+sp-consensus-beefy = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-application-crypto = { workspace = true, default-features = true }
 sp-statement-store = { workspace = true, default-features = true }
 substrate-frame-rpc-system = { workspace = true, default-features = true }
 substrate-state-trie-migration-rpc = { workspace = true, default-features = true }
diff --git a/substrate/bin/node/runtime/Cargo.toml b/substrate/bin/node/runtime/Cargo.toml
index 3ad6315561d0..6d377cc92cce 100644
--- a/substrate/bin/node/runtime/Cargo.toml
+++ b/substrate/bin/node/runtime/Cargo.toml
@@ -23,11 +23,11 @@ codec = { features = [
 	"derive",
 	"max-encoded-len",
 ], workspace = true }
-scale-info = { features = ["derive", "serde"], workspace = true }
-static_assertions = { workspace = true, default-features = true }
 log = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true }
 serde_json = { features = ["alloc", "arbitrary_precision"], workspace = true }
 sp-debug-derive = { workspace = true, features = ["force-debug"] }
+static_assertions = { workspace = true, default-features = true }
 
 # pallet-asset-conversion: turn on "num-traits" feature
 primitive-types = { features = ["codec", "num-traits", "scale-info"], workspace = true }
diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs
index faffcd23fbcf..45ae378cc00e 100644
--- a/substrate/bin/node/runtime/src/lib.rs
+++ b/substrate/bin/node/runtime/src/lib.rs
@@ -1653,6 +1653,7 @@ impl pallet_recovery::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = pallet_recovery::weights::SubstrateWeight<Runtime>;
 	type RuntimeCall = RuntimeCall;
+	type BlockNumberProvider = System;
 	type Currency = Balances;
 	type ConfigDepositBase = ConfigDepositBase;
 	type FriendDepositFactor = FriendDepositFactor;
diff --git a/substrate/bin/node/testing/Cargo.toml b/substrate/bin/node/testing/Cargo.toml
index 1972c03a368b..13477a172fb8 100644
--- a/substrate/bin/node/testing/Cargo.toml
+++ b/substrate/bin/node/testing/Cargo.toml
@@ -17,20 +17,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true, default-features = true }
+frame-metadata-hash-extension = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
 fs_extra = { workspace = true }
 futures = { workspace = true }
+kitchensink-runtime = { workspace = true }
 log = { workspace = true, default-features = true }
-tempfile = { workspace = true }
-frame-metadata-hash-extension = { workspace = true, default-features = true }
-frame-system = { workspace = true, default-features = true }
 node-cli = { workspace = true }
 node-primitives = { workspace = true, default-features = true }
-kitchensink-runtime = { workspace = true }
 pallet-asset-conversion = { workspace = true, default-features = true }
-pallet-assets = { workspace = true, default-features = true }
-pallet-revive = { workspace = true, default-features = true }
 pallet-asset-conversion-tx-payment = { workspace = true, default-features = true }
 pallet-asset-tx-payment = { workspace = true, default-features = true }
+pallet-assets = { workspace = true, default-features = true }
+pallet-revive = { workspace = true, default-features = true }
 pallet-skip-feeless-payment = { workspace = true, default-features = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
@@ -50,3 +49,4 @@ sp-keyring = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-timestamp = { workspace = true }
 substrate-test-client = { workspace = true }
+tempfile = { workspace = true }
diff --git a/substrate/bin/utils/chain-spec-builder/Cargo.toml b/substrate/bin/utils/chain-spec-builder/Cargo.toml
index b71e935a918f..f3adc5682969 100644
--- a/substrate/bin/utils/chain-spec-builder/Cargo.toml
+++ b/substrate/bin/utils/chain-spec-builder/Cargo.toml
@@ -34,14 +34,14 @@ log = { workspace = true, default-features = true }
 sc-chain-spec = { features = [
 	"clap",
 ], workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
 serde = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 
 [dev-dependencies]
-substrate-test-runtime = { workspace = true }
 cmd_lib = { workspace = true }
 docify = { workspace = true }
+substrate-test-runtime = { workspace = true }
 
 [features]
 # `cargo build --feature=generate-readme` updates the `README.md` file.
diff --git a/substrate/client/allocator/Cargo.toml b/substrate/client/allocator/Cargo.toml
index a8b3bdc864c9..c0ce640566b0 100644
--- a/substrate/client/allocator/Cargo.toml
+++ b/substrate/client/allocator/Cargo.toml
@@ -18,6 +18,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 log = { workspace = true, default-features = true }
-thiserror = { workspace = true }
 sp-core = { workspace = true, default-features = true }
 sp-wasm-interface = { workspace = true, default-features = true }
+thiserror = { workspace = true }
diff --git a/substrate/client/api/Cargo.toml b/substrate/client/api/Cargo.toml
index 670c74684467..fe961b4690fc 100644
--- a/substrate/client/api/Cargo.toml
+++ b/substrate/client/api/Cargo.toml
@@ -41,6 +41,6 @@ sp-storage = { workspace = true, default-features = true }
 sp-trie = { workspace = true, default-features = true }
 
 [dev-dependencies]
-thiserror = { workspace = true }
 sp-test-primitives = { workspace = true }
 substrate-test-runtime = { workspace = true }
+thiserror = { workspace = true }
diff --git a/substrate/client/authority-discovery/Cargo.toml b/substrate/client/authority-discovery/Cargo.toml
index fc88d07ef936..ac1891451ec0 100644
--- a/substrate/client/authority-discovery/Cargo.toml
+++ b/substrate/client/authority-discovery/Cargo.toml
@@ -20,17 +20,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 prost-build = { workspace = true }
 
 [dependencies]
+async-trait = { workspace = true }
 codec = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 ip_network = { workspace = true }
-multihash = { workspace = true }
 linked_hash_set = { workspace = true }
 log = { workspace = true, default-features = true }
+multihash = { workspace = true }
+prometheus-endpoint = { workspace = true, default-features = true }
 prost = { workspace = true }
 rand = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-prometheus-endpoint = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
@@ -40,7 +40,7 @@ sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-async-trait = { workspace = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 quickcheck = { workspace = true }
diff --git a/substrate/client/block-builder/Cargo.toml b/substrate/client/block-builder/Cargo.toml
index 08392e18227f..c61a5a7ad3c1 100644
--- a/substrate/client/block-builder/Cargo.toml
+++ b/substrate/client/block-builder/Cargo.toml
@@ -23,9 +23,9 @@ sp-api = { workspace = true, default-features = true }
 sp-block-builder = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
-sp-trie = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+sp-trie = { workspace = true, default-features = true }
 
 [dev-dependencies]
 sp-state-machine = { workspace = true, default-features = true }
diff --git a/substrate/client/chain-spec/Cargo.toml b/substrate/client/chain-spec/Cargo.toml
index 2e885240936f..f63ff6c64447 100644
--- a/substrate/client/chain-spec/Cargo.toml
+++ b/substrate/client/chain-spec/Cargo.toml
@@ -16,31 +16,31 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+array-bytes = { workspace = true, default-features = true }
 clap = { features = ["derive"], optional = true, workspace = true }
 codec = { features = ["derive"], workspace = true }
+docify = { workspace = true }
+log = { workspace = true }
 memmap2 = { workspace = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
 sc-chain-spec-derive = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
-sp-io = { workspace = true }
 sc-network = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
 sp-genesis-builder = { workspace = true, default-features = true }
+sp-io = { workspace = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
-log = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
-array-bytes = { workspace = true, default-features = true }
-docify = { workspace = true }
 
 [dev-dependencies]
-substrate-test-runtime = { workspace = true }
-sp-keyring = { workspace = true, default-features = true }
+regex = { workspace = true }
 sp-application-crypto = { features = ["serde"], workspace = true }
 sp-consensus-babe = { features = ["serde"], workspace = true }
-regex = { workspace = true }
+sp-keyring = { workspace = true, default-features = true }
+substrate-test-runtime = { workspace = true }
diff --git a/substrate/client/cli/Cargo.toml b/substrate/client/cli/Cargo.toml
index f0b9f8f9b905..d7b4489b6cc5 100644
--- a/substrate/client/cli/Cargo.toml
+++ b/substrate/client/cli/Cargo.toml
@@ -19,13 +19,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 array-bytes = { workspace = true, default-features = true }
 chrono = { workspace = true }
 clap = { features = ["derive", "string", "wrap_help"], workspace = true }
+codec = { workspace = true, default-features = true }
 fdlimit = { workspace = true }
 futures = { workspace = true }
 itertools = { workspace = true }
 libp2p-identity = { features = ["ed25519", "peerid"], workspace = true }
 log = { workspace = true, default-features = true }
 names = { workspace = true }
-codec = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
 regex = { workspace = true }
 rpassword = { workspace = true }
@@ -34,7 +34,6 @@ serde_json = { workspace = true, default-features = true }
 thiserror = { workspace = true }
 # personal fork here as workaround for: https://github.com/rust-bitcoin/rust-bip39/pull/64
 bip39 = { package = "parity-bip39", version = "2.0.1", features = ["rand"] }
-tokio = { features = ["parking_lot", "rt-multi-thread", "signal"], workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-client-db = { workspace = true }
 sc-keystore = { workspace = true, default-features = true }
@@ -52,11 +51,12 @@ sp-keystore = { workspace = true, default-features = true }
 sp-panic-handler = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
+tokio = { features = ["parking_lot", "rt-multi-thread", "signal"], workspace = true, default-features = true }
 
 [dev-dependencies]
-tempfile = { workspace = true }
 futures-timer = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
+tempfile = { workspace = true }
 
 [features]
 default = ["rocksdb"]
diff --git a/substrate/client/consensus/aura/Cargo.toml b/substrate/client/consensus/aura/Cargo.toml
index 98e8ad676be3..6af673617118 100644
--- a/substrate/client/consensus/aura/Cargo.toml
+++ b/substrate/client/consensus/aura/Cargo.toml
@@ -20,7 +20,6 @@ async-trait = { workspace = true }
 codec = { workspace = true, default-features = true }
 futures = { workspace = true }
 log = { workspace = true, default-features = true }
-thiserror = { workspace = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
@@ -38,10 +37,10 @@ sp-core = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 parking_lot = { workspace = true, default-features = true }
-tempfile = { workspace = true }
 sc-keystore = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-test = { workspace = true }
@@ -49,4 +48,5 @@ sp-keyring = { workspace = true, default-features = true }
 sp-timestamp = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
+tempfile = { workspace = true }
 tokio = { workspace = true, default-features = true }
diff --git a/substrate/client/consensus/babe/Cargo.toml b/substrate/client/consensus/babe/Cargo.toml
index af55e72a9b7e..305409b80c78 100644
--- a/substrate/client/consensus/babe/Cargo.toml
+++ b/substrate/client/consensus/babe/Cargo.toml
@@ -19,14 +19,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 async-trait = { workspace = true }
 codec = { features = ["derive"], workspace = true, default-features = true }
+fork-tree = { workspace = true, default-features = true }
 futures = { workspace = true }
 log = { workspace = true, default-features = true }
 num-bigint = { workspace = true }
 num-rational = { workspace = true }
 num-traits = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-fork-tree = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
@@ -46,11 +45,12 @@ sp-crypto-hashing = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 sc-block-builder = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
 sc-network-test = { workspace = true }
+sp-keyring = { workspace = true, default-features = true }
 sp-timestamp = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
diff --git a/substrate/client/consensus/babe/rpc/Cargo.toml b/substrate/client/consensus/babe/rpc/Cargo.toml
index ce5b1baec0b5..3e3834189938 100644
--- a/substrate/client/consensus/babe/rpc/Cargo.toml
+++ b/substrate/client/consensus/babe/rpc/Cargo.toml
@@ -16,13 +16,12 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee = { features = ["client-core", "macros", "server-core"], workspace = true }
 futures = { workspace = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-thiserror = { workspace = true }
+jsonrpsee = { features = ["client-core", "macros", "server-core"], workspace = true }
 sc-consensus-babe = { workspace = true, default-features = true }
 sc-consensus-epochs = { workspace = true, default-features = true }
 sc-rpc-api = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-application-crypto = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
@@ -31,12 +30,13 @@ sp-consensus-babe = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
-serde_json = { workspace = true, default-features = true }
-tokio = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-keystore = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
+tokio = { workspace = true, default-features = true }
diff --git a/substrate/client/consensus/beefy/Cargo.toml b/substrate/client/consensus/beefy/Cargo.toml
index 900a44b95e04..bfe7e2c3d5dc 100644
--- a/substrate/client/consensus/beefy/Cargo.toml
+++ b/substrate/client/consensus/beefy/Cargo.toml
@@ -20,8 +20,6 @@ fnv = { workspace = true }
 futures = { workspace = true }
 log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-wasm-timer = { workspace = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
@@ -40,18 +38,20 @@ sp-core = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 tokio = { workspace = true, default-features = true }
+wasm-timer = { workspace = true }
 
 [dev-dependencies]
-serde = { workspace = true, default-features = true }
-tempfile = { workspace = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-network-test = { workspace = true }
+serde = { workspace = true, default-features = true }
 sp-consensus-grandpa = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 sp-mmr-primitives = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
+tempfile = { workspace = true }
 
 [features]
 # This feature adds BLS crypto primitives. It should not be used in production since
diff --git a/substrate/client/consensus/beefy/rpc/Cargo.toml b/substrate/client/consensus/beefy/rpc/Cargo.toml
index e1956dacf396..f8f24250ad93 100644
--- a/substrate/client/consensus/beefy/rpc/Cargo.toml
+++ b/substrate/client/consensus/beefy/rpc/Cargo.toml
@@ -17,17 +17,17 @@ futures = { workspace = true }
 jsonrpsee = { features = ["client-core", "macros", "server-core"], workspace = true }
 log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-thiserror = { workspace = true }
 sc-consensus-beefy = { workspace = true, default-features = true }
-sp-consensus-beefy = { workspace = true, default-features = true }
 sc-rpc = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
+sp-application-crypto = { workspace = true, default-features = true }
+sp-consensus-beefy = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-application-crypto = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
-serde_json = { workspace = true, default-features = true }
 sc-rpc = { features = ["test-helpers"], workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
 tokio = { features = ["macros"], workspace = true, default-features = true }
diff --git a/substrate/client/consensus/common/Cargo.toml b/substrate/client/consensus/common/Cargo.toml
index 77cd50ad784b..1b0f799f81bc 100644
--- a/substrate/client/consensus/common/Cargo.toml
+++ b/substrate/client/consensus/common/Cargo.toml
@@ -21,18 +21,18 @@ futures = { features = ["thread-pool"], workspace = true }
 log = { workspace = true, default-features = true }
 mockall = { workspace = true }
 parking_lot = { workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-thiserror = { workspace = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 sp-test-primitives = { workspace = true }
diff --git a/substrate/client/consensus/grandpa/Cargo.toml b/substrate/client/consensus/grandpa/Cargo.toml
index 65ba39d34c21..f361fac54af7 100644
--- a/substrate/client/consensus/grandpa/Cargo.toml
+++ b/substrate/client/consensus/grandpa/Cargo.toml
@@ -20,48 +20,48 @@ targets = ["x86_64-unknown-linux-gnu"]
 ahash = { workspace = true }
 array-bytes = { workspace = true, default-features = true }
 async-trait = { workspace = true }
+codec = { features = ["derive"], workspace = true, default-features = true }
 dyn-clone = { workspace = true }
 finality-grandpa = { features = ["derive-codec"], workspace = true, default-features = true }
+fork-tree = { workspace = true, default-features = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 log = { workspace = true, default-features = true }
-codec = { features = ["derive"], workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-rand = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-fork-tree = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
+rand = { workspace = true, default-features = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
-sc-transaction-pool-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
-sc-network-gossip = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
+sc-network-gossip = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
+sc-transaction-pool-api = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-application-crypto = { workspace = true, default-features = true }
 sp-arithmetic = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
+sp-consensus-grandpa = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
-sp-consensus-grandpa = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
 finality-grandpa = { features = ["derive-codec", "test-helpers"], workspace = true, default-features = true }
-serde = { workspace = true, default-features = true }
-tokio = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-test = { workspace = true }
+serde = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
+tokio = { workspace = true, default-features = true }
diff --git a/substrate/client/consensus/grandpa/rpc/Cargo.toml b/substrate/client/consensus/grandpa/rpc/Cargo.toml
index 86513ac5df15..1fb8bd9367c4 100644
--- a/substrate/client/consensus/grandpa/rpc/Cargo.toml
+++ b/substrate/client/consensus/grandpa/rpc/Cargo.toml
@@ -13,25 +13,25 @@ homepage.workspace = true
 workspace = true
 
 [dependencies]
+codec = { features = ["derive"], workspace = true, default-features = true }
 finality-grandpa = { features = ["derive-codec"], workspace = true, default-features = true }
 futures = { workspace = true }
 jsonrpsee = { features = ["client-core", "macros", "server-core"], workspace = true }
 log = { workspace = true, default-features = true }
-codec = { features = ["derive"], workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-thiserror = { workspace = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus-grandpa = { workspace = true, default-features = true }
 sc-rpc = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 sc-block-builder = { workspace = true, default-features = true }
 sc-rpc = { features = ["test-helpers"], workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
 sp-consensus-grandpa = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
 tokio = { features = ["macros"], workspace = true, default-features = true }
diff --git a/substrate/client/consensus/grandpa/src/warp_proof.rs b/substrate/client/consensus/grandpa/src/warp_proof.rs
index a79581b1e9f1..ada3a45e186e 100644
--- a/substrate/client/consensus/grandpa/src/warp_proof.rs
+++ b/substrate/client/consensus/grandpa/src/warp_proof.rs
@@ -174,10 +174,20 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 				let header = blockchain.header(latest_justification.target().1)?
 					.expect("header hash corresponds to a justification in db; must exist in db as well; qed.");
 
-				proofs.push(WarpSyncFragment { header, justification: latest_justification })
+				let proof = WarpSyncFragment { header, justification: latest_justification };
+
+				// Check for the limit. We remove some bytes from the maximum size, because we're
+				// only counting the size of the `WarpSyncFragment`s. The extra margin is here
+				// to leave room for rest of the data (the size of the `Vec` and the boolean).
+				if proofs_encoded_len + proof.encoded_size() >= MAX_WARP_SYNC_PROOF_SIZE - 50 {
+					false
+				} else {
+					proofs.push(proof);
+					true
+				}
+			} else {
+				true
 			}
-
-			true
 		};
 
 		let final_outcome = WarpSyncProof { proofs, is_finished };
diff --git a/substrate/client/consensus/manual-seal/Cargo.toml b/substrate/client/consensus/manual-seal/Cargo.toml
index 49111434015a..4d232f7256cb 100644
--- a/substrate/client/consensus/manual-seal/Cargo.toml
+++ b/substrate/client/consensus/manual-seal/Cargo.toml
@@ -16,15 +16,13 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee = { features = ["client-core", "macros", "server-core"], workspace = true }
 assert_matches = { workspace = true }
 async-trait = { workspace = true }
 codec = { workspace = true, default-features = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
+jsonrpsee = { features = ["client-core", "macros", "server-core"], workspace = true }
 log = { workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-thiserror = { workspace = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
@@ -33,6 +31,7 @@ sc-consensus-babe = { workspace = true, default-features = true }
 sc-consensus-epochs = { workspace = true, default-features = true }
 sc-transaction-pool = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
@@ -44,9 +43,10 @@ sp-inherents = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-timestamp = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
-tokio = { features = ["macros", "rt-multi-thread"], workspace = true, default-features = true }
 sc-basic-authorship = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
 substrate-test-runtime-transaction-pool = { workspace = true }
+tokio = { features = ["macros", "rt-multi-thread"], workspace = true, default-features = true }
diff --git a/substrate/client/consensus/pow/Cargo.toml b/substrate/client/consensus/pow/Cargo.toml
index bc89deb0b50d..a051bf3f4779 100644
--- a/substrate/client/consensus/pow/Cargo.toml
+++ b/substrate/client/consensus/pow/Cargo.toml
@@ -22,7 +22,6 @@ futures = { workspace = true }
 futures-timer = { workspace = true }
 log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-thiserror = { workspace = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
@@ -34,3 +33,4 @@ sp-consensus-pow = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
diff --git a/substrate/client/db/Cargo.toml b/substrate/client/db/Cargo.toml
index 5725155579fc..7e02558e007c 100644
--- a/substrate/client/db/Cargo.toml
+++ b/substrate/client/db/Cargo.toml
@@ -39,15 +39,15 @@ sp-state-machine = { workspace = true, default-features = true }
 sp-trie = { workspace = true, default-features = true }
 
 [dev-dependencies]
+array-bytes = { workspace = true, default-features = true }
 criterion = { workspace = true, default-features = true }
+kitchensink-runtime = { workspace = true }
 kvdb-rocksdb = { workspace = true }
-rand = { workspace = true, default-features = true }
-tempfile = { workspace = true }
 quickcheck = { workspace = true }
-kitchensink-runtime = { workspace = true }
+rand = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
-array-bytes = { workspace = true, default-features = true }
+tempfile = { workspace = true }
 
 [features]
 default = []
diff --git a/substrate/client/executor/Cargo.toml b/substrate/client/executor/Cargo.toml
index ca78afd47068..5cb4936e7534 100644
--- a/substrate/client/executor/Cargo.toml
+++ b/substrate/client/executor/Cargo.toml
@@ -38,21 +38,21 @@ sp-wasm-interface = { workspace = true, default-features = true }
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
 assert_matches = { workspace = true }
-wat = { workspace = true }
+criterion = { workspace = true, default-features = true }
+num_cpus = { workspace = true }
+paste = { workspace = true, default-features = true }
+regex = { workspace = true }
 sc-runtime-test = { workspace = true }
-substrate-test-runtime = { workspace = true }
+sc-tracing = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
-sp-state-machine = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
 sp-maybe-compressed-blob = { workspace = true, default-features = true }
-sc-tracing = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-state-machine = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
-tracing-subscriber = { workspace = true }
-paste = { workspace = true, default-features = true }
-regex = { workspace = true }
-criterion = { workspace = true, default-features = true }
-num_cpus = { workspace = true }
+substrate-test-runtime = { workspace = true }
 tempfile = { workspace = true }
+tracing-subscriber = { workspace = true }
+wat = { workspace = true }
 
 [[bench]]
 name = "bench"
diff --git a/substrate/client/executor/common/Cargo.toml b/substrate/client/executor/common/Cargo.toml
index 58fb0b423f24..aaf13a8ae768 100644
--- a/substrate/client/executor/common/Cargo.toml
+++ b/substrate/client/executor/common/Cargo.toml
@@ -17,12 +17,12 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-thiserror = { workspace = true }
-wasm-instrument = { workspace = true, default-features = true }
+polkavm = { workspace = true }
 sc-allocator = { workspace = true, default-features = true }
 sp-maybe-compressed-blob = { workspace = true, default-features = true }
 sp-wasm-interface = { workspace = true, default-features = true }
-polkavm = { workspace = true }
+thiserror = { workspace = true }
+wasm-instrument = { workspace = true, default-features = true }
 
 [features]
 default = []
diff --git a/substrate/client/executor/common/src/error.rs b/substrate/client/executor/common/src/error.rs
index 9d489eaae420..a94c1d493134 100644
--- a/substrate/client/executor/common/src/error.rs
+++ b/substrate/client/executor/common/src/error.rs
@@ -150,8 +150,8 @@ pub enum WasmError {
 	Other(String),
 }
 
-impl From<polkavm::ProgramParseError> for WasmError {
-	fn from(error: polkavm::ProgramParseError) -> Self {
+impl From<polkavm::program::ProgramParseError> for WasmError {
+	fn from(error: polkavm::program::ProgramParseError) -> Self {
 		WasmError::Other(error.to_string())
 	}
 }
diff --git a/substrate/client/executor/common/src/runtime_blob/runtime_blob.rs b/substrate/client/executor/common/src/runtime_blob/runtime_blob.rs
index d689083b2f85..e3f4b4ad9774 100644
--- a/substrate/client/executor/common/src/runtime_blob/runtime_blob.rs
+++ b/substrate/client/executor/common/src/runtime_blob/runtime_blob.rs
@@ -17,6 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{error::WasmError, wasm_runtime::HeapAllocStrategy};
+use polkavm::ArcBytes;
 use wasm_instrument::parity_wasm::elements::{
 	deserialize_buffer, serialize, ExportEntry, External, Internal, MemorySection, MemoryType,
 	Module, Section,
@@ -29,7 +30,7 @@ pub struct RuntimeBlob(BlobKind);
 #[derive(Clone)]
 enum BlobKind {
 	WebAssembly(Module),
-	PolkaVM(polkavm::ProgramBlob<'static>),
+	PolkaVM((polkavm::ProgramBlob, ArcBytes)),
 }
 
 impl RuntimeBlob {
@@ -52,9 +53,9 @@ impl RuntimeBlob {
 	pub fn new(raw_blob: &[u8]) -> Result<Self, WasmError> {
 		if raw_blob.starts_with(b"PVM\0") {
 			if crate::is_polkavm_enabled() {
-				return Ok(Self(BlobKind::PolkaVM(
-					polkavm::ProgramBlob::parse(raw_blob)?.into_owned(),
-				)));
+				let raw = ArcBytes::from(raw_blob);
+				let blob = polkavm::ProgramBlob::parse(raw.clone())?;
+				return Ok(Self(BlobKind::PolkaVM((blob, raw))));
 			} else {
 				return Err(WasmError::Other("expected a WASM runtime blob, found a PolkaVM runtime blob; set the 'SUBSTRATE_ENABLE_POLKAVM' environment variable to enable the experimental PolkaVM-based executor".to_string()));
 			}
@@ -192,7 +193,7 @@ impl RuntimeBlob {
 		match self.0 {
 			BlobKind::WebAssembly(raw_module) =>
 				serialize(raw_module).expect("serializing into a vec should succeed; qed"),
-			BlobKind::PolkaVM(ref blob) => blob.as_bytes().to_vec(),
+			BlobKind::PolkaVM(ref blob) => blob.1.to_vec(),
 		}
 	}
 
@@ -227,7 +228,7 @@ impl RuntimeBlob {
 	pub fn as_polkavm_blob(&self) -> Option<&polkavm::ProgramBlob> {
 		match self.0 {
 			BlobKind::WebAssembly(..) => None,
-			BlobKind::PolkaVM(ref blob) => Some(blob),
+			BlobKind::PolkaVM((ref blob, _)) => Some(blob),
 		}
 	}
 }
diff --git a/substrate/client/executor/polkavm/src/lib.rs b/substrate/client/executor/polkavm/src/lib.rs
index 1bd72eb33d30..134f9ea3d8c4 100644
--- a/substrate/client/executor/polkavm/src/lib.rs
+++ b/substrate/client/executor/polkavm/src/lib.rs
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use polkavm::{Caller, Reg};
+use polkavm::{CallError, Caller, Reg};
 use sc_executor_common::{
 	error::{Error, WasmError},
 	wasm_runtime::{AllocationStats, WasmInstance, WasmModule},
@@ -26,10 +26,10 @@ use sp_wasm_interface::{
 };
 
 #[repr(transparent)]
-pub struct InstancePre(polkavm::InstancePre<()>);
+pub struct InstancePre(polkavm::InstancePre<(), String>);
 
 #[repr(transparent)]
-pub struct Instance(polkavm::Instance<()>);
+pub struct Instance(polkavm::Instance<(), String>);
 
 impl WasmModule for InstancePre {
 	fn new_instance(&self) -> Result<Box<dyn WasmInstance>, Error> {
@@ -43,11 +43,13 @@ impl WasmInstance for Instance {
 		name: &str,
 		raw_data: &[u8],
 	) -> (Result<Vec<u8>, Error>, Option<AllocationStats>) {
-		let Some(method_index) = self.0.module().lookup_export(name) else {
-			return (
-				Err(format!("cannot call into the runtime: export not found: '{name}'").into()),
-				None,
-			);
+		let pc = match self.0.module().exports().find(|e| e.symbol() == name) {
+			Some(export) => export.program_counter(),
+			None =>
+				return (
+					Err(format!("cannot call into the runtime: export not found: '{name}'").into()),
+					None,
+				),
 		};
 
 		let Ok(raw_data_length) = u32::try_from(raw_data.len()) else {
@@ -58,56 +60,60 @@ impl WasmInstance for Instance {
 		};
 
 		// TODO: This will leak guest memory; find a better solution.
-		let mut state_args = polkavm::StateArgs::new();
 
-		// Make sure the memory is cleared...
-		state_args.reset_memory(true);
-		// ...and allocate space for the input payload.
-		state_args.sbrk(raw_data_length);
+		// Make sure that the memory is cleared...
+		if let Err(err) = self.0.reset_memory() {
+			return (
+				Err(format!(
+					"call into the runtime method '{name}' failed: reset memory failed: {err}"
+				)
+				.into()),
+				None,
+			);
+		}
 
-		match self.0.update_state(state_args) {
-			Ok(()) => {},
-			Err(polkavm::ExecutionError::Trap(trap)) => {
-				return (Err(format!("call into the runtime method '{name}' failed: failed to prepare the guest's memory: {trap}").into()), None);
-			},
-			Err(polkavm::ExecutionError::Error(error)) => {
-				return (Err(format!("call into the runtime method '{name}' failed: failed to prepare the guest's memory: {error}").into()), None);
-			},
-			Err(polkavm::ExecutionError::OutOfGas) => unreachable!("gas metering is never enabled"),
+		// ... and allocate space for the input payload.
+		if let Err(err) = self.0.sbrk(raw_data_length) {
+			return (
+				Err(format!(
+					"call into the runtime method '{name}' failed: reset memory failed: {err}"
+				)
+				.into()),
+				None,
+			);
 		}
 
 		// Grab the address of where the guest's heap starts; that's where we've just allocated
 		// the memory for the input payload.
 		let data_pointer = self.0.module().memory_map().heap_base();
 
-		if let Err(error) = self.0.write_memory(data_pointer, raw_data) {
-			return (Err(format!("call into the runtime method '{name}': failed to write the input payload into guest memory: {error}").into()), None);
+		if let Err(err) = self.0.write_memory(data_pointer, raw_data) {
+			return (Err(format!("call into the runtime method '{name}': failed to write the input payload into guest memory: {err}").into()), None);
 		}
 
-		let mut state = ();
-		let mut call_args = polkavm::CallArgs::new(&mut state, method_index);
-		call_args.args_untyped(&[data_pointer, raw_data_length]);
-
-		match self.0.call(Default::default(), call_args) {
+		match self.0.call_typed(&mut (), pc, (data_pointer, raw_data_length)) {
 			Ok(()) => {},
-			Err(polkavm::ExecutionError::Trap(trap)) => {
+			Err(CallError::Trap) =>
 				return (
-					Err(format!("call into the runtime method '{name}' failed: {trap}").into()),
+					Err(format!("call into the runtime method '{name}' failed: trap").into()),
 					None,
-				);
-			},
-			Err(polkavm::ExecutionError::Error(error)) => {
+				),
+			Err(CallError::Error(err)) =>
 				return (
-					Err(format!("call into the runtime method '{name}' failed: {error}").into()),
+					Err(format!("call into the runtime method '{name}' failed: {err}").into()),
 					None,
-				);
-			},
-			Err(polkavm::ExecutionError::OutOfGas) => unreachable!("gas metering is never enabled"),
-		}
+				),
+			Err(CallError::User(err)) =>
+				return (
+					Err(format!("call into the runtime method '{name}' failed: {err}").into()),
+					None,
+				),
+			Err(CallError::NotEnoughGas) => unreachable!("gas metering is never enabled"),
+		};
 
-		let result_pointer = self.0.get_reg(Reg::A0);
-		let result_length = self.0.get_reg(Reg::A1);
-		let output = match self.0.read_memory_into_vec(result_pointer, result_length) {
+		let result_pointer = self.0.reg(Reg::A0);
+		let result_length = self.0.reg(Reg::A1);
+		let output = match self.0.read_memory(result_pointer as u32, result_length as u32) {
 			Ok(output) => output,
 			Err(error) => {
 				return (Err(format!("call into the runtime method '{name}' failed: failed to read the return payload: {error}").into()), None)
@@ -127,20 +133,31 @@ impl<'r, 'a> FunctionContext for Context<'r, 'a> {
 		dest: &mut [u8],
 	) -> sp_wasm_interface::Result<()> {
 		self.0
-			.read_memory_into_slice(u32::from(address), dest)
+			.instance
+			.read_memory_into(u32::from(address), dest)
 			.map_err(|error| error.to_string())
 			.map(|_| ())
 	}
 
 	fn write_memory(&mut self, address: Pointer<u8>, data: &[u8]) -> sp_wasm_interface::Result<()> {
-		self.0.write_memory(u32::from(address), data).map_err(|error| error.to_string())
+		self.0
+			.instance
+			.write_memory(u32::from(address), data)
+			.map_err(|error| error.to_string())
 	}
 
 	fn allocate_memory(&mut self, size: WordSize) -> sp_wasm_interface::Result<Pointer<u8>> {
-		let pointer = self.0.sbrk(0).expect("fetching the current heap pointer never fails");
+		let pointer = match self.0.instance.sbrk(0) {
+			Ok(pointer) => pointer.expect("fetching the current heap pointer never fails"),
+			Err(err) => return Err(format!("sbrk failed: {err}")),
+		};
 
 		// TODO: This will leak guest memory; find a better solution.
-		self.0.sbrk(size).ok_or_else(|| String::from("allocation failed"))?;
+		match self.0.instance.sbrk(size) {
+			Ok(Some(_)) => (),
+			Ok(None) => return Err(String::from("allocation error")),
+			Err(err) => return Err(format!("sbrk failed: {err}")),
+		}
 
 		Ok(Pointer::new(pointer))
 	}
@@ -155,41 +172,46 @@ impl<'r, 'a> FunctionContext for Context<'r, 'a> {
 	}
 }
 
-fn call_host_function(
-	caller: &mut Caller<()>,
-	function: &dyn Function,
-) -> Result<(), polkavm::Trap> {
+fn call_host_function(caller: &mut Caller<()>, function: &dyn Function) -> Result<(), String> {
 	let mut args = [Value::I64(0); Reg::ARG_REGS.len()];
 	let mut nth_reg = 0;
 	for (nth_arg, kind) in function.signature().args.iter().enumerate() {
 		match kind {
 			ValueType::I32 => {
-				args[nth_arg] = Value::I32(caller.get_reg(Reg::ARG_REGS[nth_reg]) as i32);
+				args[nth_arg] = Value::I32(caller.instance.reg(Reg::ARG_REGS[nth_reg]) as i32);
 				nth_reg += 1;
 			},
 			ValueType::F32 => {
-				args[nth_arg] = Value::F32(caller.get_reg(Reg::ARG_REGS[nth_reg]));
-				nth_reg += 1;
-			},
-			ValueType::I64 => {
-				let value_lo = caller.get_reg(Reg::ARG_REGS[nth_reg]);
-				nth_reg += 1;
-
-				let value_hi = caller.get_reg(Reg::ARG_REGS[nth_reg]);
-				nth_reg += 1;
-
-				args[nth_arg] =
-					Value::I64((u64::from(value_lo) | (u64::from(value_hi) << 32)) as i64);
-			},
-			ValueType::F64 => {
-				let value_lo = caller.get_reg(Reg::ARG_REGS[nth_reg]);
+				args[nth_arg] = Value::F32(caller.instance.reg(Reg::ARG_REGS[nth_reg]) as u32);
 				nth_reg += 1;
-
-				let value_hi = caller.get_reg(Reg::ARG_REGS[nth_reg]);
-				nth_reg += 1;
-
-				args[nth_arg] = Value::F64(u64::from(value_lo) | (u64::from(value_hi) << 32));
 			},
+			ValueType::I64 =>
+				if caller.instance.is_64_bit() {
+					args[nth_arg] = Value::I64(caller.instance.reg(Reg::ARG_REGS[nth_reg]) as i64);
+					nth_reg += 1;
+				} else {
+					let value_lo = caller.instance.reg(Reg::ARG_REGS[nth_reg]);
+					nth_reg += 1;
+
+					let value_hi = caller.instance.reg(Reg::ARG_REGS[nth_reg]);
+					nth_reg += 1;
+
+					args[nth_arg] =
+						Value::I64((u64::from(value_lo) | (u64::from(value_hi) << 32)) as i64);
+				},
+			ValueType::F64 =>
+				if caller.instance.is_64_bit() {
+					args[nth_arg] = Value::F64(caller.instance.reg(Reg::ARG_REGS[nth_reg]));
+					nth_reg += 1;
+				} else {
+					let value_lo = caller.instance.reg(Reg::ARG_REGS[nth_reg]);
+					nth_reg += 1;
+
+					let value_hi = caller.instance.reg(Reg::ARG_REGS[nth_reg]);
+					nth_reg += 1;
+
+					args[nth_arg] = Value::F64(u64::from(value_lo) | (u64::from(value_hi) << 32));
+				},
 		}
 	}
 
@@ -204,27 +226,33 @@ fn call_host_function(
 	{
 		Ok(value) => value,
 		Err(error) => {
-			log::warn!("Call into the host function '{}' failed: {error}", function.name());
-			return Err(polkavm::Trap::default());
+			let name = function.name();
+			return Err(format!("call into the host function '{name}' failed: {error}"))
 		},
 	};
 
 	if let Some(value) = value {
 		match value {
 			Value::I32(value) => {
-				caller.set_reg(Reg::A0, value as u32);
+				caller.instance.set_reg(Reg::A0, value as u64);
 			},
 			Value::F32(value) => {
-				caller.set_reg(Reg::A0, value);
-			},
-			Value::I64(value) => {
-				caller.set_reg(Reg::A0, value as u32);
-				caller.set_reg(Reg::A1, (value >> 32) as u32);
-			},
-			Value::F64(value) => {
-				caller.set_reg(Reg::A0, value as u32);
-				caller.set_reg(Reg::A1, (value >> 32) as u32);
+				caller.instance.set_reg(Reg::A0, value as u64);
 			},
+			Value::I64(value) =>
+				if caller.instance.is_64_bit() {
+					caller.instance.set_reg(Reg::A0, value as u64);
+				} else {
+					caller.instance.set_reg(Reg::A0, value as u64);
+					caller.instance.set_reg(Reg::A1, (value >> 32) as u64);
+				},
+			Value::F64(value) =>
+				if caller.instance.is_64_bit() {
+					caller.instance.set_reg(Reg::A0, value as u64);
+				} else {
+					caller.instance.set_reg(Reg::A0, value as u64);
+					caller.instance.set_reg(Reg::A1, (value >> 32) as u64);
+				},
 		}
 	}
 
@@ -250,12 +278,16 @@ where
 		},
 	};
 
-	let module = polkavm::Module::from_blob(&engine, &polkavm::ModuleConfig::default(), blob)?;
-	let mut linker = polkavm::Linker::new(&engine);
+	let module =
+		polkavm::Module::from_blob(&engine, &polkavm::ModuleConfig::default(), blob.clone())?;
+
+	let mut linker = polkavm::Linker::new();
+
 	for function in H::host_functions() {
-		linker.func_new(function.name(), |mut caller| call_host_function(&mut caller, function))?;
+		linker.define_untyped(function.name(), |mut caller: Caller<()>| {
+			call_host_function(&mut caller, function)
+		})?;
 	}
-
 	let instance_pre = linker.instantiate_pre(&module)?;
 	Ok(Box::new(InstancePre(instance_pre)))
 }
diff --git a/substrate/client/executor/wasmtime/Cargo.toml b/substrate/client/executor/wasmtime/Cargo.toml
index ef8e5da876aa..7ea94568e1b7 100644
--- a/substrate/client/executor/wasmtime/Cargo.toml
+++ b/substrate/client/executor/wasmtime/Cargo.toml
@@ -16,13 +16,18 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-log = { workspace = true, default-features = true }
 cfg-if = { workspace = true }
 libc = { workspace = true }
+log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
 
 # When bumping wasmtime do not forget to also bump rustix
 # to exactly the same version as used by wasmtime!
+anyhow = { workspace = true }
+sc-allocator = { workspace = true, default-features = true }
+sc-executor-common = { workspace = true, default-features = true }
+sp-runtime-interface = { workspace = true, default-features = true }
+sp-wasm-interface = { features = ["wasmtime"], workspace = true, default-features = true }
 wasmtime = { features = [
 	"cache",
 	"cranelift",
@@ -30,11 +35,6 @@ wasmtime = { features = [
 	"parallel-compilation",
 	"pooling-allocator",
 ], workspace = true }
-anyhow = { workspace = true }
-sc-allocator = { workspace = true, default-features = true }
-sc-executor-common = { workspace = true, default-features = true }
-sp-runtime-interface = { workspace = true, default-features = true }
-sp-wasm-interface = { features = ["wasmtime"], workspace = true, default-features = true }
 
 # Here we include the rustix crate in the exactly same semver-compatible version as used by
 # wasmtime and enable its 'use-libc' flag.
@@ -45,10 +45,10 @@ sp-wasm-interface = { features = ["wasmtime"], workspace = true, default-feature
 rustix = { features = ["fs", "mm", "param", "std", "use-libc"], workspace = true }
 
 [dev-dependencies]
-wat = { workspace = true }
+cargo_metadata = { workspace = true }
+codec = { workspace = true, default-features = true }
+paste = { workspace = true, default-features = true }
 sc-runtime-test = { workspace = true }
 sp-io = { workspace = true, default-features = true }
 tempfile = { workspace = true }
-paste = { workspace = true, default-features = true }
-codec = { workspace = true, default-features = true }
-cargo_metadata = { workspace = true }
+wat = { workspace = true }
diff --git a/substrate/client/informant/Cargo.toml b/substrate/client/informant/Cargo.toml
index 87a4be320d68..209964e02ef3 100644
--- a/substrate/client/informant/Cargo.toml
+++ b/substrate/client/informant/Cargo.toml
@@ -21,8 +21,8 @@ futures = { workspace = true }
 futures-timer = { workspace = true }
 log = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
-sc-network = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
diff --git a/substrate/client/keystore/Cargo.toml b/substrate/client/keystore/Cargo.toml
index d338bb1af61a..e46fafbc3729 100644
--- a/substrate/client/keystore/Cargo.toml
+++ b/substrate/client/keystore/Cargo.toml
@@ -20,10 +20,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 array-bytes = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
-thiserror = { workspace = true }
 sp-application-crypto = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 tempfile = { workspace = true }
diff --git a/substrate/client/merkle-mountain-range/Cargo.toml b/substrate/client/merkle-mountain-range/Cargo.toml
index 6639a10d33f1..7849eac5f516 100644
--- a/substrate/client/merkle-mountain-range/Cargo.toml
+++ b/substrate/client/merkle-mountain-range/Cargo.toml
@@ -17,14 +17,14 @@ workspace = true
 codec = { workspace = true, default-features = true }
 futures = { workspace = true }
 log = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
+sc-offchain = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-sp-consensus-beefy = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
+sp-consensus-beefy = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-mmr-primitives = { workspace = true, default-features = true }
-sc-offchain = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 
 [dev-dependencies]
diff --git a/substrate/client/network-gossip/Cargo.toml b/substrate/client/network-gossip/Cargo.toml
index 94bc9a671f84..ea52913aea16 100644
--- a/substrate/client/network-gossip/Cargo.toml
+++ b/substrate/client/network-gossip/Cargo.toml
@@ -21,18 +21,18 @@ ahash = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 log = { workspace = true, default-features = true }
-schnellru = { workspace = true }
-tracing = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
+schnellru = { workspace = true }
 sp-runtime = { workspace = true, default-features = true }
+tracing = { workspace = true, default-features = true }
 
 [dev-dependencies]
-tokio = { workspace = true, default-features = true }
 async-trait = { workspace = true }
 codec = { features = ["derive"], workspace = true, default-features = true }
 quickcheck = { workspace = true }
 substrate-test-runtime-client = { workspace = true }
+tokio = { workspace = true, default-features = true }
diff --git a/substrate/client/network/Cargo.toml b/substrate/client/network/Cargo.toml
index c8fd28e08109..19af70867658 100644
--- a/substrate/client/network/Cargo.toml
+++ b/substrate/client/network/Cargo.toml
@@ -34,54 +34,54 @@ futures-timer = { workspace = true }
 ip_network = { workspace = true }
 libp2p = { features = ["dns", "identify", "kad", "macros", "mdns", "noise", "ping", "request-response", "tcp", "tokio", "websocket", "yamux"], workspace = true }
 linked_hash_set = { workspace = true }
+litep2p = { workspace = true }
 log = { workspace = true, default-features = true }
 mockall = { workspace = true }
+once_cell = { workspace = true }
 parking_lot = { workspace = true, default-features = true }
 partial_sort = { workspace = true }
 pin-project = { workspace = true }
-rand = { workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
-smallvec = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-tokio = { features = ["macros", "sync"], workspace = true, default-features = true }
-tokio-stream = { workspace = true }
-unsigned-varint = { features = ["asynchronous_codec", "futures"], workspace = true }
-zeroize = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 prost = { workspace = true }
+rand = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
+schnellru = { workspace = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
+smallvec = { workspace = true, default-features = true }
 sp-arithmetic = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-wasm-timer = { workspace = true }
-litep2p = { workspace = true }
-once_cell = { workspace = true }
+thiserror = { workspace = true }
+tokio = { features = ["macros", "sync"], workspace = true, default-features = true }
+tokio-stream = { workspace = true }
+unsigned-varint = { features = ["asynchronous_codec", "futures"], workspace = true }
 void = { workspace = true }
-schnellru = { workspace = true }
+wasm-timer = { workspace = true }
+zeroize = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
 mockall = { workspace = true }
 multistream-select = { workspace = true }
 rand = { workspace = true, default-features = true }
-tempfile = { workspace = true }
-tokio = { features = ["macros", "rt-multi-thread"], workspace = true, default-features = true }
-tokio-util = { features = ["compat"], workspace = true }
-tokio-test = { workspace = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-network-light = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
-sp-crypto-hashing = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
+sp-crypto-hashing = { workspace = true, default-features = true }
 sp-test-primitives = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime = { workspace = true }
 substrate-test-runtime-client = { workspace = true }
+tempfile = { workspace = true }
+tokio = { features = ["macros", "rt-multi-thread"], workspace = true, default-features = true }
+tokio-test = { workspace = true }
+tokio-util = { features = ["compat"], workspace = true }
 
 criterion = { workspace = true, default-features = true, features = ["async_tokio"] }
 sc-consensus = { workspace = true, default-features = true }
diff --git a/substrate/client/network/light/Cargo.toml b/substrate/client/network/light/Cargo.toml
index 34ba4f061c44..fad7ae425858 100644
--- a/substrate/client/network/light/Cargo.toml
+++ b/substrate/client/network/light/Cargo.toml
@@ -19,18 +19,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 prost-build = { workspace = true }
 
 [dependencies]
-async-channel = { workspace = true }
 array-bytes = { workspace = true, default-features = true }
+async-channel = { workspace = true }
 codec = { features = [
 	"derive",
 ], workspace = true, default-features = true }
 futures = { workspace = true }
 log = { workspace = true, default-features = true }
 prost = { workspace = true }
-sp-blockchain = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
-sc-network-types = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
+sc-network-types = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 thiserror = { workspace = true }
diff --git a/substrate/client/network/src/behaviour.rs b/substrate/client/network/src/behaviour.rs
index cee80b6c1e86..e2a91e961668 100644
--- a/substrate/client/network/src/behaviour.rs
+++ b/substrate/client/network/src/behaviour.rs
@@ -68,6 +68,7 @@ pub struct Behaviour<B: BlockT> {
 }
 
 /// Event generated by `Behaviour`.
+#[derive(Debug)]
 pub enum BehaviourOut {
 	/// Started a random iterative Kademlia discovery query.
 	RandomKademliaStarted,
diff --git a/substrate/client/network/src/discovery.rs b/substrate/client/network/src/discovery.rs
index 81baa00e201e..917449cf228c 100644
--- a/substrate/client/network/src/discovery.rs
+++ b/substrate/client/network/src/discovery.rs
@@ -53,13 +53,13 @@ use futures::prelude::*;
 use futures_timer::Delay;
 use ip_network::IpNetwork;
 use libp2p::{
-	core::{Endpoint, Multiaddr},
+	core::{transport::PortUse, Endpoint, Multiaddr},
 	kad::{
 		self,
-		record::store::{MemoryStore, RecordStore},
+		store::{MemoryStore, RecordStore},
 		Behaviour as Kademlia, BucketInserts, Config as KademliaConfig, Event as KademliaEvent,
-		GetClosestPeersError, GetProvidersError, GetProvidersOk, GetRecordOk, PeerRecord, QueryId,
-		QueryResult, Quorum, Record, RecordKey,
+		Event, GetClosestPeersError, GetProvidersError, GetProvidersOk, GetRecordOk, PeerRecord,
+		QueryId, QueryResult, Quorum, Record, RecordKey,
 	},
 	mdns::{self, tokio::Behaviour as TokioMdns},
 	multiaddr::Protocol,
@@ -68,8 +68,8 @@ use libp2p::{
 			toggle::{Toggle, ToggleConnectionHandler},
 			DialFailure, ExternalAddrConfirmed, FromSwarm,
 		},
-		ConnectionDenied, ConnectionId, DialError, NetworkBehaviour, PollParameters,
-		StreamProtocol, THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
+		ConnectionDenied, ConnectionId, DialError, NetworkBehaviour, StreamProtocol, THandler,
+		THandlerInEvent, THandlerOutEvent, ToSwarm,
 	},
 	PeerId,
 };
@@ -214,23 +214,14 @@ impl DiscoveryConfig {
 			enable_mdns,
 			kademlia_disjoint_query_paths,
 			kademlia_protocol,
-			kademlia_legacy_protocol,
+			kademlia_legacy_protocol: _,
 			kademlia_replication_factor,
 		} = self;
 
 		let kademlia = if let Some(ref kademlia_protocol) = kademlia_protocol {
-			let mut config = KademliaConfig::default();
+			let mut config = KademliaConfig::new(kademlia_protocol.clone());
 
 			config.set_replication_factor(kademlia_replication_factor);
-			// Populate kad with both the legacy and the new protocol names.
-			// Remove the legacy protocol:
-			// https://github.com/paritytech/polkadot-sdk/issues/504
-			let kademlia_protocols = if let Some(legacy_protocol) = kademlia_legacy_protocol {
-				vec![kademlia_protocol.clone(), legacy_protocol]
-			} else {
-				vec![kademlia_protocol.clone()]
-			};
-			config.set_protocol_names(kademlia_protocols.into_iter().map(Into::into).collect());
 
 			config.set_record_filtering(libp2p::kad::StoreInserts::FilterBoth);
 
@@ -647,12 +638,14 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 		peer: PeerId,
 		addr: &Multiaddr,
 		role_override: Endpoint,
+		port_use: PortUse,
 	) -> Result<THandler<Self>, ConnectionDenied> {
 		self.kademlia.handle_established_outbound_connection(
 			connection_id,
 			peer,
 			addr,
 			role_override,
+			port_use,
 		)
 	}
 
@@ -724,7 +717,7 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 		Ok(list.into_iter().collect())
 	}
 
-	fn on_swarm_event(&mut self, event: FromSwarm<Self::ConnectionHandler>) {
+	fn on_swarm_event(&mut self, event: FromSwarm) {
 		match event {
 			FromSwarm::ConnectionEstablished(e) => {
 				self.num_connections += 1;
@@ -811,6 +804,10 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 
 				self.kademlia.on_swarm_event(FromSwarm::ExternalAddrConfirmed(e));
 			},
+			event => {
+				debug!(target: "sub-libp2p", "New unknown `FromSwarm` libp2p event: {event:?}");
+				self.kademlia.on_swarm_event(event);
+			},
 		}
 	}
 
@@ -823,11 +820,7 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 		self.kademlia.on_connection_handler_event(peer_id, connection_id, event);
 	}
 
-	fn poll(
-		&mut self,
-		cx: &mut Context,
-		params: &mut impl PollParameters,
-	) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
+	fn poll(&mut self, cx: &mut Context) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
 		// Immediately process the content of `discovered`.
 		if let Some(ev) = self.pending_events.pop_front() {
 			return Poll::Ready(ToSwarm::GenerateEvent(ev))
@@ -870,7 +863,7 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 			}
 		}
 
-		while let Poll::Ready(ev) = self.kademlia.poll(cx, params) {
+		while let Poll::Ready(ev) = self.kademlia.poll(cx) {
 			match ev {
 				ToSwarm::GenerateEvent(ev) => match ev {
 					KademliaEvent::RoutingUpdated { peer, .. } => {
@@ -1103,30 +1096,38 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 							e.key(), e,
 						),
 					},
+					KademliaEvent::OutboundQueryProgressed {
+						result: QueryResult::Bootstrap(res),
+						..
+					} => match res {
+						Ok(ok) => debug!(
+							target: "sub-libp2p",
+							"Libp2p => DHT bootstrap progressed: {ok:?}",
+						),
+						Err(e) => warn!(
+							target: "sub-libp2p",
+							"Libp2p => DHT bootstrap error: {e:?}",
+						),
+					},
 					// We never start any other type of query.
 					KademliaEvent::OutboundQueryProgressed { result: e, .. } => {
 						warn!(target: "sub-libp2p", "Libp2p => Unhandled Kademlia event: {:?}", e)
 					},
+					Event::ModeChanged { new_mode } => {
+						debug!(target: "sub-libp2p", "Libp2p => Kademlia mode changed: {new_mode}")
+					},
 				},
 				ToSwarm::Dial { opts } => return Poll::Ready(ToSwarm::Dial { opts }),
-				ToSwarm::NotifyHandler { peer_id, handler, event } =>
-					return Poll::Ready(ToSwarm::NotifyHandler { peer_id, handler, event }),
-				ToSwarm::CloseConnection { peer_id, connection } =>
-					return Poll::Ready(ToSwarm::CloseConnection { peer_id, connection }),
-				ToSwarm::NewExternalAddrCandidate(observed) =>
-					return Poll::Ready(ToSwarm::NewExternalAddrCandidate(observed)),
-				ToSwarm::ExternalAddrConfirmed(addr) =>
-					return Poll::Ready(ToSwarm::ExternalAddrConfirmed(addr)),
-				ToSwarm::ExternalAddrExpired(addr) =>
-					return Poll::Ready(ToSwarm::ExternalAddrExpired(addr)),
-				ToSwarm::ListenOn { opts } => return Poll::Ready(ToSwarm::ListenOn { opts }),
-				ToSwarm::RemoveListener { id } =>
-					return Poll::Ready(ToSwarm::RemoveListener { id }),
+				event => {
+					return Poll::Ready(event.map_out(|_| {
+						unreachable!("`GenerateEvent` is handled in a branch above; qed")
+					}));
+				},
 			}
 		}
 
 		// Poll mDNS.
-		while let Poll::Ready(ev) = self.mdns.poll(cx, params) {
+		while let Poll::Ready(ev) = self.mdns.poll(cx) {
 			match ev {
 				ToSwarm::GenerateEvent(event) => match event {
 					mdns::Event::Discovered(list) => {
@@ -1148,17 +1149,17 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 				},
 				// `event` is an enum with no variant
 				ToSwarm::NotifyHandler { event, .. } => match event {},
-				ToSwarm::CloseConnection { peer_id, connection } =>
-					return Poll::Ready(ToSwarm::CloseConnection { peer_id, connection }),
-				ToSwarm::NewExternalAddrCandidate(observed) =>
-					return Poll::Ready(ToSwarm::NewExternalAddrCandidate(observed)),
-				ToSwarm::ExternalAddrConfirmed(addr) =>
-					return Poll::Ready(ToSwarm::ExternalAddrConfirmed(addr)),
-				ToSwarm::ExternalAddrExpired(addr) =>
-					return Poll::Ready(ToSwarm::ExternalAddrExpired(addr)),
-				ToSwarm::ListenOn { opts } => return Poll::Ready(ToSwarm::ListenOn { opts }),
-				ToSwarm::RemoveListener { id } =>
-					return Poll::Ready(ToSwarm::RemoveListener { id }),
+				event => {
+					return Poll::Ready(
+						event
+							.map_in(|_| {
+								unreachable!("`NotifyHandler` is handled in a branch above; qed")
+							})
+							.map_out(|_| {
+								unreachable!("`GenerateEvent` is handled in a branch above; qed")
+							}),
+					);
+				},
 			}
 		}
 
@@ -1201,21 +1202,14 @@ mod tests {
 		},
 		identity::Keypair,
 		noise,
-		swarm::{Executor, Swarm, SwarmEvent},
+		swarm::{Swarm, SwarmEvent},
 		yamux, Multiaddr,
 	};
 	use sp_core::hash::H256;
-	use std::{collections::HashSet, pin::Pin, task::Poll};
+	use std::{collections::HashSet, task::Poll, time::Duration};
 
-	struct TokioExecutor(tokio::runtime::Runtime);
-	impl Executor for TokioExecutor {
-		fn exec(&self, f: Pin<Box<dyn Future<Output = ()> + Send>>) {
-			let _ = self.0.spawn(f);
-		}
-	}
-
-	#[test]
-	fn discovery_working() {
+	#[tokio::test]
+	async fn discovery_working() {
 		let mut first_swarm_peer_id_and_addr = None;
 
 		let genesis_hash = H256::from_low_u64_be(1);
@@ -1226,42 +1220,40 @@ mod tests {
 		// the first swarm via `with_permanent_addresses`.
 		let mut swarms = (0..25)
 			.map(|i| {
-				let keypair = Keypair::generate_ed25519();
-
-				let transport = MemoryTransport::new()
-					.upgrade(upgrade::Version::V1)
-					.authenticate(noise::Config::new(&keypair).unwrap())
-					.multiplex(yamux::Config::default())
-					.boxed();
-
-				let behaviour = {
-					let mut config = DiscoveryConfig::new(keypair.public().to_peer_id());
-					config
-						.with_permanent_addresses(first_swarm_peer_id_and_addr.clone())
-						.allow_private_ip(true)
-						.allow_non_globals_in_dht(true)
-						.discovery_limit(50)
-						.with_kademlia(genesis_hash, fork_id, &protocol_id);
-
-					config.finish()
-				};
-
-				let runtime = tokio::runtime::Runtime::new().unwrap();
-				#[allow(deprecated)]
-				let mut swarm = libp2p::swarm::SwarmBuilder::with_executor(
-					transport,
-					behaviour,
-					keypair.public().to_peer_id(),
-					TokioExecutor(runtime),
-				)
-				.build();
+				let mut swarm = libp2p::SwarmBuilder::with_new_identity()
+					.with_tokio()
+					.with_other_transport(|keypair| {
+						MemoryTransport::new()
+							.upgrade(upgrade::Version::V1)
+							.authenticate(noise::Config::new(&keypair).unwrap())
+							.multiplex(yamux::Config::default())
+							.boxed()
+					})
+					.unwrap()
+					.with_behaviour(|keypair| {
+						let mut config = DiscoveryConfig::new(keypair.public().to_peer_id());
+						config
+							.with_permanent_addresses(first_swarm_peer_id_and_addr.clone())
+							.allow_private_ip(true)
+							.allow_non_globals_in_dht(true)
+							.discovery_limit(50)
+							.with_kademlia(genesis_hash, fork_id, &protocol_id);
+
+						config.finish()
+					})
+					.unwrap()
+					.with_swarm_config(|config| {
+						// This is taken care of by notification protocols in non-test environment
+						config.with_idle_connection_timeout(Duration::from_secs(10))
+					})
+					.build();
 
 				let listen_addr: Multiaddr =
 					format!("/memory/{}", rand::random::<u64>()).parse().unwrap();
 
 				if i == 0 {
 					first_swarm_peer_id_and_addr =
-						Some((keypair.public().to_peer_id(), listen_addr.clone()))
+						Some((*swarm.local_peer_id(), listen_addr.clone()))
 				}
 
 				swarm.listen_on(listen_addr.clone()).unwrap();
@@ -1348,7 +1340,7 @@ mod tests {
 			}
 		});
 
-		futures::executor::block_on(fut);
+		fut.await
 	}
 
 	#[test]
diff --git a/substrate/client/network/src/network_state.rs b/substrate/client/network/src/network_state.rs
index cf8b8b55a7ff..65fd494739ee 100644
--- a/substrate/client/network/src/network_state.rs
+++ b/substrate/client/network/src/network_state.rs
@@ -106,7 +106,7 @@ pub enum Endpoint {
 impl From<ConnectedPoint> for PeerEndpoint {
 	fn from(endpoint: ConnectedPoint) -> Self {
 		match endpoint {
-			ConnectedPoint::Dialer { address, role_override } =>
+			ConnectedPoint::Dialer { address, role_override, port_use: _ } =>
 				Self::Dialing(address, role_override.into()),
 			ConnectedPoint::Listener { local_addr, send_back_addr } =>
 				Self::Listening { local_addr, send_back_addr },
diff --git a/substrate/client/network/src/peer_info.rs b/substrate/client/network/src/peer_info.rs
index 21eeea6bcc0c..a673f06fd622 100644
--- a/substrate/client/network/src/peer_info.rs
+++ b/substrate/client/network/src/peer_info.rs
@@ -25,7 +25,7 @@ use either::Either;
 use fnv::FnvHashMap;
 use futures::prelude::*;
 use libp2p::{
-	core::{ConnectedPoint, Endpoint},
+	core::{transport::PortUse, ConnectedPoint, Endpoint},
 	identify::{
 		Behaviour as Identify, Config as IdentifyConfig, Event as IdentifyEvent,
 		Info as IdentifyInfo,
@@ -38,8 +38,8 @@ use libp2p::{
 			ExternalAddrConfirmed, FromSwarm, ListenFailure,
 		},
 		ConnectionDenied, ConnectionHandler, ConnectionHandlerSelect, ConnectionId,
-		NetworkBehaviour, NewExternalAddrCandidate, PollParameters, THandler, THandlerInEvent,
-		THandlerOutEvent, ToSwarm,
+		NetworkBehaviour, NewExternalAddrCandidate, THandler, THandlerInEvent, THandlerOutEvent,
+		ToSwarm,
 	},
 	Multiaddr, PeerId,
 };
@@ -275,23 +275,26 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 		peer: PeerId,
 		addr: &Multiaddr,
 		role_override: Endpoint,
+		port_use: PortUse,
 	) -> Result<THandler<Self>, ConnectionDenied> {
 		let ping_handler = self.ping.handle_established_outbound_connection(
 			connection_id,
 			peer,
 			addr,
 			role_override,
+			port_use,
 		)?;
 		let identify_handler = self.identify.handle_established_outbound_connection(
 			connection_id,
 			peer,
 			addr,
 			role_override,
+			port_use,
 		)?;
 		Ok(ping_handler.select(identify_handler))
 	}
 
-	fn on_swarm_event(&mut self, event: FromSwarm<Self::ConnectionHandler>) {
+	fn on_swarm_event(&mut self, event: FromSwarm) {
 		match event {
 			FromSwarm::ConnectionEstablished(
 				e @ ConnectionEstablished { peer_id, endpoint, .. },
@@ -319,22 +322,21 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 				peer_id,
 				connection_id,
 				endpoint,
-				handler,
+				cause,
 				remaining_established,
 			}) => {
-				let (ping_handler, identity_handler) = handler.into_inner();
 				self.ping.on_swarm_event(FromSwarm::ConnectionClosed(ConnectionClosed {
 					peer_id,
 					connection_id,
 					endpoint,
-					handler: ping_handler,
+					cause,
 					remaining_established,
 				}));
 				self.identify.on_swarm_event(FromSwarm::ConnectionClosed(ConnectionClosed {
 					peer_id,
 					connection_id,
 					endpoint,
-					handler: identity_handler,
+					cause,
 					remaining_established,
 				}));
 
@@ -369,18 +371,21 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 				send_back_addr,
 				error,
 				connection_id,
+				peer_id,
 			}) => {
 				self.ping.on_swarm_event(FromSwarm::ListenFailure(ListenFailure {
 					local_addr,
 					send_back_addr,
 					error,
 					connection_id,
+					peer_id,
 				}));
 				self.identify.on_swarm_event(FromSwarm::ListenFailure(ListenFailure {
 					local_addr,
 					send_back_addr,
 					error,
 					connection_id,
+					peer_id,
 				}));
 			},
 			FromSwarm::ListenerError(e) => {
@@ -438,6 +443,11 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 				self.ping.on_swarm_event(FromSwarm::NewListenAddr(e));
 				self.identify.on_swarm_event(FromSwarm::NewListenAddr(e));
 			},
+			event => {
+				debug!(target: "sub-libp2p", "New unknown `FromSwarm` libp2p event: {event:?}");
+				self.ping.on_swarm_event(event);
+				self.identify.on_swarm_event(event);
+			},
 		}
 	}
 
@@ -455,47 +465,29 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 		}
 	}
 
-	fn poll(
-		&mut self,
-		cx: &mut Context,
-		params: &mut impl PollParameters,
-	) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
+	fn poll(&mut self, cx: &mut Context) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
 		if let Some(event) = self.pending_actions.pop_front() {
 			return Poll::Ready(event)
 		}
 
 		loop {
-			match self.ping.poll(cx, params) {
+			match self.ping.poll(cx) {
 				Poll::Pending => break,
 				Poll::Ready(ToSwarm::GenerateEvent(ev)) => {
 					if let PingEvent { peer, result: Ok(rtt), connection } = ev {
 						self.handle_ping_report(&peer, rtt, connection)
 					}
 				},
-				Poll::Ready(ToSwarm::Dial { opts }) => return Poll::Ready(ToSwarm::Dial { opts }),
-				Poll::Ready(ToSwarm::NotifyHandler { peer_id, handler, event }) =>
-					return Poll::Ready(ToSwarm::NotifyHandler {
-						peer_id,
-						handler,
-						event: Either::Left(event),
-					}),
-				Poll::Ready(ToSwarm::CloseConnection { peer_id, connection }) =>
-					return Poll::Ready(ToSwarm::CloseConnection { peer_id, connection }),
-				Poll::Ready(ToSwarm::NewExternalAddrCandidate(observed)) =>
-					return Poll::Ready(ToSwarm::NewExternalAddrCandidate(observed)),
-				Poll::Ready(ToSwarm::ExternalAddrConfirmed(addr)) =>
-					return Poll::Ready(ToSwarm::ExternalAddrConfirmed(addr)),
-				Poll::Ready(ToSwarm::ExternalAddrExpired(addr)) =>
-					return Poll::Ready(ToSwarm::ExternalAddrExpired(addr)),
-				Poll::Ready(ToSwarm::ListenOn { opts }) =>
-					return Poll::Ready(ToSwarm::ListenOn { opts }),
-				Poll::Ready(ToSwarm::RemoveListener { id }) =>
-					return Poll::Ready(ToSwarm::RemoveListener { id }),
+				Poll::Ready(event) => {
+					return Poll::Ready(event.map_in(Either::Left).map_out(|_| {
+						unreachable!("`GenerateEvent` is handled in a branch above; qed")
+					}));
+				},
 			}
 		}
 
 		loop {
-			match self.identify.poll(cx, params) {
+			match self.identify.poll(cx) {
 				Poll::Pending => break,
 				Poll::Ready(ToSwarm::GenerateEvent(event)) => match event {
 					IdentifyEvent::Received { peer_id, info, .. } => {
@@ -503,31 +495,20 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 						let event = PeerInfoEvent::Identified { peer_id, info };
 						return Poll::Ready(ToSwarm::GenerateEvent(event))
 					},
-					IdentifyEvent::Error { peer_id, error } => {
-						debug!(target: "sub-libp2p", "Identification with peer {:?} failed => {}", peer_id, error)
+					IdentifyEvent::Error { connection_id, peer_id, error } => {
+						debug!(
+							target: "sub-libp2p",
+							"Identification with peer {peer_id:?}({connection_id}) failed => {error}"
+						);
 					},
 					IdentifyEvent::Pushed { .. } => {},
 					IdentifyEvent::Sent { .. } => {},
 				},
-				Poll::Ready(ToSwarm::Dial { opts }) => return Poll::Ready(ToSwarm::Dial { opts }),
-				Poll::Ready(ToSwarm::NotifyHandler { peer_id, handler, event }) =>
-					return Poll::Ready(ToSwarm::NotifyHandler {
-						peer_id,
-						handler,
-						event: Either::Right(event),
-					}),
-				Poll::Ready(ToSwarm::CloseConnection { peer_id, connection }) =>
-					return Poll::Ready(ToSwarm::CloseConnection { peer_id, connection }),
-				Poll::Ready(ToSwarm::NewExternalAddrCandidate(observed)) =>
-					return Poll::Ready(ToSwarm::NewExternalAddrCandidate(observed)),
-				Poll::Ready(ToSwarm::ExternalAddrConfirmed(addr)) =>
-					return Poll::Ready(ToSwarm::ExternalAddrConfirmed(addr)),
-				Poll::Ready(ToSwarm::ExternalAddrExpired(addr)) =>
-					return Poll::Ready(ToSwarm::ExternalAddrExpired(addr)),
-				Poll::Ready(ToSwarm::ListenOn { opts }) =>
-					return Poll::Ready(ToSwarm::ListenOn { opts }),
-				Poll::Ready(ToSwarm::RemoveListener { id }) =>
-					return Poll::Ready(ToSwarm::RemoveListener { id }),
+				Poll::Ready(event) => {
+					return Poll::Ready(event.map_in(Either::Right).map_out(|_| {
+						unreachable!("`GenerateEvent` is handled in a branch above; qed")
+					}));
+				},
 			}
 		}
 
diff --git a/substrate/client/network/src/protocol.rs b/substrate/client/network/src/protocol.rs
index 402baa7bb2a4..6da1d601b34f 100644
--- a/substrate/client/network/src/protocol.rs
+++ b/substrate/client/network/src/protocol.rs
@@ -27,10 +27,10 @@ use crate::{
 
 use codec::Encode;
 use libp2p::{
-	core::Endpoint,
+	core::{transport::PortUse, Endpoint},
 	swarm::{
-		behaviour::FromSwarm, ConnectionDenied, ConnectionId, NetworkBehaviour, PollParameters,
-		THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
+		behaviour::FromSwarm, ConnectionDenied, ConnectionId, NetworkBehaviour, THandler,
+		THandlerInEvent, THandlerOutEvent, ToSwarm,
 	},
 	Multiaddr, PeerId,
 };
@@ -47,9 +47,7 @@ use notifications::{Notifications, NotificationsOut};
 
 pub(crate) use notifications::ProtocolHandle;
 
-pub use notifications::{
-	notification_service, NotificationsSink, NotifsHandlerError, ProtocolHandlePair, Ready,
-};
+pub use notifications::{notification_service, NotificationsSink, ProtocolHandlePair, Ready};
 
 mod notifications;
 
@@ -250,12 +248,14 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 		peer: PeerId,
 		addr: &Multiaddr,
 		role_override: Endpoint,
+		port_use: PortUse,
 	) -> Result<THandler<Self>, ConnectionDenied> {
 		self.behaviour.handle_established_outbound_connection(
 			connection_id,
 			peer,
 			addr,
 			role_override,
+			port_use,
 		)
 	}
 
@@ -271,7 +271,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 		Ok(Vec::new())
 	}
 
-	fn on_swarm_event(&mut self, event: FromSwarm<Self::ConnectionHandler>) {
+	fn on_swarm_event(&mut self, event: FromSwarm) {
 		self.behaviour.on_swarm_event(event);
 	}
 
@@ -287,26 +287,15 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 	fn poll(
 		&mut self,
 		cx: &mut std::task::Context,
-		params: &mut impl PollParameters,
 	) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
-		let event = match self.behaviour.poll(cx, params) {
+		let event = match self.behaviour.poll(cx) {
 			Poll::Pending => return Poll::Pending,
 			Poll::Ready(ToSwarm::GenerateEvent(ev)) => ev,
-			Poll::Ready(ToSwarm::Dial { opts }) => return Poll::Ready(ToSwarm::Dial { opts }),
-			Poll::Ready(ToSwarm::NotifyHandler { peer_id, handler, event }) =>
-				return Poll::Ready(ToSwarm::NotifyHandler { peer_id, handler, event }),
-			Poll::Ready(ToSwarm::CloseConnection { peer_id, connection }) =>
-				return Poll::Ready(ToSwarm::CloseConnection { peer_id, connection }),
-			Poll::Ready(ToSwarm::NewExternalAddrCandidate(observed)) =>
-				return Poll::Ready(ToSwarm::NewExternalAddrCandidate(observed)),
-			Poll::Ready(ToSwarm::ExternalAddrConfirmed(addr)) =>
-				return Poll::Ready(ToSwarm::ExternalAddrConfirmed(addr)),
-			Poll::Ready(ToSwarm::ExternalAddrExpired(addr)) =>
-				return Poll::Ready(ToSwarm::ExternalAddrExpired(addr)),
-			Poll::Ready(ToSwarm::ListenOn { opts }) =>
-				return Poll::Ready(ToSwarm::ListenOn { opts }),
-			Poll::Ready(ToSwarm::RemoveListener { id }) =>
-				return Poll::Ready(ToSwarm::RemoveListener { id }),
+			Poll::Ready(event) => {
+				return Poll::Ready(event.map_out(|_| {
+					unreachable!("`GenerateEvent` is handled in a branch above; qed")
+				}));
+			},
 		};
 
 		let outcome = match event {
diff --git a/substrate/client/network/src/protocol/notifications.rs b/substrate/client/network/src/protocol/notifications.rs
index 10fa329097d1..2691496234ad 100644
--- a/substrate/client/network/src/protocol/notifications.rs
+++ b/substrate/client/network/src/protocol/notifications.rs
@@ -21,7 +21,7 @@
 
 pub use self::{
 	behaviour::{Notifications, NotificationsOut, ProtocolConfig},
-	handler::{NotificationsSink, NotifsHandlerError, Ready},
+	handler::{NotificationsSink, Ready},
 	service::{notification_service, ProtocolHandlePair},
 };
 
diff --git a/substrate/client/network/src/protocol/notifications/behaviour.rs b/substrate/client/network/src/protocol/notifications/behaviour.rs
index a562546145c8..e6909fcdefea 100644
--- a/substrate/client/network/src/protocol/notifications/behaviour.rs
+++ b/substrate/client/network/src/protocol/notifications/behaviour.rs
@@ -33,11 +33,11 @@ use bytes::BytesMut;
 use fnv::FnvHashMap;
 use futures::{future::BoxFuture, prelude::*, stream::FuturesUnordered};
 use libp2p::{
-	core::{Endpoint, Multiaddr},
+	core::{transport::PortUse, Endpoint, Multiaddr},
 	swarm::{
 		behaviour::{ConnectionClosed, ConnectionEstablished, DialFailure, FromSwarm},
-		ConnectionDenied, ConnectionId, DialError, NetworkBehaviour, NotifyHandler, PollParameters,
-		THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
+		ConnectionDenied, ConnectionId, DialError, NetworkBehaviour, NotifyHandler, THandler,
+		THandlerInEvent, THandlerOutEvent, ToSwarm,
 	},
 	PeerId,
 };
@@ -49,6 +49,7 @@ use smallvec::SmallVec;
 use tokio::sync::oneshot::error::RecvError;
 use tokio_stream::StreamMap;
 
+use libp2p::swarm::CloseConnection;
 use std::{
 	cmp,
 	collections::{hash_map::Entry, VecDeque},
@@ -1233,11 +1234,12 @@ impl NetworkBehaviour for Notifications {
 		peer: PeerId,
 		_addr: &Multiaddr,
 		_role_override: Endpoint,
+		_port_use: PortUse,
 	) -> Result<THandler<Self>, ConnectionDenied> {
 		Ok(NotifsHandler::new(peer, self.notif_protocols.clone(), Some(self.metrics.clone())))
 	}
 
-	fn on_swarm_event(&mut self, event: FromSwarm<Self::ConnectionHandler>) {
+	fn on_swarm_event(&mut self, event: FromSwarm) {
 		match event {
 			FromSwarm::ConnectionEstablished(ConnectionEstablished {
 				peer_id,
@@ -1670,6 +1672,9 @@ impl NetworkBehaviour for Notifications {
 			FromSwarm::ExternalAddrConfirmed(_) => {},
 			FromSwarm::AddressChange(_) => {},
 			FromSwarm::NewListenAddr(_) => {},
+			event => {
+				warn!(target: "sub-libp2p", "New unknown `FromSwarm` libp2p event: {event:?}");
+			},
 		}
 	}
 
@@ -2217,14 +2222,19 @@ impl NetworkBehaviour for Notifications {
 					);
 				}
 			},
+			NotifsHandlerOut::Close { protocol_index } => {
+				let set_id = SetId::from(protocol_index);
+
+				trace!(target: "sub-libp2p", "Handler({}, {:?}) => SyncNotificationsClogged({:?})", peer_id, connection_id, set_id);
+				self.events.push_back(ToSwarm::CloseConnection {
+					peer_id,
+					connection: CloseConnection::One(connection_id),
+				});
+			},
 		}
 	}
 
-	fn poll(
-		&mut self,
-		cx: &mut Context,
-		_params: &mut impl PollParameters,
-	) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
+	fn poll(&mut self, cx: &mut Context) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
 		if let Some(event) = self.events.pop_front() {
 			return Poll::Ready(event)
 		}
@@ -2359,7 +2369,6 @@ impl NetworkBehaviour for Notifications {
 }
 
 #[cfg(test)]
-#[allow(deprecated)]
 mod tests {
 	use super::*;
 	use crate::{
@@ -2386,17 +2395,6 @@ mod tests {
 		}
 	}
 
-	#[derive(Clone)]
-	struct MockPollParams {}
-
-	impl PollParameters for MockPollParams {
-		type SupportedProtocolsIter = std::vec::IntoIter<Vec<u8>>;
-
-		fn supported_protocols(&self) -> Self::SupportedProtocolsIter {
-			vec![].into_iter()
-		}
-	}
-
 	fn development_notifs(
 	) -> (Notifications, ProtocolController, Box<dyn crate::service::traits::NotificationService>)
 	{
@@ -2654,7 +2652,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -2854,7 +2852,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -3007,7 +3005,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -3051,7 +3049,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -3121,7 +3119,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -3269,7 +3267,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn1,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -3395,7 +3393,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -3469,7 +3467,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -3532,7 +3530,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn1,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -3546,7 +3544,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn2,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -3600,7 +3598,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -3658,7 +3656,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn2,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -3719,7 +3717,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn1,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -3788,7 +3786,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn1,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -3829,7 +3827,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -3952,7 +3950,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -3972,11 +3970,9 @@ mod tests {
 		assert!(notif.peers.get(&(peer, set_id)).is_some());
 
 		if tokio::time::timeout(Duration::from_secs(5), async {
-			let mut params = MockPollParams {};
-
 			loop {
 				futures::future::poll_fn(|cx| {
-					let _ = notif.poll(cx, &mut params);
+					let _ = notif.poll(cx);
 					Poll::Ready(())
 				})
 				.await;
@@ -4080,11 +4076,9 @@ mod tests {
 		// verify that the code continues to keep the peer disabled by resetting the timer
 		// after the first one expired.
 		if tokio::time::timeout(Duration::from_secs(5), async {
-			let mut params = MockPollParams {};
-
 			loop {
 				futures::future::poll_fn(|cx| {
-					let _ = notif.poll(cx, &mut params);
+					let _ = notif.poll(cx);
 					Poll::Ready(())
 				})
 				.await;
@@ -4262,7 +4256,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -4503,7 +4497,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: ConnectionId::new_unchecked(0),
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -4605,7 +4599,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: ConnectionId::new_unchecked(0),
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -4687,7 +4681,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: ConnectionId::new_unchecked(0),
 				endpoint: &endpoint.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -4804,7 +4798,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: ConnectionId::new_unchecked(1337),
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -4839,7 +4833,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: ConnectionId::new_unchecked(1337),
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -4890,7 +4884,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: ConnectionId::new_unchecked(1337),
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -4937,7 +4931,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -4987,7 +4981,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: ConnectionId::new_unchecked(1337),
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -5030,7 +5024,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
@@ -5041,7 +5035,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, vec![], None),
+				cause: None,
 				remaining_established: 0usize,
 			},
 		));
diff --git a/substrate/client/network/src/protocol/notifications/handler.rs b/substrate/client/network/src/protocol/notifications/handler.rs
index bff60ba1125f..332de9f19c41 100644
--- a/substrate/client/network/src/protocol/notifications/handler.rs
+++ b/substrate/client/network/src/protocol/notifications/handler.rs
@@ -74,12 +74,12 @@ use futures::{
 };
 use libp2p::{
 	swarm::{
-		handler::ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent, KeepAlive, Stream,
+		handler::ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent, Stream,
 		SubstreamProtocol,
 	},
 	PeerId,
 };
-use log::error;
+use log::{error, warn};
 use parking_lot::{Mutex, RwLock};
 use std::{
 	collections::VecDeque,
@@ -87,7 +87,7 @@ use std::{
 	pin::Pin,
 	sync::Arc,
 	task::{Context, Poll},
-	time::{Duration, Instant},
+	time::Duration,
 };
 
 /// Number of pending notifications in asynchronous contexts.
@@ -113,16 +113,18 @@ pub struct NotifsHandler {
 	/// List of notification protocols, specified by the user at initialization.
 	protocols: Vec<Protocol>,
 
-	/// When the connection with the remote has been successfully established.
-	when_connection_open: Instant,
+	/// Whether to keep connection alive
+	keep_alive: bool,
+
+	/// Optional future that keeps connection alive for a certain amount of time.
+	// TODO: this should be safe to remove, see https://github.com/paritytech/polkadot-sdk/issues/6350
+	keep_alive_timeout_future: Option<Pin<Box<dyn Future<Output = ()> + Send + 'static>>>,
 
 	/// Remote we are connected to.
 	peer_id: PeerId,
 
 	/// Events to return in priority from `poll`.
-	events_queue: VecDeque<
-		ConnectionHandlerEvent<NotificationsOut, usize, NotifsHandlerOut, NotifsHandlerError>,
-	>,
+	events_queue: VecDeque<ConnectionHandlerEvent<NotificationsOut, usize, NotifsHandlerOut>>,
 
 	/// Metrics.
 	metrics: Option<Arc<NotificationMetrics>>,
@@ -149,7 +151,12 @@ impl NotifsHandler {
 				})
 				.collect(),
 			peer_id,
-			when_connection_open: Instant::now(),
+			// Keep connection alive initially until below timeout expires
+			keep_alive: true,
+			// A grace period of `INITIAL_KEEPALIVE_TIME` must be given to leave time for the remote
+			// to express desire to open substreams.
+			// TODO: This is a hack and ideally should not be necessary
+			keep_alive_timeout_future: Some(Box::pin(tokio::time::sleep(INITIAL_KEEPALIVE_TIME))),
 			events_queue: VecDeque::with_capacity(16),
 			metrics: metrics.map_or(None, |metrics| Some(Arc::new(metrics))),
 		}
@@ -327,6 +334,12 @@ pub enum NotifsHandlerOut {
 		/// Message that has been received.
 		message: BytesMut,
 	},
+
+	/// Close connection
+	Close {
+		/// Index of the protocol in the list of protocols passed at initialization.
+		protocol_index: usize,
+	},
 }
 
 /// Sink connected directly to the node background task. Allows sending notifications to the peer.
@@ -465,17 +478,9 @@ impl<'a> Ready<'a> {
 	}
 }
 
-/// Error specific to the collection of protocols.
-#[derive(Debug, thiserror::Error)]
-pub enum NotifsHandlerError {
-	#[error("Channel of synchronous notifications is full.")]
-	SyncNotificationsClogged,
-}
-
 impl ConnectionHandler for NotifsHandler {
 	type FromBehaviour = NotifsHandlerIn;
 	type ToBehaviour = NotifsHandlerOut;
-	type Error = NotifsHandlerError;
 	type InboundProtocol = UpgradeCollec<NotificationsIn>;
 	type OutboundProtocol = NotificationsOut;
 	// Index within the `out_protocols`.
@@ -616,6 +621,9 @@ impl ConnectionHandler for NotifsHandler {
 				State::Open { .. } => debug_assert!(false),
 			},
 			ConnectionEvent::ListenUpgradeError(_listen_upgrade_error) => {},
+			event => {
+				warn!(target: "sub-libp2p", "New unknown `ConnectionEvent` libp2p event: {event:?}");
+			},
 		}
 	}
 
@@ -711,35 +719,36 @@ impl ConnectionHandler for NotifsHandler {
 		}
 	}
 
-	fn connection_keep_alive(&self) -> KeepAlive {
+	fn connection_keep_alive(&self) -> bool {
 		// `Yes` if any protocol has some activity.
 		if self.protocols.iter().any(|p| !matches!(p.state, State::Closed { .. })) {
-			return KeepAlive::Yes
+			return true;
 		}
 
-		// A grace period of `INITIAL_KEEPALIVE_TIME` must be given to leave time for the remote
-		// to express desire to open substreams.
-		#[allow(deprecated)]
-		KeepAlive::Until(self.when_connection_open + INITIAL_KEEPALIVE_TIME)
+		self.keep_alive
 	}
 
-	#[allow(deprecated)]
 	fn poll(
 		&mut self,
 		cx: &mut Context,
 	) -> Poll<
-		ConnectionHandlerEvent<
-			Self::OutboundProtocol,
-			Self::OutboundOpenInfo,
-			Self::ToBehaviour,
-			Self::Error,
-		>,
+		ConnectionHandlerEvent<Self::OutboundProtocol, Self::OutboundOpenInfo, Self::ToBehaviour>,
 	> {
+		{
+			let maybe_keep_alive_timeout_future = &mut self.keep_alive_timeout_future;
+			if let Some(keep_alive_timeout_future) = maybe_keep_alive_timeout_future {
+				if keep_alive_timeout_future.poll_unpin(cx).is_ready() {
+					maybe_keep_alive_timeout_future.take();
+					self.keep_alive = false;
+				}
+			}
+		}
+
 		if let Some(ev) = self.events_queue.pop_front() {
 			return Poll::Ready(ev)
 		}
 
-		// For each open substream, try send messages from `notifications_sink_rx` to the
+		// For each open substream, try to send messages from `notifications_sink_rx` to the
 		// substream.
 		for protocol_index in 0..self.protocols.len() {
 			if let State::Open {
@@ -750,11 +759,10 @@ impl ConnectionHandler for NotifsHandler {
 					// Only proceed with `out_substream.poll_ready_unpin` if there is an element
 					// available in `notifications_sink_rx`. This avoids waking up the task when
 					// a substream is ready to send if there isn't actually something to send.
-					#[allow(deprecated)]
 					match Pin::new(&mut *notifications_sink_rx).as_mut().poll_peek(cx) {
 						Poll::Ready(Some(&NotificationsSinkMessage::ForceClose)) =>
-							return Poll::Ready(ConnectionHandlerEvent::Close(
-								NotifsHandlerError::SyncNotificationsClogged,
+							return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
+								NotifsHandlerOut::Close { protocol_index },
 							)),
 						Poll::Ready(Some(&NotificationsSinkMessage::Notification { .. })) => {},
 						Poll::Ready(None) | Poll::Pending => break,
@@ -975,6 +983,17 @@ pub mod tests {
 		rx_buffer: BytesMut,
 	}
 
+	/// Mirror of `ActiveStreamCounter` in `libp2p`
+	#[allow(dead_code)]
+	struct MockActiveStreamCounter(Arc<()>);
+
+	// Mirror of `Stream` in `libp2p`
+	#[allow(dead_code)]
+	struct MockStream {
+		stream: Negotiated<SubstreamBox>,
+		counter: Option<MockActiveStreamCounter>,
+	}
+
 	impl MockSubstream {
 		/// Create new substream pair.
 		pub fn new() -> (Self, Self) {
@@ -1004,16 +1023,11 @@ pub mod tests {
 
 		/// Unsafe substitute for `Stream::new` private constructor.
 		fn stream_new(stream: Negotiated<SubstreamBox>) -> Stream {
+			let stream = MockStream { stream, counter: None };
 			// Static asserts to make sure this doesn't break.
 			const _: () = {
-				assert!(
-					core::mem::size_of::<Stream>() ==
-						core::mem::size_of::<Negotiated<SubstreamBox>>()
-				);
-				assert!(
-					core::mem::align_of::<Stream>() ==
-						core::mem::align_of::<Negotiated<SubstreamBox>>()
-				);
+				assert!(core::mem::size_of::<Stream>() == core::mem::size_of::<MockStream>());
+				assert!(core::mem::align_of::<Stream>() == core::mem::align_of::<MockStream>());
 			};
 
 			unsafe { core::mem::transmute(stream) }
@@ -1084,24 +1098,16 @@ pub mod tests {
 
 	/// Create new [`NotifsHandler`].
 	fn notifs_handler() -> NotifsHandler {
-		let proto = Protocol {
-			config: ProtocolConfig {
+		NotifsHandler::new(
+			PeerId::random(),
+			vec![ProtocolConfig {
 				name: "/foo".into(),
 				fallback_names: vec![],
 				handshake: Arc::new(RwLock::new(b"hello, world".to_vec())),
 				max_notification_size: u64::MAX,
-			},
-			in_upgrade: NotificationsIn::new("/foo", Vec::new(), u64::MAX),
-			state: State::Closed { pending_opening: false },
-		};
-
-		NotifsHandler {
-			protocols: vec![proto],
-			when_connection_open: Instant::now(),
-			peer_id: PeerId::random(),
-			events_queue: VecDeque::new(),
-			metrics: None,
-		}
+			}],
+			None,
+		)
 	}
 
 	// verify that if another substream is attempted to be opened by remote while an inbound
@@ -1608,12 +1614,11 @@ pub mod tests {
 		notifications_sink.send_sync_notification(vec![1, 3, 3, 9]);
 		notifications_sink.send_sync_notification(vec![1, 3, 4, 0]);
 
-		#[allow(deprecated)]
 		futures::future::poll_fn(|cx| {
 			assert!(std::matches!(
 				handler.poll(cx),
-				Poll::Ready(ConnectionHandlerEvent::Close(
-					NotifsHandlerError::SyncNotificationsClogged,
+				Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
+					NotifsHandlerOut::Close { .. }
 				))
 			));
 			Poll::Ready(())
diff --git a/substrate/client/network/src/protocol/notifications/tests.rs b/substrate/client/network/src/protocol/notifications/tests.rs
index a8eeb2bb1980..50f03b5911b6 100644
--- a/substrate/client/network/src/protocol/notifications/tests.rs
+++ b/substrate/client/network/src/protocol/notifications/tests.rs
@@ -30,30 +30,25 @@ use crate::{
 
 use futures::{future::BoxFuture, prelude::*};
 use libp2p::{
-	core::{transport::MemoryTransport, upgrade, Endpoint},
+	core::{
+		transport::{MemoryTransport, PortUse},
+		upgrade, Endpoint,
+	},
 	identity, noise,
 	swarm::{
-		self, behaviour::FromSwarm, ConnectionDenied, ConnectionId, Executor, NetworkBehaviour,
-		PollParameters, Swarm, SwarmEvent, THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
+		behaviour::FromSwarm, ConnectionDenied, ConnectionId, NetworkBehaviour, Swarm, SwarmEvent,
+		THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
 	},
-	yamux, Multiaddr, PeerId, Transport,
+	yamux, Multiaddr, PeerId, SwarmBuilder, Transport,
 };
 use sc_utils::mpsc::tracing_unbounded;
 use std::{
 	iter,
-	pin::Pin,
 	sync::Arc,
 	task::{Context, Poll},
 	time::Duration,
 };
 
-struct TokioExecutor(tokio::runtime::Runtime);
-impl Executor for TokioExecutor {
-	fn exec(&self, f: Pin<Box<dyn Future<Output = ()> + Send>>) {
-		let _ = self.0.spawn(f);
-	}
-}
-
 /// Builds two nodes that have each other as bootstrap nodes.
 /// This is to be used only for testing, and a panic will happen if something goes wrong.
 fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
@@ -67,13 +62,6 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 	for index in 0..2 {
 		let keypair = keypairs[index].clone();
 
-		let transport = MemoryTransport::new()
-			.upgrade(upgrade::Version::V1)
-			.authenticate(noise::Config::new(&keypair).unwrap())
-			.multiplex(yamux::Config::default())
-			.timeout(Duration::from_secs(20))
-			.boxed();
-
 		let (protocol_handle_pair, mut notif_service) =
 			crate::protocol::notifications::service::notification_service("/foo".into());
 		// The first swarm has the second peer ID present in the peerstore.
@@ -102,39 +90,8 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 		);
 
 		let (notif_handle, command_stream) = protocol_handle_pair.split();
-		let behaviour = CustomProtoWithAddr {
-			inner: Notifications::new(
-				vec![controller_handle],
-				from_controller,
-				NotificationMetrics::new(None),
-				iter::once((
-					ProtocolConfig {
-						name: "/foo".into(),
-						fallback_names: Vec::new(),
-						handshake: Vec::new(),
-						max_notification_size: 1024 * 1024,
-					},
-					notif_handle,
-					command_stream,
-				)),
-			),
-			peer_store_future: peer_store.run().boxed(),
-			protocol_controller_future: controller.run().boxed(),
-			addrs: addrs
-				.iter()
-				.enumerate()
-				.filter_map(|(n, a)| {
-					if n != index {
-						Some((keypairs[n].public().to_peer_id(), a.clone()))
-					} else {
-						None
-					}
-				})
-				.collect(),
-		};
 
-		let runtime = tokio::runtime::Runtime::new().unwrap();
-		runtime.spawn(async move {
+		tokio::spawn(async move {
 			loop {
 				if let NotificationEvent::ValidateInboundSubstream { result_tx, .. } =
 					notif_service.next_event().await.unwrap()
@@ -144,12 +101,49 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 			}
 		});
 
-		let mut swarm = Swarm::new(
-			transport,
-			behaviour,
-			keypairs[index].public().to_peer_id(),
-			swarm::Config::with_executor(TokioExecutor(runtime)),
-		);
+		let mut swarm = SwarmBuilder::with_existing_identity(keypair)
+			.with_tokio()
+			.with_other_transport(|keypair| {
+				MemoryTransport::new()
+					.upgrade(upgrade::Version::V1)
+					.authenticate(noise::Config::new(&keypair).unwrap())
+					.multiplex(yamux::Config::default())
+					.timeout(Duration::from_secs(20))
+					.boxed()
+			})
+			.unwrap()
+			.with_behaviour(|_keypair| CustomProtoWithAddr {
+				inner: Notifications::new(
+					vec![controller_handle],
+					from_controller,
+					NotificationMetrics::new(None),
+					iter::once((
+						ProtocolConfig {
+							name: "/foo".into(),
+							fallback_names: Vec::new(),
+							handshake: Vec::new(),
+							max_notification_size: 1024 * 1024,
+						},
+						notif_handle,
+						command_stream,
+					)),
+				),
+				peer_store_future: peer_store.run().boxed(),
+				protocol_controller_future: controller.run().boxed(),
+				addrs: addrs
+					.iter()
+					.enumerate()
+					.filter_map(|(n, a)| {
+						if n != index {
+							Some((keypairs[n].public().to_peer_id(), a.clone()))
+						} else {
+							None
+						}
+					})
+					.collect(),
+			})
+			.unwrap()
+			.build();
 		swarm.listen_on(addrs[index].clone()).unwrap();
 		out.push(swarm);
 	}
@@ -241,12 +235,18 @@ impl NetworkBehaviour for CustomProtoWithAddr {
 		peer: PeerId,
 		addr: &Multiaddr,
 		role_override: Endpoint,
+		port_use: PortUse,
 	) -> Result<THandler<Self>, ConnectionDenied> {
-		self.inner
-			.handle_established_outbound_connection(connection_id, peer, addr, role_override)
+		self.inner.handle_established_outbound_connection(
+			connection_id,
+			peer,
+			addr,
+			role_override,
+			port_use,
+		)
 	}
 
-	fn on_swarm_event(&mut self, event: FromSwarm<Self::ConnectionHandler>) {
+	fn on_swarm_event(&mut self, event: FromSwarm) {
 		self.inner.on_swarm_event(event);
 	}
 
@@ -259,19 +259,15 @@ impl NetworkBehaviour for CustomProtoWithAddr {
 		self.inner.on_connection_handler_event(peer_id, connection_id, event);
 	}
 
-	fn poll(
-		&mut self,
-		cx: &mut Context,
-		params: &mut impl PollParameters,
-	) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
+	fn poll(&mut self, cx: &mut Context) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
 		let _ = self.peer_store_future.poll_unpin(cx);
 		let _ = self.protocol_controller_future.poll_unpin(cx);
-		self.inner.poll(cx, params)
+		self.inner.poll(cx)
 	}
 }
 
-#[test]
-fn reconnect_after_disconnect() {
+#[tokio::test]
+async fn reconnect_after_disconnect() {
 	// We connect two nodes together, then force a disconnect (through the API of the `Service`),
 	// check that the disconnect worked, and finally check whether they successfully reconnect.
 
@@ -288,108 +284,106 @@ fn reconnect_after_disconnect() {
 	let mut service1_state = ServiceState::NotConnected;
 	let mut service2_state = ServiceState::NotConnected;
 
-	futures::executor::block_on(async move {
-		loop {
-			// Grab next event from services.
-			let event = {
-				let s1 = service1.select_next_some();
-				let s2 = service2.select_next_some();
-				futures::pin_mut!(s1, s2);
-				match future::select(s1, s2).await {
-					future::Either::Left((ev, _)) => future::Either::Left(ev),
-					future::Either::Right((ev, _)) => future::Either::Right(ev),
-				}
-			};
-
-			match event {
-				future::Either::Left(SwarmEvent::Behaviour(
-					NotificationsOut::CustomProtocolOpen { .. },
-				)) => match service1_state {
-					ServiceState::NotConnected => {
-						service1_state = ServiceState::FirstConnec;
-						if service2_state == ServiceState::FirstConnec {
-							service1
-								.behaviour_mut()
-								.disconnect_peer(Swarm::local_peer_id(&service2), SetId::from(0));
-						}
-					},
-					ServiceState::Disconnected => service1_state = ServiceState::ConnectedAgain,
-					ServiceState::FirstConnec | ServiceState::ConnectedAgain => panic!(),
-				},
-				future::Either::Left(SwarmEvent::Behaviour(
-					NotificationsOut::CustomProtocolClosed { .. },
-				)) => match service1_state {
-					ServiceState::FirstConnec => service1_state = ServiceState::Disconnected,
-					ServiceState::ConnectedAgain |
-					ServiceState::NotConnected |
-					ServiceState::Disconnected => panic!(),
-				},
-				future::Either::Right(SwarmEvent::Behaviour(
-					NotificationsOut::CustomProtocolOpen { .. },
-				)) => match service2_state {
-					ServiceState::NotConnected => {
-						service2_state = ServiceState::FirstConnec;
-						if service1_state == ServiceState::FirstConnec {
-							service1
-								.behaviour_mut()
-								.disconnect_peer(Swarm::local_peer_id(&service2), SetId::from(0));
-						}
-					},
-					ServiceState::Disconnected => service2_state = ServiceState::ConnectedAgain,
-					ServiceState::FirstConnec | ServiceState::ConnectedAgain => panic!(),
-				},
-				future::Either::Right(SwarmEvent::Behaviour(
-					NotificationsOut::CustomProtocolClosed { .. },
-				)) => match service2_state {
-					ServiceState::FirstConnec => service2_state = ServiceState::Disconnected,
-					ServiceState::ConnectedAgain |
-					ServiceState::NotConnected |
-					ServiceState::Disconnected => panic!(),
-				},
-				_ => {},
+	loop {
+		// Grab next event from services.
+		let event = {
+			let s1 = service1.select_next_some();
+			let s2 = service2.select_next_some();
+			futures::pin_mut!(s1, s2);
+			match future::select(s1, s2).await {
+				future::Either::Left((ev, _)) => future::Either::Left(ev),
+				future::Either::Right((ev, _)) => future::Either::Right(ev),
 			}
+		};
 
-			// Due to the bug in `Notifications`, the disconnected node does not always detect that
-			// it was disconnected. The closed inbound substream is tolerated by design, and the
-			// closed outbound substream is not detected until something is sent into it.
-			// See [PR #13396](https://github.com/paritytech/substrate/pull/13396).
-			// This happens if the disconnecting node reconnects to it fast enough.
-			// In this case the disconnected node does not transit via `ServiceState::NotConnected`
-			// and stays in `ServiceState::FirstConnec`.
-			// TODO: update this once the fix is finally merged.
-			if service1_state == ServiceState::ConnectedAgain &&
-				service2_state == ServiceState::ConnectedAgain ||
-				service1_state == ServiceState::ConnectedAgain &&
-					service2_state == ServiceState::FirstConnec ||
-				service1_state == ServiceState::FirstConnec &&
-					service2_state == ServiceState::ConnectedAgain
-			{
-				break
-			}
+		match event {
+			future::Either::Left(SwarmEvent::Behaviour(NotificationsOut::CustomProtocolOpen {
+				..
+			})) => match service1_state {
+				ServiceState::NotConnected => {
+					service1_state = ServiceState::FirstConnec;
+					if service2_state == ServiceState::FirstConnec {
+						service1
+							.behaviour_mut()
+							.disconnect_peer(Swarm::local_peer_id(&service2), SetId::from(0));
+					}
+				},
+				ServiceState::Disconnected => service1_state = ServiceState::ConnectedAgain,
+				ServiceState::FirstConnec | ServiceState::ConnectedAgain => panic!(),
+			},
+			future::Either::Left(SwarmEvent::Behaviour(
+				NotificationsOut::CustomProtocolClosed { .. },
+			)) => match service1_state {
+				ServiceState::FirstConnec => service1_state = ServiceState::Disconnected,
+				ServiceState::ConnectedAgain |
+				ServiceState::NotConnected |
+				ServiceState::Disconnected => panic!(),
+			},
+			future::Either::Right(SwarmEvent::Behaviour(
+				NotificationsOut::CustomProtocolOpen { .. },
+			)) => match service2_state {
+				ServiceState::NotConnected => {
+					service2_state = ServiceState::FirstConnec;
+					if service1_state == ServiceState::FirstConnec {
+						service1
+							.behaviour_mut()
+							.disconnect_peer(Swarm::local_peer_id(&service2), SetId::from(0));
+					}
+				},
+				ServiceState::Disconnected => service2_state = ServiceState::ConnectedAgain,
+				ServiceState::FirstConnec | ServiceState::ConnectedAgain => panic!(),
+			},
+			future::Either::Right(SwarmEvent::Behaviour(
+				NotificationsOut::CustomProtocolClosed { .. },
+			)) => match service2_state {
+				ServiceState::FirstConnec => service2_state = ServiceState::Disconnected,
+				ServiceState::ConnectedAgain |
+				ServiceState::NotConnected |
+				ServiceState::Disconnected => panic!(),
+			},
+			_ => {},
 		}
 
-		// Now that the two services have disconnected and reconnected, wait for 3 seconds and
-		// check whether they're still connected.
-		let mut delay = futures_timer::Delay::new(Duration::from_secs(3));
-
-		loop {
-			// Grab next event from services.
-			let event = {
-				let s1 = service1.select_next_some();
-				let s2 = service2.select_next_some();
-				futures::pin_mut!(s1, s2);
-				match future::select(future::select(s1, s2), &mut delay).await {
-					future::Either::Right(_) => break, // success
-					future::Either::Left((future::Either::Left((ev, _)), _)) => ev,
-					future::Either::Left((future::Either::Right((ev, _)), _)) => ev,
-				}
-			};
+		// Due to the bug in `Notifications`, the disconnected node does not always detect that
+		// it was disconnected. The closed inbound substream is tolerated by design, and the
+		// closed outbound substream is not detected until something is sent into it.
+		// See [PR #13396](https://github.com/paritytech/substrate/pull/13396).
+		// This happens if the disconnecting node reconnects to it fast enough.
+		// In this case the disconnected node does not transit via `ServiceState::NotConnected`
+		// and stays in `ServiceState::FirstConnec`.
+		// TODO: update this once the fix is finally merged.
+		if service1_state == ServiceState::ConnectedAgain &&
+			service2_state == ServiceState::ConnectedAgain ||
+			service1_state == ServiceState::ConnectedAgain &&
+				service2_state == ServiceState::FirstConnec ||
+			service1_state == ServiceState::FirstConnec &&
+				service2_state == ServiceState::ConnectedAgain
+		{
+			break
+		}
+	}
 
-			match event {
-				SwarmEvent::Behaviour(NotificationsOut::CustomProtocolOpen { .. }) |
-				SwarmEvent::Behaviour(NotificationsOut::CustomProtocolClosed { .. }) => panic!(),
-				_ => {},
+	// Now that the two services have disconnected and reconnected, wait for 3 seconds and
+	// check whether they're still connected.
+	let mut delay = futures_timer::Delay::new(Duration::from_secs(3));
+
+	loop {
+		// Grab next event from services.
+		let event = {
+			let s1 = service1.select_next_some();
+			let s2 = service2.select_next_some();
+			futures::pin_mut!(s1, s2);
+			match future::select(future::select(s1, s2), &mut delay).await {
+				future::Either::Right(_) => break, // success
+				future::Either::Left((future::Either::Left((ev, _)), _)) => ev,
+				future::Either::Left((future::Either::Right((ev, _)), _)) => ev,
 			}
+		};
+
+		match event {
+			SwarmEvent::Behaviour(NotificationsOut::CustomProtocolOpen { .. }) |
+			SwarmEvent::Behaviour(NotificationsOut::CustomProtocolClosed { .. }) => panic!(),
+			_ => {},
 		}
-	});
+	}
 }
diff --git a/substrate/client/network/src/protocol/notifications/upgrade/notifications.rs b/substrate/client/network/src/protocol/notifications/upgrade/notifications.rs
index e01bcbe0bad7..9e8a03fc07c9 100644
--- a/substrate/client/network/src/protocol/notifications/upgrade/notifications.rs
+++ b/substrate/client/network/src/protocol/notifications/upgrade/notifications.rs
@@ -39,12 +39,12 @@ use crate::types::ProtocolName;
 use asynchronous_codec::Framed;
 use bytes::BytesMut;
 use futures::prelude::*;
-use libp2p::core::{upgrade, InboundUpgrade, OutboundUpgrade, UpgradeInfo};
+use libp2p::core::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 use log::{error, warn};
 use unsigned_varint::codec::UviBytes;
 
 use std::{
-	io, mem,
+	fmt, io, mem,
 	pin::Pin,
 	task::{Context, Poll},
 	vec,
@@ -187,6 +187,14 @@ pub struct NotificationsInOpen<TSubstream> {
 	pub substream: NotificationsInSubstream<TSubstream>,
 }
 
+impl<TSubstream> fmt::Debug for NotificationsInOpen<TSubstream> {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		f.debug_struct("NotificationsInOpen")
+			.field("handshake", &self.handshake)
+			.finish_non_exhaustive()
+	}
+}
+
 impl<TSubstream> NotificationsInSubstream<TSubstream>
 where
 	TSubstream: AsyncRead + AsyncWrite + Unpin,
@@ -370,7 +378,14 @@ where
 
 	fn upgrade_outbound(self, mut socket: TSubstream, negotiated_name: Self::Info) -> Self::Future {
 		Box::pin(async move {
-			upgrade::write_length_prefixed(&mut socket, &self.initial_message).await?;
+			{
+				let mut len_data = unsigned_varint::encode::usize_buffer();
+				let encoded_len =
+					unsigned_varint::encode::usize(self.initial_message.len(), &mut len_data).len();
+				socket.write_all(&len_data[..encoded_len]).await?;
+			}
+			socket.write_all(&self.initial_message).await?;
+			socket.flush().await?;
 
 			// Reading handshake.
 			let handshake_len = unsigned_varint::aio::read_usize(&mut socket).await?;
@@ -413,6 +428,15 @@ pub struct NotificationsOutOpen<TSubstream> {
 	pub substream: NotificationsOutSubstream<TSubstream>,
 }
 
+impl<TSubstream> fmt::Debug for NotificationsOutOpen<TSubstream> {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		f.debug_struct("NotificationsOutOpen")
+			.field("handshake", &self.handshake)
+			.field("negotiated_fallback", &self.negotiated_fallback)
+			.finish_non_exhaustive()
+	}
+}
+
 impl<TSubstream> Sink<Vec<u8>> for NotificationsOutSubstream<TSubstream>
 where
 	TSubstream: AsyncRead + AsyncWrite + Unpin,
diff --git a/substrate/client/network/src/request_responses.rs b/substrate/client/network/src/request_responses.rs
index 6c2631924df4..5fe34c781378 100644
--- a/substrate/client/network/src/request_responses.rs
+++ b/substrate/client/network/src/request_responses.rs
@@ -43,13 +43,11 @@ use crate::{
 
 use futures::{channel::oneshot, prelude::*};
 use libp2p::{
-	core::{Endpoint, Multiaddr},
+	core::{transport::PortUse, Endpoint, Multiaddr},
 	request_response::{self, Behaviour, Codec, Message, ProtocolSupport, ResponseChannel},
 	swarm::{
-		behaviour::{ConnectionClosed, FromSwarm},
-		handler::multi::MultiHandler,
-		ConnectionDenied, ConnectionId, NetworkBehaviour, PollParameters, THandler,
-		THandlerInEvent, THandlerOutEvent, ToSwarm,
+		behaviour::FromSwarm, handler::multi::MultiHandler, ConnectionDenied, ConnectionId,
+		NetworkBehaviour, THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
 	},
 	PeerId,
 };
@@ -64,11 +62,11 @@ use std::{
 	time::{Duration, Instant},
 };
 
-pub use libp2p::request_response::{Config, RequestId};
+pub use libp2p::request_response::{Config, InboundRequestId, OutboundRequestId};
 
 /// Possible failures occurring in the context of sending an outbound request and receiving the
 /// response.
-#[derive(Debug, thiserror::Error)]
+#[derive(Debug, Clone, thiserror::Error)]
 pub enum OutboundFailure {
 	/// The request could not be sent because a dialing attempt failed.
 	#[error("Failed to dial the requested peer")]
@@ -82,6 +80,9 @@ pub enum OutboundFailure {
 	/// The remote supports none of the requested protocols.
 	#[error("The remote supports none of the requested protocols")]
 	UnsupportedProtocols,
+	/// An IO failure happened on an outbound stream.
+	#[error("An IO failure happened on an outbound stream")]
+	Io(Arc<io::Error>),
 }
 
 impl From<request_response::OutboundFailure> for OutboundFailure {
@@ -93,6 +94,7 @@ impl From<request_response::OutboundFailure> for OutboundFailure {
 				OutboundFailure::ConnectionClosed,
 			request_response::OutboundFailure::UnsupportedProtocols =>
 				OutboundFailure::UnsupportedProtocols,
+			request_response::OutboundFailure::Io(error) => OutboundFailure::Io(Arc::new(error)),
 		}
 	}
 }
@@ -114,6 +116,9 @@ pub enum InboundFailure {
 	/// The local peer failed to respond to an inbound request
 	#[error("The response channel was dropped without sending a response to the remote")]
 	ResponseOmission,
+	/// An IO failure happened on an inbound stream.
+	#[error("An IO failure happened on an inbound stream")]
+	Io(Arc<io::Error>),
 }
 
 impl From<request_response::InboundFailure> for InboundFailure {
@@ -124,6 +129,7 @@ impl From<request_response::InboundFailure> for InboundFailure {
 			request_response::InboundFailure::ConnectionClosed => InboundFailure::ConnectionClosed,
 			request_response::InboundFailure::UnsupportedProtocols =>
 				InboundFailure::UnsupportedProtocols,
+			request_response::InboundFailure::Io(error) => InboundFailure::Io(Arc::new(error)),
 		}
 	}
 }
@@ -319,12 +325,12 @@ pub enum Event {
 /// requests. There is no uniqueness guarantee in a set of both inbound and outbound
 /// [`ProtocolRequestId`]s.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-struct ProtocolRequestId {
+struct ProtocolRequestId<RequestId> {
 	protocol: ProtocolName,
 	request_id: RequestId,
 }
 
-impl From<(ProtocolName, RequestId)> for ProtocolRequestId {
+impl<RequestId> From<(ProtocolName, RequestId)> for ProtocolRequestId<RequestId> {
 	fn from((protocol, request_id): (ProtocolName, RequestId)) -> Self {
 		Self { protocol, request_id }
 	}
@@ -342,7 +348,7 @@ pub struct RequestResponsesBehaviour {
 	>,
 
 	/// Pending requests, passed down to a request-response [`Behaviour`], awaiting a reply.
-	pending_requests: HashMap<ProtocolRequestId, PendingRequest>,
+	pending_requests: HashMap<ProtocolRequestId<OutboundRequestId>, PendingRequest>,
 
 	/// Whenever an incoming request arrives, a `Future` is added to this list and will yield the
 	/// start time and the response to send back to the remote.
@@ -351,11 +357,11 @@ pub struct RequestResponsesBehaviour {
 	>,
 
 	/// Whenever an incoming request arrives, the arrival [`Instant`] is recorded here.
-	pending_responses_arrival_time: HashMap<ProtocolRequestId, Instant>,
+	pending_responses_arrival_time: HashMap<ProtocolRequestId<InboundRequestId>, Instant>,
 
 	/// Whenever a response is received on `pending_responses`, insert a channel to be notified
 	/// when the request has been sent out.
-	send_feedback: HashMap<ProtocolRequestId, oneshot::Sender<()>>,
+	send_feedback: HashMap<ProtocolRequestId<InboundRequestId>, oneshot::Sender<()>>,
 
 	/// Primarily used to get a reputation of a node.
 	peer_store: Arc<dyn PeerStoreProvider>,
@@ -364,7 +370,7 @@ pub struct RequestResponsesBehaviour {
 /// Generated by the response builder and waiting to be processed.
 struct RequestProcessingOutcome {
 	peer: PeerId,
-	request_id: RequestId,
+	request_id: InboundRequestId,
 	protocol: ProtocolName,
 	inner_channel: ResponseChannel<Result<Vec<u8>, ()>>,
 	response: OutgoingResponse,
@@ -379,8 +385,7 @@ impl RequestResponsesBehaviour {
 	) -> Result<Self, RegisterError> {
 		let mut protocols = HashMap::new();
 		for protocol in list {
-			let mut cfg = Config::default();
-			cfg.set_request_timeout(protocol.request_timeout);
+			let cfg = Config::default().with_request_timeout(protocol.request_timeout);
 
 			let protocol_support = if protocol.inbound_queue.is_some() {
 				ProtocolSupport::Full
@@ -455,7 +460,7 @@ impl RequestResponsesBehaviour {
 
 	fn send_request_inner(
 		behaviour: &mut Behaviour<GenericCodec>,
-		pending_requests: &mut HashMap<ProtocolRequestId, PendingRequest>,
+		pending_requests: &mut HashMap<ProtocolRequestId<OutboundRequestId>, PendingRequest>,
 		target: &PeerId,
 		protocol_name: ProtocolName,
 		request: Vec<u8>,
@@ -541,11 +546,16 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 		peer: PeerId,
 		addr: &Multiaddr,
 		role_override: Endpoint,
+		port_use: PortUse,
 	) -> Result<THandler<Self>, ConnectionDenied> {
 		let iter = self.protocols.iter_mut().filter_map(|(p, (r, _))| {
-			if let Ok(handler) =
-				r.handle_established_outbound_connection(connection_id, peer, addr, role_override)
-			{
+			if let Ok(handler) = r.handle_established_outbound_connection(
+				connection_id,
+				peer,
+				addr,
+				role_override,
+				port_use,
+			) {
 				Some((p.to_string(), handler))
 			} else {
 				None
@@ -558,80 +568,9 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 		))
 	}
 
-	fn on_swarm_event(&mut self, event: FromSwarm<Self::ConnectionHandler>) {
-		match event {
-			FromSwarm::ConnectionEstablished(e) =>
-				for (p, _) in self.protocols.values_mut() {
-					NetworkBehaviour::on_swarm_event(p, FromSwarm::ConnectionEstablished(e));
-				},
-			FromSwarm::ConnectionClosed(ConnectionClosed {
-				peer_id,
-				connection_id,
-				endpoint,
-				handler,
-				remaining_established,
-			}) =>
-				for (p_name, p_handler) in handler.into_iter() {
-					if let Some((proto, _)) = self.protocols.get_mut(p_name.as_str()) {
-						proto.on_swarm_event(FromSwarm::ConnectionClosed(ConnectionClosed {
-							peer_id,
-							connection_id,
-							endpoint,
-							handler: p_handler,
-							remaining_established,
-						}));
-					} else {
-						log::error!(
-						  target: "sub-libp2p",
-						  "on_swarm_event/connection_closed: no request-response instance registered for protocol {:?}",
-						  p_name,
-						)
-					}
-				},
-			FromSwarm::DialFailure(e) =>
-				for (p, _) in self.protocols.values_mut() {
-					NetworkBehaviour::on_swarm_event(p, FromSwarm::DialFailure(e));
-				},
-			FromSwarm::ListenerClosed(e) =>
-				for (p, _) in self.protocols.values_mut() {
-					NetworkBehaviour::on_swarm_event(p, FromSwarm::ListenerClosed(e));
-				},
-			FromSwarm::ListenFailure(e) =>
-				for (p, _) in self.protocols.values_mut() {
-					NetworkBehaviour::on_swarm_event(p, FromSwarm::ListenFailure(e));
-				},
-			FromSwarm::ListenerError(e) =>
-				for (p, _) in self.protocols.values_mut() {
-					NetworkBehaviour::on_swarm_event(p, FromSwarm::ListenerError(e));
-				},
-			FromSwarm::ExternalAddrExpired(e) =>
-				for (p, _) in self.protocols.values_mut() {
-					NetworkBehaviour::on_swarm_event(p, FromSwarm::ExternalAddrExpired(e));
-				},
-			FromSwarm::NewListener(e) =>
-				for (p, _) in self.protocols.values_mut() {
-					NetworkBehaviour::on_swarm_event(p, FromSwarm::NewListener(e));
-				},
-			FromSwarm::ExpiredListenAddr(e) =>
-				for (p, _) in self.protocols.values_mut() {
-					NetworkBehaviour::on_swarm_event(p, FromSwarm::ExpiredListenAddr(e));
-				},
-			FromSwarm::NewExternalAddrCandidate(e) =>
-				for (p, _) in self.protocols.values_mut() {
-					NetworkBehaviour::on_swarm_event(p, FromSwarm::NewExternalAddrCandidate(e));
-				},
-			FromSwarm::ExternalAddrConfirmed(e) =>
-				for (p, _) in self.protocols.values_mut() {
-					NetworkBehaviour::on_swarm_event(p, FromSwarm::ExternalAddrConfirmed(e));
-				},
-			FromSwarm::AddressChange(e) =>
-				for (p, _) in self.protocols.values_mut() {
-					NetworkBehaviour::on_swarm_event(p, FromSwarm::AddressChange(e));
-				},
-			FromSwarm::NewListenAddr(e) =>
-				for (p, _) in self.protocols.values_mut() {
-					NetworkBehaviour::on_swarm_event(p, FromSwarm::NewListenAddr(e));
-				},
+	fn on_swarm_event(&mut self, event: FromSwarm) {
+		for (protocol, _) in self.protocols.values_mut() {
+			protocol.on_swarm_event(event);
 		}
 	}
 
@@ -653,11 +592,7 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 		}
 	}
 
-	fn poll(
-		&mut self,
-		cx: &mut Context,
-		params: &mut impl PollParameters,
-	) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
+	fn poll(&mut self, cx: &mut Context) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
 		'poll_all: loop {
 			// Poll to see if any response is ready to be sent back.
 			while let Poll::Ready(Some(outcome)) = self.pending_responses.poll_next_unpin(cx) {
@@ -707,7 +642,7 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 
 			// Poll request-responses protocols.
 			for (protocol, (ref mut behaviour, ref mut resp_builder)) in &mut self.protocols {
-				'poll_protocol: while let Poll::Ready(ev) = behaviour.poll(cx, params) {
+				'poll_protocol: while let Poll::Ready(ev) = behaviour.poll(cx) {
 					let ev = match ev {
 						// Main events we are interested in.
 						ToSwarm::GenerateEvent(ev) => ev,
@@ -717,29 +652,23 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 						ToSwarm::Dial { opts } => {
 							if opts.get_peer_id().is_none() {
 								log::error!(
+									target: "sub-libp2p",
 									"The request-response isn't supposed to start dialing addresses"
 								);
 							}
 							return Poll::Ready(ToSwarm::Dial { opts })
 						},
-						ToSwarm::NotifyHandler { peer_id, handler, event } =>
-							return Poll::Ready(ToSwarm::NotifyHandler {
-								peer_id,
-								handler,
-								event: ((*protocol).to_string(), event),
-							}),
-						ToSwarm::CloseConnection { peer_id, connection } =>
-							return Poll::Ready(ToSwarm::CloseConnection { peer_id, connection }),
-						ToSwarm::NewExternalAddrCandidate(observed) =>
-							return Poll::Ready(ToSwarm::NewExternalAddrCandidate(observed)),
-						ToSwarm::ExternalAddrConfirmed(addr) =>
-							return Poll::Ready(ToSwarm::ExternalAddrConfirmed(addr)),
-						ToSwarm::ExternalAddrExpired(addr) =>
-							return Poll::Ready(ToSwarm::ExternalAddrExpired(addr)),
-						ToSwarm::ListenOn { opts } =>
-							return Poll::Ready(ToSwarm::ListenOn { opts }),
-						ToSwarm::RemoveListener { id } =>
-							return Poll::Ready(ToSwarm::RemoveListener { id }),
+						event => {
+							return Poll::Ready(
+								event.map_in(|event| ((*protocol).to_string(), event)).map_out(
+									|_| {
+										unreachable!(
+											"`GenerateEvent` is handled in a branch above; qed"
+										)
+									},
+								),
+							);
+						},
 					};
 
 					match ev {
@@ -859,6 +788,7 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 							error,
 							..
 						} => {
+							let error = OutboundFailure::from(error);
 							let started = match self
 								.pending_requests
 								.remove(&(protocol.clone(), request_id).into())
@@ -870,9 +800,7 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 								}) => {
 									// Try using the fallback request if the protocol was not
 									// supported.
-									if let request_response::OutboundFailure::UnsupportedProtocols =
-										error
-									{
+									if matches!(error, OutboundFailure::UnsupportedProtocols) {
 										if let Some((fallback_request, fallback_protocol)) =
 											fallback_request
 										{
@@ -893,7 +821,7 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 									}
 
 									if response_tx
-										.send(Err(RequestFailure::Network(error.clone().into())))
+										.send(Err(RequestFailure::Network(error.clone())))
 										.is_err()
 									{
 										log::debug!(
@@ -920,7 +848,7 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 								peer,
 								protocol: protocol.clone(),
 								duration: started.elapsed(),
-								result: Err(RequestFailure::Network(error.into())),
+								result: Err(RequestFailure::Network(error)),
 							};
 
 							return Poll::Ready(ToSwarm::GenerateEvent(out))
@@ -1184,7 +1112,10 @@ mod tests {
 			transport,
 			behaviour,
 			keypair.public().to_peer_id(),
-			SwarmConfig::with_executor(TokioExecutor(runtime)),
+			SwarmConfig::with_executor(TokioExecutor(runtime))
+				// This is taken care of by notification protocols in non-test environment
+				// It is very slow in test environment for some reason, hence larger timeout
+				.with_idle_connection_timeout(Duration::from_secs(10)),
 		);
 
 		let listen_addr: Multiaddr = format!("/memory/{}", rand::random::<u64>()).parse().unwrap();
@@ -1354,7 +1285,9 @@ mod tests {
 						match swarm.select_next_some().await {
 							SwarmEvent::Behaviour(Event::InboundRequest { result, .. }) => {
 								assert!(result.is_ok());
-								break
+							},
+							SwarmEvent::ConnectionClosed { .. } => {
+								break;
 							},
 							_ => {},
 						}
@@ -1394,20 +1327,20 @@ mod tests {
 			}
 
 			match response_receiver.unwrap().await.unwrap().unwrap_err() {
-				RequestFailure::Network(OutboundFailure::ConnectionClosed) => {},
-				_ => panic!(),
+				RequestFailure::Network(OutboundFailure::Io(_)) => {},
+				request_failure => panic!("Unexpected failure: {request_failure:?}"),
 			}
 		});
 	}
 
-	/// A [`RequestId`] is a unique identifier among either all inbound or all outbound requests for
+	/// A `RequestId` is a unique identifier among either all inbound or all outbound requests for
 	/// a single [`RequestResponsesBehaviour`] behaviour. It is not guaranteed to be unique across
-	/// multiple [`RequestResponsesBehaviour`] behaviours. Thus when handling [`RequestId`] in the
+	/// multiple [`RequestResponsesBehaviour`] behaviours. Thus, when handling `RequestId` in the
 	/// context of multiple [`RequestResponsesBehaviour`] behaviours, one needs to couple the
-	/// protocol name with the [`RequestId`] to get a unique request identifier.
+	/// protocol name with the `RequestId` to get a unique request identifier.
 	///
 	/// This test ensures that two requests on different protocols can be handled concurrently
-	/// without a [`RequestId`] collision.
+	/// without a `RequestId` collision.
 	///
 	/// See [`ProtocolRequestId`] for additional information.
 	#[test]
diff --git a/substrate/client/network/src/service.rs b/substrate/client/network/src/service.rs
index 803b81129139..751183ae19a9 100644
--- a/substrate/client/network/src/service.rs
+++ b/substrate/client/network/src/service.rs
@@ -41,7 +41,7 @@ use crate::{
 		NetworkState, NotConnectedPeer as NetworkStateNotConnectedPeer, Peer as NetworkStatePeer,
 	},
 	peer_store::{PeerStore, PeerStoreProvider},
-	protocol::{self, NotifsHandlerError, Protocol, Ready},
+	protocol::{self, Protocol, Ready},
 	protocol_controller::{self, ProtoSetConfig, ProtocolController, SetId},
 	request_responses::{IfDisconnected, ProtocolConfig as RequestResponseConfig, RequestFailure},
 	service::{
@@ -59,10 +59,7 @@ use crate::{
 };
 
 use codec::DecodeAll;
-use either::Either;
 use futures::{channel::oneshot, prelude::*};
-#[allow(deprecated)]
-use libp2p::swarm::THandlerErr;
 use libp2p::{
 	connection_limits::{ConnectionLimits, Exceeded},
 	core::{upgrade, ConnectedPoint, Endpoint},
@@ -94,7 +91,6 @@ pub use libp2p::identity::{DecodingError, Keypair, PublicKey};
 pub use metrics::NotificationMetrics;
 pub use protocol::NotificationsSink;
 use std::{
-	cmp,
 	collections::{HashMap, HashSet},
 	fs, iter,
 	marker::PhantomData,
@@ -115,6 +111,7 @@ pub mod signature;
 pub mod traits;
 
 struct Libp2pBandwidthSink {
+	#[allow(deprecated)]
 	sink: Arc<transport::BandwidthSinks>,
 }
 
@@ -336,7 +333,7 @@ where
 			"🏷  Local node identity is: {}",
 			local_peer_id.to_base58(),
 		);
-		log::info!(target: "sub-libp2p", "Running libp2p network backend");
+		info!(target: "sub-libp2p", "Running libp2p network backend");
 
 		let (transport, bandwidth) = {
 			let config_mem = match network_config.transport {
@@ -344,46 +341,7 @@ where
 				TransportConfig::Normal { .. } => false,
 			};
 
-			// The yamux buffer size limit is configured to be equal to the maximum frame size
-			// of all protocols. 10 bytes are added to each limit for the length prefix that
-			// is not included in the upper layer protocols limit but is still present in the
-			// yamux buffer. These 10 bytes correspond to the maximum size required to encode
-			// a variable-length-encoding 64bits number. In other words, we make the
-			// assumption that no notification larger than 2^64 will ever be sent.
-			let yamux_maximum_buffer_size = {
-				let requests_max = request_response_protocols
-					.iter()
-					.map(|cfg| usize::try_from(cfg.max_request_size).unwrap_or(usize::MAX));
-				let responses_max = request_response_protocols
-					.iter()
-					.map(|cfg| usize::try_from(cfg.max_response_size).unwrap_or(usize::MAX));
-				let notifs_max = notification_protocols
-					.iter()
-					.map(|cfg| usize::try_from(cfg.max_notification_size()).unwrap_or(usize::MAX));
-
-				// A "default" max is added to cover all the other protocols: ping, identify,
-				// kademlia, block announces, and transactions.
-				let default_max = cmp::max(
-					1024 * 1024,
-					usize::try_from(protocol::BLOCK_ANNOUNCES_TRANSACTIONS_SUBSTREAM_SIZE)
-						.unwrap_or(usize::MAX),
-				);
-
-				iter::once(default_max)
-					.chain(requests_max)
-					.chain(responses_max)
-					.chain(notifs_max)
-					.max()
-					.expect("iterator known to always yield at least one element; qed")
-					.saturating_add(10)
-			};
-
-			transport::build_transport(
-				local_identity.clone().into(),
-				config_mem,
-				network_config.yamux_window_size,
-				yamux_maximum_buffer_size,
-			)
+			transport::build_transport(local_identity.clone().into(), config_mem)
 		};
 
 		let (to_notifications, from_protocol_controllers) =
@@ -1522,8 +1480,7 @@ where
 	}
 
 	/// Process the next event coming from `Swarm`.
-	#[allow(deprecated)]
-	fn handle_swarm_event(&mut self, event: SwarmEvent<BehaviourOut, THandlerErr<Behaviour<B>>>) {
+	fn handle_swarm_event(&mut self, event: SwarmEvent<BehaviourOut>) {
 		match event {
 			SwarmEvent::Behaviour(BehaviourOut::InboundRequest { protocol, result, .. }) => {
 				if let Some(metrics) = self.metrics.as_ref() {
@@ -1548,6 +1505,7 @@ where
 									Some("busy-omitted"),
 								ResponseFailure::Network(InboundFailure::ConnectionClosed) =>
 									Some("connection-closed"),
+								ResponseFailure::Network(InboundFailure::Io(_)) => Some("io"),
 							};
 
 							if let Some(reason) = reason {
@@ -1587,6 +1545,7 @@ where
 									"connection-closed",
 								RequestFailure::Network(OutboundFailure::UnsupportedProtocols) =>
 									"unsupported",
+								RequestFailure::Network(OutboundFailure::Io(_)) => "io",
 							};
 
 							metrics
@@ -1756,15 +1715,6 @@ where
 					};
 					let reason = match cause {
 						Some(ConnectionError::IO(_)) => "transport-error",
-						Some(ConnectionError::Handler(Either::Left(Either::Left(
-							Either::Left(Either::Right(
-								NotifsHandlerError::SyncNotificationsClogged,
-							)),
-						)))) => "sync-notifications-clogged",
-						Some(ConnectionError::Handler(Either::Left(Either::Left(
-							Either::Right(Either::Left(_)),
-						)))) => "ping-timeout",
-						Some(ConnectionError::Handler(_)) => "protocol-error",
 						Some(ConnectionError::KeepAliveTimeout) => "keep-alive-timeout",
 						None => "actively-closed",
 					};
@@ -1803,7 +1753,12 @@ where
 						not_reported.then(|| self.boot_node_ids.get(&peer_id)).flatten()
 					{
 						if let DialError::WrongPeerId { obtained, endpoint } = &error {
-							if let ConnectedPoint::Dialer { address, role_override: _ } = endpoint {
+							if let ConnectedPoint::Dialer {
+								address,
+								role_override: _,
+								port_use: _,
+							} = endpoint
+							{
 								let address_without_peer_id = parse_addr(address.clone().into())
 									.map_or_else(|_| address.clone(), |r| r.1.into());
 
@@ -1824,7 +1779,6 @@ where
 				}
 
 				if let Some(metrics) = self.metrics.as_ref() {
-					#[allow(deprecated)]
 					let reason = match error {
 						DialError::Denied { cause } =>
 							if cause.downcast::<Exceeded>().is_ok() {
@@ -1864,7 +1818,6 @@ where
 					"Libp2p => IncomingConnectionError({local_addr},{send_back_addr} via {connection_id:?}): {error}"
 				);
 				if let Some(metrics) = self.metrics.as_ref() {
-					#[allow(deprecated)]
 					let reason = match error {
 						ListenError::Denied { cause } =>
 							if cause.downcast::<Exceeded>().is_ok() {
@@ -1917,6 +1870,21 @@ where
 					metrics.listeners_errors_total.inc();
 				}
 			},
+			SwarmEvent::NewExternalAddrCandidate { address } => {
+				trace!(target: "sub-libp2p", "Libp2p => NewExternalAddrCandidate: {address:?}");
+			},
+			SwarmEvent::ExternalAddrConfirmed { address } => {
+				trace!(target: "sub-libp2p", "Libp2p => ExternalAddrConfirmed: {address:?}");
+			},
+			SwarmEvent::ExternalAddrExpired { address } => {
+				trace!(target: "sub-libp2p", "Libp2p => ExternalAddrExpired: {address:?}");
+			},
+			SwarmEvent::NewExternalAddrOfPeer { peer_id, address } => {
+				trace!(target: "sub-libp2p", "Libp2p => NewExternalAddrOfPeer({peer_id:?}): {address:?}")
+			},
+			event => {
+				warn!(target: "sub-libp2p", "New unknown SwarmEvent libp2p event: {event:?}");
+			},
 		}
 	}
 }
diff --git a/substrate/client/network/src/transport.rs b/substrate/client/network/src/transport.rs
index ed7e7c574e16..2f6b7a643c48 100644
--- a/substrate/client/network/src/transport.rs
+++ b/substrate/client/network/src/transport.rs
@@ -29,6 +29,8 @@ use libp2p::{
 };
 use std::{sync::Arc, time::Duration};
 
+// TODO: Create a wrapper similar to upstream `BandwidthTransport` that tracks sent/received bytes
+#[allow(deprecated)]
 pub use libp2p::bandwidth::BandwidthSinks;
 
 /// Builds the transport that serves as a common ground for all connections.
@@ -36,21 +38,12 @@ pub use libp2p::bandwidth::BandwidthSinks;
 /// If `memory_only` is true, then only communication within the same process are allowed. Only
 /// addresses with the format `/memory/...` are allowed.
 ///
-/// `yamux_window_size` is the maximum size of the Yamux receive windows. `None` to leave the
-/// default (256kiB).
-///
-/// `yamux_maximum_buffer_size` is the maximum allowed size of the Yamux buffer. This should be
-/// set either to the maximum of all the maximum allowed sizes of messages frames of all
-/// high-level protocols combined, or to some generously high value if you are sure that a maximum
-/// size is enforced on all high-level protocols.
-///
 /// Returns a `BandwidthSinks` object that allows querying the average bandwidth produced by all
 /// the connections spawned with this transport.
+#[allow(deprecated)]
 pub fn build_transport(
 	keypair: identity::Keypair,
 	memory_only: bool,
-	yamux_window_size: Option<u32>,
-	yamux_maximum_buffer_size: usize,
 ) -> (Boxed<(PeerId, StreamMuxerBox)>, Arc<BandwidthSinks>) {
 	// Build the base layer of the transport.
 	let transport = if !memory_only {
@@ -81,19 +74,7 @@ pub fn build_transport(
 	};
 
 	let authentication_config = noise::Config::new(&keypair).expect("Can create noise config. qed");
-	let multiplexing_config = {
-		let mut yamux_config = libp2p::yamux::Config::default();
-		// Enable proper flow-control: window updates are only sent when
-		// buffered data has been consumed.
-		yamux_config.set_window_update_mode(libp2p::yamux::WindowUpdateMode::on_read());
-		yamux_config.set_max_buffer_size(yamux_maximum_buffer_size);
-
-		if let Some(yamux_window_size) = yamux_window_size {
-			yamux_config.set_receive_window_size(yamux_window_size);
-		}
-
-		yamux_config
-	};
+	let multiplexing_config = libp2p::yamux::Config::default();
 
 	let transport = transport
 		.upgrade(upgrade::Version::V1Lazy)
diff --git a/substrate/client/network/statement/Cargo.toml b/substrate/client/network/statement/Cargo.toml
index 43933f066edd..dd3a8bef8a2f 100644
--- a/substrate/client/network/statement/Cargo.toml
+++ b/substrate/client/network/statement/Cargo.toml
@@ -22,10 +22,10 @@ codec = { features = ["derive"], workspace = true, default-features = true }
 futures = { workspace = true }
 log = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
-sc-network = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-statement-store = { workspace = true, default-features = true }
diff --git a/substrate/client/network/sync/Cargo.toml b/substrate/client/network/sync/Cargo.toml
index 378b7c12e9b7..fdc290a2d01e 100644
--- a/substrate/client/network/sync/Cargo.toml
+++ b/substrate/client/network/sync/Cargo.toml
@@ -23,30 +23,30 @@ array-bytes = { workspace = true, default-features = true }
 async-channel = { workspace = true }
 async-trait = { workspace = true }
 codec = { features = ["derive"], workspace = true, default-features = true }
+fork-tree = { workspace = true, default-features = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 log = { workspace = true, default-features = true }
 mockall = { workspace = true }
-prost = { workspace = true }
-schnellru = { workspace = true }
-smallvec = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-tokio-stream = { workspace = true }
-tokio = { features = ["macros", "time"], workspace = true, default-features = true }
-fork-tree = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
+prost = { workspace = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
+schnellru = { workspace = true }
+smallvec = { workspace = true, default-features = true }
 sp-arithmetic = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
 sp-consensus-grandpa = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
+tokio = { features = ["macros", "time"], workspace = true, default-features = true }
+tokio-stream = { workspace = true }
 
 [dev-dependencies]
 mockall = { workspace = true }
diff --git a/substrate/client/network/sync/src/engine.rs b/substrate/client/network/sync/src/engine.rs
index 349c41ee1f4a..0c39ea0b93c0 100644
--- a/substrate/client/network/sync/src/engine.rs
+++ b/substrate/client/network/sync/src/engine.rs
@@ -100,6 +100,8 @@ mod rep {
 	pub const REFUSED: Rep = Rep::new(-(1 << 10), "Request refused");
 	/// Reputation change when a peer doesn't respond in time to our messages.
 	pub const TIMEOUT: Rep = Rep::new(-(1 << 10), "Request timeout");
+	/// Reputation change when a peer connection failed with IO error.
+	pub const IO: Rep = Rep::new(-(1 << 10), "IO error during request");
 }
 
 struct Metrics {
@@ -1019,9 +1021,14 @@ where
 						debug_assert!(
 							false,
 							"Can not receive `RequestFailure::Obsolete` after dropping the \
-								response receiver.",
+							response receiver.",
 						);
 					},
+					RequestFailure::Network(OutboundFailure::Io(_)) => {
+						self.network_service.report_peer(peer_id, rep::IO);
+						self.network_service
+							.disconnect_peer(peer_id, self.block_announce_protocol_name.clone());
+					},
 				}
 			},
 			Err(oneshot::Canceled) => {
diff --git a/substrate/client/network/test/Cargo.toml b/substrate/client/network/test/Cargo.toml
index 6340d1dfb2f4..783d47f21fa7 100644
--- a/substrate/client/network/test/Cargo.toml
+++ b/substrate/client/network/test/Cargo.toml
@@ -16,7 +16,6 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-tokio = { workspace = true, default-features = true }
 async-trait = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
@@ -29,11 +28,11 @@ sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
-sc-network-types = { workspace = true, default-features = true }
-sc-utils = { workspace = true, default-features = true }
 sc-network-light = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
+sc-network-types = { workspace = true, default-features = true }
 sc-service = { workspace = true }
+sc-utils = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
@@ -41,3 +40,4 @@ sp-runtime = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime = { workspace = true }
 substrate-test-runtime-client = { workspace = true }
+tokio = { workspace = true, default-features = true }
diff --git a/substrate/client/network/transactions/Cargo.toml b/substrate/client/network/transactions/Cargo.toml
index 2ffd6f5f4660..ef9ea1c46197 100644
--- a/substrate/client/network/transactions/Cargo.toml
+++ b/substrate/client/network/transactions/Cargo.toml
@@ -26,5 +26,5 @@ sc-network-common = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
diff --git a/substrate/client/network/types/Cargo.toml b/substrate/client/network/types/Cargo.toml
index 7438eaeffcd2..67814f135d39 100644
--- a/substrate/client/network/types/Cargo.toml
+++ b/substrate/client/network/types/Cargo.toml
@@ -14,7 +14,7 @@ bs58 = { workspace = true, default-features = true }
 bytes = { version = "1.4.0", default-features = false }
 ed25519-dalek = { workspace = true, default-features = true }
 libp2p-identity = { features = ["ed25519", "peerid", "rand"], workspace = true }
-libp2p-kad = { version = "0.44.6", default-features = false }
+libp2p-kad = { version = "0.46.2", default-features = false }
 litep2p = { workspace = true }
 log = { workspace = true, default-features = true }
 multiaddr = { workspace = true }
diff --git a/substrate/client/offchain/Cargo.toml b/substrate/client/offchain/Cargo.toml
index 71b40211e126..bfdb29cc4c35 100644
--- a/substrate/client/offchain/Cargo.toml
+++ b/substrate/client/offchain/Cargo.toml
@@ -26,13 +26,12 @@ http-body-util = { workspace = true }
 hyper = { features = ["http1", "http2"], workspace = true, default-features = true }
 hyper-rustls = { workspace = true }
 hyper-util = { features = ["client-legacy", "http1", "http2"], workspace = true }
+log = { workspace = true, default-features = true }
 num_cpus = { workspace = true }
 once_cell = { workspace = true }
 parking_lot = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
 rustls = { workspace = true }
-threadpool = { workspace = true }
-tracing = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
@@ -41,15 +40,15 @@ sc-transaction-pool-api = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
+sp-externalities = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
 sp-offchain = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-sp-externalities = { workspace = true, default-features = true }
-log = { workspace = true, default-features = true }
+threadpool = { workspace = true }
+tracing = { workspace = true, default-features = true }
 
 [dev-dependencies]
 async-trait = { workspace = true }
-tokio = { workspace = true, default-features = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-client-db = { default-features = true, workspace = true }
 sc-transaction-pool = { workspace = true, default-features = true }
@@ -57,6 +56,7 @@ sc-transaction-pool-api = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
+tokio = { workspace = true, default-features = true }
 
 [features]
 default = []
diff --git a/substrate/client/rpc-api/Cargo.toml b/substrate/client/rpc-api/Cargo.toml
index 3263285aa2b1..e7bb723d8839 100644
--- a/substrate/client/rpc-api/Cargo.toml
+++ b/substrate/client/rpc-api/Cargo.toml
@@ -17,15 +17,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true, default-features = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
-thiserror = { workspace = true }
+jsonrpsee = { features = ["client-core", "macros", "server-core"], workspace = true }
 sc-chain-spec = { workspace = true, default-features = true }
 sc-mixnet = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-rpc = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
-jsonrpsee = { features = ["client-core", "macros", "server-core"], workspace = true }
+thiserror = { workspace = true }
diff --git a/substrate/client/rpc-spec-v2/Cargo.toml b/substrate/client/rpc-spec-v2/Cargo.toml
index 70f68436767f..ebe7e7eca7b4 100644
--- a/substrate/client/rpc-spec-v2/Cargo.toml
+++ b/substrate/client/rpc-spec-v2/Cargo.toml
@@ -20,45 +20,45 @@ jsonrpsee = { workspace = true, features = ["client-core", "macros", "server-cor
 # Internal chain structures for "chain_spec".
 sc-chain-spec = { workspace = true, default-features = true }
 # Pool for submitting extrinsics required by "transaction"
+array-bytes = { workspace = true, default-features = true }
+codec = { workspace = true, default-features = true }
+futures = { workspace = true }
+futures-util = { workspace = true }
+hex = { workspace = true, default-features = true }
+itertools = { workspace = true }
+log = { workspace = true, default-features = true }
+parking_lot = { workspace = true, default-features = true }
+rand = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
+sc-rpc = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
+schnellru = { workspace = true }
+serde = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
-sp-rpc = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-rpc = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-sc-rpc = { workspace = true, default-features = true }
-codec = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-serde = { workspace = true, default-features = true }
-hex = { workspace = true, default-features = true }
-futures = { workspace = true }
-parking_lot = { workspace = true, default-features = true }
-tokio-stream = { features = ["sync"], workspace = true }
 tokio = { features = ["sync"], workspace = true, default-features = true }
-array-bytes = { workspace = true, default-features = true }
-log = { workspace = true, default-features = true }
-futures-util = { workspace = true }
-rand = { workspace = true, default-features = true }
-schnellru = { workspace = true }
-itertools = { workspace = true }
+tokio-stream = { features = ["sync"], workspace = true }
 
 [dev-dependencies]
+assert_matches = { workspace = true }
 async-trait = { workspace = true }
 jsonrpsee = { workspace = true, features = ["server", "ws-client"] }
-serde_json = { workspace = true, default-features = true }
-tokio = { features = ["macros"], workspace = true, default-features = true }
-substrate-test-runtime-client = { workspace = true }
-substrate-test-runtime = { workspace = true }
-substrate-test-runtime-transaction-pool = { workspace = true }
-sp-consensus = { workspace = true, default-features = true }
-sp-externalities = { workspace = true, default-features = true }
-sp-maybe-compressed-blob = { workspace = true, default-features = true }
+pretty_assertions = { workspace = true }
 sc-block-builder = { workspace = true, default-features = true }
-sc-service = { workspace = true, default-features = true }
 sc-rpc = { workspace = true, default-features = true, features = ["test-helpers"] }
-assert_matches = { workspace = true }
-pretty_assertions = { workspace = true }
+sc-service = { workspace = true, default-features = true }
 sc-transaction-pool = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
+sp-externalities = { workspace = true, default-features = true }
+sp-maybe-compressed-blob = { workspace = true, default-features = true }
+substrate-test-runtime = { workspace = true }
+substrate-test-runtime-client = { workspace = true }
+substrate-test-runtime-transaction-pool = { workspace = true }
+tokio = { features = ["macros"], workspace = true, default-features = true }
diff --git a/substrate/client/rpc/Cargo.toml b/substrate/client/rpc/Cargo.toml
index 6fe28a3873e9..8be932f02ed4 100644
--- a/substrate/client/rpc/Cargo.toml
+++ b/substrate/client/rpc/Cargo.toml
@@ -21,7 +21,6 @@ futures = { workspace = true }
 jsonrpsee = { features = ["server"], workspace = true }
 log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
@@ -30,6 +29,7 @@ sc-rpc-api = { workspace = true, default-features = true }
 sc-tracing = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
@@ -38,22 +38,22 @@ sp-offchain = { workspace = true, default-features = true }
 sp-rpc = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-session = { workspace = true, default-features = true }
-sp-version = { workspace = true, default-features = true }
 sp-statement-store = { workspace = true, default-features = true }
+sp-version = { workspace = true, default-features = true }
 tokio = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
+pretty_assertions = { workspace = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
 sc-transaction-pool = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
-tokio = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
-pretty_assertions = { workspace = true }
+tokio = { workspace = true, default-features = true }
 
 [features]
 test-helpers = []
diff --git a/substrate/client/runtime-utilities/Cargo.toml b/substrate/client/runtime-utilities/Cargo.toml
index 5e026a5eff1a..716b577d384a 100644
--- a/substrate/client/runtime-utilities/Cargo.toml
+++ b/substrate/client/runtime-utilities/Cargo.toml
@@ -22,8 +22,8 @@ sc-executor = { workspace = true, default-features = true }
 sc-executor-common = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
-sp-wasm-interface = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
+sp-wasm-interface = { workspace = true, default-features = true }
 
 
 thiserror = { workspace = true }
@@ -31,6 +31,6 @@ thiserror = { workspace = true }
 [dev-dependencies]
 cumulus-primitives-proof-size-hostfunction = { workspace = true, default-features = true }
 cumulus-test-runtime = { workspace = true, default-features = true }
-sp-version = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
+sp-version = { workspace = true, default-features = true }
 subxt = { workspace = true, features = ["native"] }
diff --git a/substrate/client/service/Cargo.toml b/substrate/client/service/Cargo.toml
index 3981395d9768..e46b252f30bf 100644
--- a/substrate/client/service/Cargo.toml
+++ b/substrate/client/service/Cargo.toml
@@ -26,64 +26,64 @@ runtime-benchmarks = [
 ]
 
 [dependencies]
-jsonrpsee = { features = ["server"], workspace = true }
-thiserror = { workspace = true }
+async-trait = { workspace = true }
+codec = { workspace = true, default-features = true }
+directories = { workspace = true }
+exit-future = { workspace = true }
 futures = { workspace = true }
-rand = { workspace = true, default-features = true }
-parking_lot = { workspace = true, default-features = true }
-log = { workspace = true, default-features = true }
 futures-timer = { workspace = true }
-exit-future = { workspace = true }
+jsonrpsee = { features = ["server"], workspace = true }
+log = { workspace = true, default-features = true }
+parking_lot = { workspace = true, default-features = true }
 pin-project = { workspace = true }
-serde = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
-sc-keystore = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
-sp-trie = { workspace = true, default-features = true }
-sp-externalities = { workspace = true, default-features = true }
-sc-utils = { workspace = true, default-features = true }
-sp-version = { workspace = true, default-features = true }
-sp-blockchain = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-sp-session = { workspace = true, default-features = true }
-sp-state-machine = { workspace = true, default-features = true }
-sp-consensus = { workspace = true, default-features = true }
+prometheus-endpoint = { workspace = true, default-features = true }
+rand = { workspace = true, default-features = true }
+sc-chain-spec = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
+sc-client-db = { workspace = true }
 sc-consensus = { workspace = true, default-features = true }
-sp-storage = { workspace = true, default-features = true }
+sc-executor = { workspace = true, default-features = true }
+sc-informant = { workspace = true, default-features = true }
+sc-keystore = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
 sc-network-light = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
-sc-network-types = { workspace = true, default-features = true }
 sc-network-transactions = { workspace = true, default-features = true }
-sc-chain-spec = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-sp-api = { workspace = true, default-features = true }
-sc-client-db = { workspace = true }
-codec = { workspace = true, default-features = true }
-sc-executor = { workspace = true, default-features = true }
-sc-transaction-pool = { workspace = true, default-features = true }
-sp-transaction-pool = { workspace = true, default-features = true }
-sc-transaction-pool-api = { workspace = true, default-features = true }
-sp-transaction-storage-proof = { workspace = true, default-features = true }
-sc-rpc-server = { workspace = true, default-features = true }
+sc-network-types = { workspace = true, default-features = true }
 sc-rpc = { workspace = true, default-features = true }
+sc-rpc-server = { workspace = true, default-features = true }
 sc-rpc-spec-v2 = { workspace = true, default-features = true }
-sc-informant = { workspace = true, default-features = true }
+sc-sysinfo = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
-prometheus-endpoint = { workspace = true, default-features = true }
 sc-tracing = { workspace = true, default-features = true }
-sc-sysinfo = { workspace = true, default-features = true }
+sc-transaction-pool = { workspace = true, default-features = true }
+sc-transaction-pool-api = { workspace = true, default-features = true }
+sc-utils = { workspace = true, default-features = true }
+schnellru = { workspace = true }
+serde = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
+sp-api = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-externalities = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-session = { workspace = true, default-features = true }
+sp-state-machine = { workspace = true, default-features = true }
+sp-storage = { workspace = true, default-features = true }
+sp-transaction-pool = { workspace = true, default-features = true }
+sp-transaction-storage-proof = { workspace = true, default-features = true }
+sp-trie = { workspace = true, default-features = true }
+sp-version = { workspace = true, default-features = true }
+static_init = { workspace = true }
+tempfile = { workspace = true }
+thiserror = { workspace = true }
+tokio = { features = ["parking_lot", "rt-multi-thread", "time"], workspace = true, default-features = true }
 tracing = { workspace = true, default-features = true }
 tracing-futures = { workspace = true }
-async-trait = { workspace = true }
-tokio = { features = ["parking_lot", "rt-multi-thread", "time"], workspace = true, default-features = true }
-tempfile = { workspace = true }
-directories = { workspace = true }
-static_init = { workspace = true }
-schnellru = { workspace = true }
 
 [dev-dependencies]
-substrate-test-runtime-client = { workspace = true }
 substrate-test-runtime = { workspace = true }
+substrate-test-runtime-client = { workspace = true }
diff --git a/substrate/client/service/test/Cargo.toml b/substrate/client/service/test/Cargo.toml
index 632b98104f6b..45b2d8c5eea3 100644
--- a/substrate/client/service/test/Cargo.toml
+++ b/substrate/client/service/test/Cargo.toml
@@ -15,15 +15,13 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-async-channel = { workspace = true }
 array-bytes = { workspace = true, default-features = true }
+async-channel = { workspace = true }
+codec = { workspace = true, default-features = true }
 fdlimit = { workspace = true }
 futures = { workspace = true }
 log = { workspace = true, default-features = true }
-codec = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-tempfile = { workspace = true }
-tokio = { features = ["time"], workspace = true, default-features = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-client-db = { workspace = true }
@@ -37,11 +35,13 @@ sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
 sp-storage = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 sp-trie = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
 substrate-test-runtime = { workspace = true }
 substrate-test-runtime-client = { workspace = true }
+tempfile = { workspace = true }
+tokio = { features = ["time"], workspace = true, default-features = true }
diff --git a/substrate/client/statement-store/Cargo.toml b/substrate/client/statement-store/Cargo.toml
index e5087eae6eca..c0219b294ced 100644
--- a/substrate/client/statement-store/Cargo.toml
+++ b/substrate/client/statement-store/Cargo.toml
@@ -17,18 +17,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 log = { workspace = true, default-features = true }
-parking_lot = { workspace = true, default-features = true }
 parity-db = { workspace = true }
-tokio = { features = ["time"], workspace = true, default-features = true }
-sp-statement-store = { workspace = true, default-features = true }
+parking_lot = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
+sc-keystore = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-sc-keystore = { workspace = true, default-features = true }
+sp-statement-store = { workspace = true, default-features = true }
+tokio = { features = ["time"], workspace = true, default-features = true }
 
 [dev-dependencies]
-tempfile = { workspace = true }
 sp-tracing = { workspace = true }
+tempfile = { workspace = true }
diff --git a/substrate/client/storage-monitor/Cargo.toml b/substrate/client/storage-monitor/Cargo.toml
index c017184ced66..3d8cb72b1a92 100644
--- a/substrate/client/storage-monitor/Cargo.toml
+++ b/substrate/client/storage-monitor/Cargo.toml
@@ -13,8 +13,8 @@ workspace = true
 
 [dependencies]
 clap = { features = ["derive", "string"], workspace = true }
-log = { workspace = true, default-features = true }
 fs4 = { workspace = true }
+log = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
-tokio = { features = ["time"], workspace = true, default-features = true }
 thiserror = { workspace = true }
+tokio = { features = ["time"], workspace = true, default-features = true }
diff --git a/substrate/client/sync-state-rpc/Cargo.toml b/substrate/client/sync-state-rpc/Cargo.toml
index cbab8f4d7b0d..91c30f5aa2cc 100644
--- a/substrate/client/sync-state-rpc/Cargo.toml
+++ b/substrate/client/sync-state-rpc/Cargo.toml
@@ -17,13 +17,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { workspace = true, default-features = true }
 jsonrpsee = { features = ["client-core", "macros", "server-core"], workspace = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
-thiserror = { workspace = true }
 sc-chain-spec = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus-babe = { workspace = true, default-features = true }
 sc-consensus-epochs = { workspace = true, default-features = true }
 sc-consensus-grandpa = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
diff --git a/substrate/client/sysinfo/Cargo.toml b/substrate/client/sysinfo/Cargo.toml
index 190e6e279b90..c7eed77eda7f 100644
--- a/substrate/client/sysinfo/Cargo.toml
+++ b/substrate/client/sysinfo/Cargo.toml
@@ -17,16 +17,16 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+derive_more = { workspace = true, default-features = true }
 futures = { workspace = true }
 libc = { workspace = true }
 log = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
 rand_pcg = { workspace = true }
-derive_more = { workspace = true, default-features = true }
 regex = { workspace = true }
+sc-telemetry = { workspace = true, default-features = true }
 serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
-sc-telemetry = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
diff --git a/substrate/client/telemetry/Cargo.toml b/substrate/client/telemetry/Cargo.toml
index f87e8b66f731..4a41a6b6deca 100644
--- a/substrate/client/telemetry/Cargo.toml
+++ b/substrate/client/telemetry/Cargo.toml
@@ -19,13 +19,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 chrono = { workspace = true }
 futures = { workspace = true }
-libp2p = { features = ["dns", "tcp", "tokio", "wasm-ext", "websocket"], workspace = true }
+libp2p = { features = ["dns", "tcp", "tokio", "websocket"], workspace = true }
 log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
 pin-project = { workspace = true }
-sc-utils = { workspace = true, default-features = true }
-sc-network = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
+sc-utils = { workspace = true, default-features = true }
 serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
 thiserror = { workspace = true }
diff --git a/substrate/client/telemetry/src/node.rs b/substrate/client/telemetry/src/node.rs
index 0bbdbfb622ef..2c8d424c4340 100644
--- a/substrate/client/telemetry/src/node.rs
+++ b/substrate/client/telemetry/src/node.rs
@@ -18,7 +18,13 @@
 
 use crate::TelemetryPayload;
 use futures::{channel::mpsc, prelude::*};
-use libp2p::{core::transport::Transport, Multiaddr};
+use libp2p::{
+	core::{
+		transport::{DialOpts, PortUse, Transport},
+		Endpoint,
+	},
+	Multiaddr,
+};
 use rand::Rng as _;
 use std::{
 	fmt, mem,
@@ -229,7 +235,10 @@ where
 				},
 				NodeSocket::ReconnectNow => {
 					let addr = self.addr.clone();
-					match self.transport.dial(addr) {
+					match self
+						.transport
+						.dial(addr, DialOpts { role: Endpoint::Dialer, port_use: PortUse::New })
+					{
 						Ok(d) => {
 							log::trace!(target: "telemetry", "Re-dialing {}", self.addr);
 							socket = NodeSocket::Dialing(d);
diff --git a/substrate/client/tracing/Cargo.toml b/substrate/client/tracing/Cargo.toml
index b8f5e40caf83..949f6f6018ad 100644
--- a/substrate/client/tracing/Cargo.toml
+++ b/substrate/client/tracing/Cargo.toml
@@ -16,30 +16,30 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-console = { workspace = true }
-is-terminal = { workspace = true }
 chrono = { workspace = true }
 codec = { workspace = true, default-features = true }
+console = { workspace = true }
+is-terminal = { workspace = true }
 libc = { workspace = true }
 log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
 rustc-hash = { workspace = true }
-serde = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-tracing = { workspace = true, default-features = true }
-tracing-log = { workspace = true }
-tracing-subscriber = { workspace = true, features = [
-	"env-filter",
-	"parking_lot",
-] }
 sc-client-api = { workspace = true, default-features = true }
 sc-tracing-proc-macro = { workspace = true, default-features = true }
+serde = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-rpc = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
+thiserror = { workspace = true }
+tracing = { workspace = true, default-features = true }
+tracing-log = { workspace = true }
+tracing-subscriber = { workspace = true, features = [
+	"env-filter",
+	"parking_lot",
+] }
 
 [dev-dependencies]
 criterion = { workspace = true, default-features = true }
diff --git a/substrate/client/transaction-pool/Cargo.toml b/substrate/client/transaction-pool/Cargo.toml
index 3b4627dbe027..26bbf58f1522 100644
--- a/substrate/client/transaction-pool/Cargo.toml
+++ b/substrate/client/transaction-pool/Cargo.toml
@@ -25,12 +25,11 @@ itertools = { workspace = true }
 linked-hash-map = { workspace = true }
 log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-thiserror = { workspace = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
@@ -38,8 +37,9 @@ sp-crypto-hashing = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 sp-transaction-pool = { workspace = true, default-features = true }
-tokio-stream = { workspace = true }
+thiserror = { workspace = true }
 tokio = { workspace = true, default-features = true, features = ["macros", "time"] }
+tokio-stream = { workspace = true }
 tracing = { workspace = true, default-features = true }
 
 [dev-dependencies]
diff --git a/substrate/client/transaction-pool/api/Cargo.toml b/substrate/client/transaction-pool/api/Cargo.toml
index c55ee70b2cf5..6671492a4e92 100644
--- a/substrate/client/transaction-pool/api/Cargo.toml
+++ b/substrate/client/transaction-pool/api/Cargo.toml
@@ -17,10 +17,10 @@ codec = { workspace = true, default-features = true }
 futures = { workspace = true }
 log = { workspace = true, default-features = true }
 serde = { features = ["derive"], workspace = true, default-features = true }
-thiserror = { workspace = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 serde_json = { workspace = true, default-features = true }
diff --git a/substrate/frame/Cargo.toml b/substrate/frame/Cargo.toml
index 2d0daf82997d..8fc0d8468430 100644
--- a/substrate/frame/Cargo.toml
+++ b/substrate/frame/Cargo.toml
@@ -26,28 +26,28 @@ scale-info = { features = [
 ], workspace = true }
 
 # primitive deps, used for developing FRAME pallets.
-sp-runtime = { workspace = true }
-sp-io = { workspace = true }
-sp-core = { workspace = true }
 sp-arithmetic = { workspace = true }
+sp-core = { workspace = true }
+sp-io = { workspace = true }
+sp-runtime = { workspace = true }
 
 # frame deps, for developing FRAME pallets.
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 
 # primitive types used for developing FRAME runtimes.
-sp-version = { optional = true, workspace = true }
 sp-api = { optional = true, workspace = true }
 sp-block-builder = { optional = true, workspace = true }
-sp-transaction-pool = { optional = true, workspace = true }
-sp-offchain = { optional = true, workspace = true }
-sp-session = { optional = true, workspace = true }
 sp-consensus-aura = { optional = true, workspace = true }
 sp-consensus-grandpa = { optional = true, workspace = true }
 sp-genesis-builder = { optional = true, workspace = true }
 sp-inherents = { optional = true, workspace = true }
-sp-storage = { optional = true, workspace = true }
 sp-keyring = { optional = true, workspace = true }
+sp-offchain = { optional = true, workspace = true }
+sp-session = { optional = true, workspace = true }
+sp-storage = { optional = true, workspace = true }
+sp-transaction-pool = { optional = true, workspace = true }
+sp-version = { optional = true, workspace = true }
 
 frame-executive = { optional = true, workspace = true }
 frame-system-rpc-runtime-api = { optional = true, workspace = true }
diff --git a/substrate/frame/alliance/Cargo.toml b/substrate/frame/alliance/Cargo.toml
index 451b86b35dde..9d21b9e964c9 100644
--- a/substrate/frame/alliance/Cargo.toml
+++ b/substrate/frame/alliance/Cargo.toml
@@ -31,14 +31,14 @@ frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 
-pallet-identity = { workspace = true }
 pallet-collective = { optional = true, workspace = true }
+pallet-identity = { workspace = true }
 
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
-sp-crypto-hashing = { workspace = true }
 pallet-balances = { workspace = true, default-features = true }
 pallet-collective = { workspace = true, default-features = true }
+sp-crypto-hashing = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/asset-conversion/Cargo.toml b/substrate/frame/asset-conversion/Cargo.toml
index 10a118e95639..8987e44ee000 100644
--- a/substrate/frame/asset-conversion/Cargo.toml
+++ b/substrate/frame/asset-conversion/Cargo.toml
@@ -17,20 +17,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
+frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
+log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 sp-api = { workspace = true }
+sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-arithmetic = { workspace = true }
 
 [dev-dependencies]
-pallet-balances = { workspace = true, default-features = true }
 pallet-assets = { workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
 primitive-types = { features = ["codec", "num-traits", "scale-info"], workspace = true }
 
 [features]
diff --git a/substrate/frame/asset-conversion/ops/Cargo.toml b/substrate/frame/asset-conversion/ops/Cargo.toml
index 66333f973d7f..ebd31bd296de 100644
--- a/substrate/frame/asset-conversion/ops/Cargo.toml
+++ b/substrate/frame/asset-conversion/ops/Cargo.toml
@@ -16,20 +16,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
+frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
+log = { workspace = true }
 pallet-asset-conversion = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
+sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-arithmetic = { workspace = true }
 
 [dev-dependencies]
-pallet-balances = { workspace = true, default-features = true }
 pallet-assets = { workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
 primitive-types = { features = ["codec", "num-traits", "scale-info"], workspace = true }
 
 [features]
diff --git a/substrate/frame/asset-rate/Cargo.toml b/substrate/frame/asset-rate/Cargo.toml
index 514b6fa40c2b..01a5ca21b199 100644
--- a/substrate/frame/asset-rate/Cargo.toml
+++ b/substrate/frame/asset-rate/Cargo.toml
@@ -18,17 +18,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-sp-runtime = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { optional = true, workspace = true }
+sp-runtime = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
 sp-core = { workspace = true }
+sp-io = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/assets-freezer/Cargo.toml b/substrate/frame/assets-freezer/Cargo.toml
index 68bfdd7cfb62..3fffa4d0627f 100644
--- a/substrate/frame/assets-freezer/Cargo.toml
+++ b/substrate/frame/assets-freezer/Cargo.toml
@@ -16,18 +16,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-assets = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
-sp-io = { workspace = true }
-sp-core = { workspace = true }
 pallet-balances = { workspace = true }
+sp-core = { workspace = true }
+sp-io = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/assets/Cargo.toml b/substrate/frame/assets/Cargo.toml
index e20b576d0836..a062a68d4220 100644
--- a/substrate/frame/assets/Cargo.toml
+++ b/substrate/frame/assets/Cargo.toml
@@ -25,13 +25,13 @@ sp-runtime = { workspace = true }
 # Needed for type-safe access to storage DB.
 frame-support = { workspace = true }
 # `system` module provides us with all sorts of useful stuff and macros depend on it being around.
-frame-system = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
+frame-system = { workspace = true }
 sp-core = { workspace = true }
 
 [dev-dependencies]
-sp-io = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/atomic-swap/Cargo.toml b/substrate/frame/atomic-swap/Cargo.toml
index db89a58da8f0..785bfee71b68 100644
--- a/substrate/frame/atomic-swap/Cargo.toml
+++ b/substrate/frame/atomic-swap/Cargo.toml
@@ -17,12 +17,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
+frame = { workspace = true, features = ["experimental", "runtime"] }
 scale-info = { features = ["derive"], workspace = true }
-frame-support = { workspace = true }
-frame-system = { workspace = true }
-sp-core = { workspace = true }
-sp-io = { workspace = true }
-sp-runtime = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
@@ -31,17 +27,11 @@ pallet-balances = { workspace = true, default-features = true }
 default = ["std"]
 std = [
 	"codec/std",
-	"frame-support/std",
-	"frame-system/std",
+	"frame/std",
 	"pallet-balances/std",
 	"scale-info/std",
-	"sp-core/std",
-	"sp-io/std",
-	"sp-runtime/std",
 ]
 try-runtime = [
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
+	"frame/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/atomic-swap/src/lib.rs b/substrate/frame/atomic-swap/src/lib.rs
index c3010f5c9c03..9521f20fe009 100644
--- a/substrate/frame/atomic-swap/src/lib.rs
+++ b/substrate/frame/atomic-swap/src/lib.rs
@@ -50,17 +50,11 @@ use core::{
 	marker::PhantomData,
 	ops::{Deref, DerefMut},
 };
-use frame_support::{
-	dispatch::DispatchResult,
-	pallet_prelude::MaxEncodedLen,
-	traits::{BalanceStatus, Currency, Get, ReservableCurrency},
-	weights::Weight,
-	RuntimeDebugNoBound,
+use frame::{
+	prelude::*,
+	traits::{BalanceStatus, Currency, ReservableCurrency},
 };
-use frame_system::pallet_prelude::BlockNumberFor;
 use scale_info::TypeInfo;
-use sp_io::hashing::blake2_256;
-use sp_runtime::RuntimeDebug;
 
 /// Pending atomic swap operation.
 #[derive(Clone, Eq, PartialEq, RuntimeDebugNoBound, Encode, Decode, TypeInfo, MaxEncodedLen)]
@@ -159,11 +153,9 @@ where
 
 pub use pallet::*;
 
-#[frame_support::pallet]
+#[frame::pallet]
 pub mod pallet {
 	use super::*;
-	use frame_support::pallet_prelude::*;
-	use frame_system::pallet_prelude::*;
 
 	/// Atomic swap's pallet configuration trait.
 	#[pallet::config]
diff --git a/substrate/frame/atomic-swap/src/tests.rs b/substrate/frame/atomic-swap/src/tests.rs
index 47ebe6a8f0ac..6fcc5571a523 100644
--- a/substrate/frame/atomic-swap/src/tests.rs
+++ b/substrate/frame/atomic-swap/src/tests.rs
@@ -19,13 +19,11 @@
 
 use super::*;
 use crate as pallet_atomic_swap;
-
-use frame_support::{derive_impl, traits::ConstU32};
-use sp_runtime::BuildStorage;
+use frame::testing_prelude::*;
 
 type Block = frame_system::mocking::MockBlock<Test>;
 
-frame_support::construct_runtime!(
+construct_runtime!(
 	pub enum Test
 	{
 		System: frame_system,
@@ -54,7 +52,7 @@ impl Config for Test {
 const A: u64 = 1;
 const B: u64 = 2;
 
-pub fn new_test_ext() -> sp_io::TestExternalities {
+pub fn new_test_ext() -> TestExternalities {
 	let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 	let genesis = pallet_balances::GenesisConfig::<Test> { balances: vec![(A, 100), (B, 200)] };
 	genesis.assimilate_storage(&mut t).unwrap();
diff --git a/substrate/frame/aura/Cargo.toml b/substrate/frame/aura/Cargo.toml
index 94b057d665d4..94a47e4d96cd 100644
--- a/substrate/frame/aura/Cargo.toml
+++ b/substrate/frame/aura/Cargo.toml
@@ -17,11 +17,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-timestamp = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-application-crypto = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/authority-discovery/Cargo.toml b/substrate/frame/authority-discovery/Cargo.toml
index 01f574a262ad..506c292c837b 100644
--- a/substrate/frame/authority-discovery/Cargo.toml
+++ b/substrate/frame/authority-discovery/Cargo.toml
@@ -19,12 +19,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-session = { features = [
 	"historical",
 ], workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-application-crypto = { workspace = true }
 sp-authority-discovery = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/authorship/Cargo.toml b/substrate/frame/authorship/Cargo.toml
index 74a4a93147a8..f8b587d44909 100644
--- a/substrate/frame/authorship/Cargo.toml
+++ b/substrate/frame/authorship/Cargo.toml
@@ -19,10 +19,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-impl-trait-for-tuples = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+impl-trait-for-tuples = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
diff --git a/substrate/frame/babe/Cargo.toml b/substrate/frame/babe/Cargo.toml
index f0a7f4648c0a..8673e08472eb 100644
--- a/substrate/frame/babe/Cargo.toml
+++ b/substrate/frame/babe/Cargo.toml
@@ -17,14 +17,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive", "serde"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-session = { workspace = true }
 pallet-timestamp = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true }
 sp-application-crypto = { features = ["serde"], workspace = true }
 sp-consensus-babe = { features = ["serde"], workspace = true }
 sp-core = { features = ["serde"], workspace = true }
diff --git a/substrate/frame/bags-list/Cargo.toml b/substrate/frame/bags-list/Cargo.toml
index 647f5d26686a..6b1c4809f773 100644
--- a/substrate/frame/bags-list/Cargo.toml
+++ b/substrate/frame/bags-list/Cargo.toml
@@ -27,14 +27,14 @@ scale-info = { features = [
 sp-runtime = { workspace = true }
 
 # FRAME
+frame-election-provider-support = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-frame-election-provider-support = { workspace = true }
 
 # third party
-log = { workspace = true }
-docify = { workspace = true }
 aquamarine = { workspace = true }
+docify = { workspace = true }
+log = { workspace = true }
 
 # Optional imports for benchmarking
 frame-benchmarking = { optional = true, workspace = true }
@@ -44,12 +44,12 @@ sp-io = { optional = true, workspace = true }
 sp-tracing = { optional = true, workspace = true }
 
 [dev-dependencies]
+frame-benchmarking = { workspace = true, default-features = true }
+frame-election-provider-support = { workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
-pallet-balances = { workspace = true, default-features = true }
-frame-election-provider-support = { workspace = true, default-features = true }
-frame-benchmarking = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/bags-list/fuzzer/Cargo.toml b/substrate/frame/bags-list/fuzzer/Cargo.toml
index b52fc8848237..db46bc6fe446 100644
--- a/substrate/frame/bags-list/fuzzer/Cargo.toml
+++ b/substrate/frame/bags-list/fuzzer/Cargo.toml
@@ -13,10 +13,10 @@ publish = false
 workspace = true
 
 [dependencies]
-honggfuzz = { workspace = true }
-rand = { features = ["small_rng", "std"], workspace = true, default-features = true }
 frame-election-provider-support = { features = ["fuzz"], workspace = true, default-features = true }
+honggfuzz = { workspace = true }
 pallet-bags-list = { features = ["fuzz"], workspace = true, default-features = true }
+rand = { features = ["small_rng", "std"], workspace = true, default-features = true }
 
 [[bin]]
 name = "bags-list"
diff --git a/substrate/frame/bags-list/remote-tests/Cargo.toml b/substrate/frame/bags-list/remote-tests/Cargo.toml
index 12d61b61c06d..99b203e73fb0 100644
--- a/substrate/frame/bags-list/remote-tests/Cargo.toml
+++ b/substrate/frame/bags-list/remote-tests/Cargo.toml
@@ -17,18 +17,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 # frame
-pallet-staking = { workspace = true, default-features = true }
-pallet-bags-list = { features = ["fuzz"], workspace = true, default-features = true }
 frame-election-provider-support = { workspace = true, default-features = true }
-frame-system = { workspace = true, default-features = true }
 frame-support = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
+pallet-bags-list = { features = ["fuzz"], workspace = true, default-features = true }
+pallet-staking = { workspace = true, default-features = true }
 
 # core
-sp-storage = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-std = { workspace = true, default-features = true }
+sp-storage = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 
 # utils
 remote-externalities = { workspace = true, default-features = true }
diff --git a/substrate/frame/balances/Cargo.toml b/substrate/frame/balances/Cargo.toml
index f0117555c37e..03bc7fcb3fcc 100644
--- a/substrate/frame/balances/Cargo.toml
+++ b/substrate/frame/balances/Cargo.toml
@@ -17,20 +17,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
+docify = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
-docify = { workspace = true }
 
 [dev-dependencies]
-pallet-transaction-payment = { workspace = true, default-features = true }
 frame-support = { features = ["experimental"], workspace = true, default-features = true }
+pallet-transaction-payment = { workspace = true, default-features = true }
+paste = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-paste = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/beefy-mmr/Cargo.toml b/substrate/frame/beefy-mmr/Cargo.toml
index d67ac20ee922..54343bb9ce51 100644
--- a/substrate/frame/beefy-mmr/Cargo.toml
+++ b/substrate/frame/beefy-mmr/Cargo.toml
@@ -13,22 +13,22 @@ workspace = true
 
 [dependencies]
 array-bytes = { optional = true, workspace = true, default-features = true }
-codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { optional = true, workspace = true, default-features = true }
 binary-merkle-tree = { workspace = true }
+codec = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-beefy = { workspace = true }
 pallet-mmr = { workspace = true }
 pallet-session = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, workspace = true, default-features = true }
+sp-api = { workspace = true }
 sp-consensus-beefy = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-api = { workspace = true }
 sp-state-machine = { workspace = true }
 
 [dev-dependencies]
diff --git a/substrate/frame/beefy/Cargo.toml b/substrate/frame/beefy/Cargo.toml
index 05af974e89a7..b8e952dfbd66 100644
--- a/substrate/frame/beefy/Cargo.toml
+++ b/substrate/frame/beefy/Cargo.toml
@@ -13,13 +13,13 @@ workspace = true
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive", "serde"], workspace = true }
-serde = { optional = true, workspace = true, default-features = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-session = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true }
+serde = { optional = true, workspace = true, default-features = true }
 sp-consensus-beefy = { features = ["serde"], workspace = true }
 sp-runtime = { features = ["serde"], workspace = true }
 sp-session = { workspace = true }
diff --git a/substrate/frame/benchmarking/Cargo.toml b/substrate/frame/benchmarking/Cargo.toml
index 0c74d94b33b8..fabeb9a03195 100644
--- a/substrate/frame/benchmarking/Cargo.toml
+++ b/substrate/frame/benchmarking/Cargo.toml
@@ -17,14 +17,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
+frame-support = { workspace = true }
+frame-support-procedural = { workspace = true }
+frame-system = { workspace = true }
 linregress = { optional = true, workspace = true }
 log = { workspace = true }
 paste = { workspace = true, default-features = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { optional = true, workspace = true, default-features = true }
-frame-support = { workspace = true }
-frame-support-procedural = { workspace = true }
-frame-system = { workspace = true }
 sp-api = { workspace = true }
 sp-application-crypto = { workspace = true }
 sp-core = { workspace = true }
@@ -37,10 +37,10 @@ static_assertions = { workspace = true, default-features = true }
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
 rusty-fork = { workspace = true }
-sp-keystore = { workspace = true, default-features = true }
 sc-client-db = { workspace = true }
-sp-state-machine = { workspace = true }
 sp-externalities = { workspace = true }
+sp-keystore = { workspace = true, default-features = true }
+sp-state-machine = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/benchmarking/pov/Cargo.toml b/substrate/frame/benchmarking/pov/Cargo.toml
index ce89dceed3c3..47c6d6e5e4bc 100644
--- a/substrate/frame/benchmarking/pov/Cargo.toml
+++ b/substrate/frame/benchmarking/pov/Cargo.toml
@@ -16,10 +16,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
diff --git a/substrate/frame/bounties/Cargo.toml b/substrate/frame/bounties/Cargo.toml
index a272153fed07..926af60d1acb 100644
--- a/substrate/frame/bounties/Cargo.toml
+++ b/substrate/frame/bounties/Cargo.toml
@@ -19,12 +19,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-treasury = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/broker/Cargo.toml b/substrate/frame/broker/Cargo.toml
index aead49013ef0..a4cfe49d3b35 100644
--- a/substrate/frame/broker/Cargo.toml
+++ b/substrate/frame/broker/Cargo.toml
@@ -15,22 +15,22 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-log = { workspace = true }
+bitvec = { workspace = true }
 codec = { features = ["derive"], workspace = true }
+frame-benchmarking = { optional = true, workspace = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
+log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
-bitvec = { workspace = true }
 sp-api = { workspace = true }
 sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
-frame-support = { workspace = true }
-frame-system = { workspace = true }
 
 [dev-dependencies]
+pretty_assertions = { workspace = true }
 sp-io = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
-pretty_assertions = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/broker/src/benchmarking.rs b/substrate/frame/broker/src/benchmarking.rs
index 044689b254c5..516518740f7d 100644
--- a/substrate/frame/broker/src/benchmarking.rs
+++ b/substrate/frame/broker/src/benchmarking.rs
@@ -1016,6 +1016,47 @@ mod benches {
 		Ok(())
 	}
 
+	#[benchmark]
+	fn force_reserve() -> Result<(), BenchmarkError> {
+		Configuration::<T>::put(new_config_record::<T>());
+		// Assume Reservations to be almost filled for worst case.
+		let reservation_count = T::MaxReservedCores::get().saturating_sub(1);
+		setup_reservations::<T>(reservation_count);
+
+		// Assume leases to be filled for worst case
+		setup_leases::<T>(T::MaxLeasedCores::get(), 1, 10);
+
+		let origin =
+			T::AdminOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
+
+		// Sales must be started.
+		Broker::<T>::do_start_sales(100u32.into(), CoreIndex::try_from(reservation_count).unwrap())
+			.map_err(|_| BenchmarkError::Weightless)?;
+
+		// Add a core.
+		let status = Status::<T>::get().unwrap();
+		Broker::<T>::do_request_core_count(status.core_count + 1).unwrap();
+
+		advance_to::<T>(T::TimeslicePeriod::get().try_into().ok().unwrap());
+		let schedule = new_schedule();
+
+		#[extrinsic_call]
+		_(origin as T::RuntimeOrigin, schedule.clone(), status.core_count);
+
+		assert_eq!(Reservations::<T>::decode_len().unwrap(), T::MaxReservedCores::get() as usize);
+
+		let sale_info = SaleInfo::<T>::get().unwrap();
+		assert_eq!(
+			Workplan::<T>::get((sale_info.region_begin, status.core_count)),
+			Some(schedule.clone())
+		);
+		// We called at timeslice 1, therefore 2 was already processed and 3 is the next possible
+		// assignment point.
+		assert_eq!(Workplan::<T>::get((3, status.core_count)), Some(schedule));
+
+		Ok(())
+	}
+
 	#[benchmark]
 	fn swap_leases() -> Result<(), BenchmarkError> {
 		let admin_origin =
diff --git a/substrate/frame/broker/src/dispatchable_impls.rs b/substrate/frame/broker/src/dispatchable_impls.rs
index 733d96625da0..489be12bdd15 100644
--- a/substrate/frame/broker/src/dispatchable_impls.rs
+++ b/substrate/frame/broker/src/dispatchable_impls.rs
@@ -60,6 +60,27 @@ impl<T: Config> Pallet<T> {
 		Ok(())
 	}
 
+	pub(crate) fn do_force_reserve(workload: Schedule, core: CoreIndex) -> DispatchResult {
+		// Sales must have started, otherwise reserve is equivalent.
+		let sale = SaleInfo::<T>::get().ok_or(Error::<T>::NoSales)?;
+
+		// Reserve - starts at second sale period boundary from now.
+		Self::do_reserve(workload.clone())?;
+
+		// Add to workload - grants one region from the next sale boundary.
+		Workplan::<T>::insert((sale.region_begin, core), &workload);
+
+		// Assign now until the next sale boundary unless the next timeslice is already the sale
+		// boundary.
+		let status = Status::<T>::get().ok_or(Error::<T>::Uninitialized)?;
+		let timeslice = status.last_committed_timeslice.saturating_add(1);
+		if timeslice < sale.region_begin {
+			Workplan::<T>::insert((timeslice, core), &workload);
+		}
+
+		Ok(())
+	}
+
 	pub(crate) fn do_set_lease(task: TaskId, until: Timeslice) -> DispatchResult {
 		let mut r = Leases::<T>::get();
 		ensure!(until > Self::current_timeslice(), Error::<T>::AlreadyExpired);
diff --git a/substrate/frame/broker/src/lib.rs b/substrate/frame/broker/src/lib.rs
index ed16b98d26cc..01368fd6404d 100644
--- a/substrate/frame/broker/src/lib.rs
+++ b/substrate/frame/broker/src/lib.rs
@@ -585,6 +585,9 @@ pub mod pallet {
 
 		/// Reserve a core for a workload.
 		///
+		/// The workload will be given a reservation, but two sale period boundaries must pass
+		/// before the core is actually assigned.
+		///
 		/// - `origin`: Must be Root or pass `AdminOrigin`.
 		/// - `workload`: The workload which should be permanently placed on a core.
 		#[pallet::call_index(1)]
@@ -943,6 +946,29 @@ pub mod pallet {
 			Ok(())
 		}
 
+		/// Reserve a core for a workload immediately.
+		///
+		/// - `origin`: Must be Root or pass `AdminOrigin`.
+		/// - `workload`: The workload which should be permanently placed on a core starting
+		///   immediately.
+		/// - `core`: The core to which the assignment should be made until the reservation takes
+		///   effect. It is left to the caller to either add this new core or reassign any other
+		///   tasks to this existing core.
+		///
+		/// This reserves the workload and then injects the workload into the Workplan for the next
+		/// two sale periods. This overwrites any existing assignments for this core at the start of
+		/// the next sale period.
+		#[pallet::call_index(23)]
+		pub fn force_reserve(
+			origin: OriginFor<T>,
+			workload: Schedule,
+			core: CoreIndex,
+		) -> DispatchResultWithPostInfo {
+			T::AdminOrigin::ensure_origin_or_root(origin)?;
+			Self::do_force_reserve(workload, core)?;
+			Ok(Pays::No.into())
+		}
+
 		#[pallet::call_index(99)]
 		#[pallet::weight(T::WeightInfo::swap_leases())]
 		pub fn swap_leases(origin: OriginFor<T>, id: TaskId, other: TaskId) -> DispatchResult {
diff --git a/substrate/frame/broker/src/tests.rs b/substrate/frame/broker/src/tests.rs
index f3fd5234e4ca..a130a2050d9a 100644
--- a/substrate/frame/broker/src/tests.rs
+++ b/substrate/frame/broker/src/tests.rs
@@ -1837,3 +1837,306 @@ fn start_sales_sets_correct_core_count() {
 		System::assert_has_event(Event::<Test>::CoreCountRequested { core_count: 9 }.into());
 	})
 }
+
+// Reservations currently need two sale period boundaries to pass before coming into effect.
+#[test]
+fn reserve_works() {
+	TestExt::new().execute_with(|| {
+		assert_ok!(Broker::do_start_sales(100, 0));
+		// Advance forward from start_sales, but not into the first sale.
+		advance_to(1);
+
+		let system_workload = Schedule::truncate_from(vec![ScheduleItem {
+			mask: CoreMask::complete(),
+			assignment: Task(1004),
+		}]);
+
+		// This shouldn't work, as the reservation will never be assigned a core unless one is
+		// available.
+		// assert_noop!(Broker::do_reserve(system_workload.clone()), Error::<Test>::Unavailable);
+
+		// Add another core and create the reservation.
+		let status = Status::<Test>::get().unwrap();
+		assert_ok!(Broker::request_core_count(RuntimeOrigin::root(), status.core_count + 1));
+		assert_ok!(Broker::reserve(RuntimeOrigin::root(), system_workload.clone()));
+
+		// This is added to reservations.
+		System::assert_last_event(
+			Event::ReservationMade { index: 0, workload: system_workload.clone() }.into(),
+		);
+		assert_eq!(Reservations::<Test>::get(), vec![system_workload.clone()]);
+
+		// But not yet in workplan for any of the next few regions.
+		for i in 0..20 {
+			assert_eq!(Workplan::<Test>::get((i, 0)), None);
+		}
+		// And it hasn't been assigned a core.
+		assert_eq!(CoretimeTrace::get(), vec![]);
+
+		// Go to next sale. Rotate sale puts it in the workplan.
+		advance_sale_period();
+		assert_eq!(Workplan::<Test>::get((7, 0)), Some(system_workload.clone()));
+		// But it still hasn't been assigned a core.
+		assert_eq!(CoretimeTrace::get(), vec![]);
+
+		// Go to the second sale after reserving.
+		advance_sale_period();
+		// Core is assigned at block 14 (timeslice 7) after being reserved all the way back at
+		// timeslice 1! Since the mock periods are 3 timeslices long, this means that reservations
+		// made in period 0 will only come into effect in period 2.
+		assert_eq!(
+			CoretimeTrace::get(),
+			vec![(
+				12,
+				AssignCore {
+					core: 0,
+					begin: 14,
+					assignment: vec![(Task(1004), 57600)],
+					end_hint: None
+				}
+			)]
+		);
+		System::assert_has_event(
+			Event::CoreAssigned {
+				core: 0,
+				when: 14,
+				assignment: vec![(CoreAssignment::Task(1004), 57600)],
+			}
+			.into(),
+		);
+
+		// And it's in the workplan for the next period.
+		assert_eq!(Workplan::<Test>::get((10, 0)), Some(system_workload.clone()));
+	});
+}
+
+// We can use a hack to accelerate this by injecting it into the workplan.
+#[test]
+fn can_reserve_workloads_quickly() {
+	TestExt::new().execute_with(|| {
+		// Start sales.
+		assert_ok!(Broker::do_start_sales(100, 0));
+		advance_to(2);
+
+		let system_workload = Schedule::truncate_from(vec![ScheduleItem {
+			mask: CoreMask::complete(),
+			assignment: Task(1004),
+		}]);
+
+		// This shouldn't work, as the reservation will never be assigned a core unless one is
+		// available.
+		// assert_noop!(Broker::do_reserve(system_workload.clone()), Error::<Test>::Unavailable);
+
+		// Add another core and create the reservation.
+		let core_count = Status::<Test>::get().unwrap().core_count;
+		assert_ok!(Broker::request_core_count(RuntimeOrigin::root(), core_count + 1));
+		assert_ok!(Broker::reserve(RuntimeOrigin::root(), system_workload.clone()));
+
+		// These are the additional steps to onboard this immediately.
+		let core_index = core_count;
+		// In a real network this would call the relay chain
+		// `assigner_coretime::assign_core` extrinsic directly.
+		<TestCoretimeProvider as CoretimeInterface>::assign_core(
+			core_index,
+			2,
+			vec![(Task(1004), 57600)],
+			None,
+		);
+		// Inject into the workplan to ensure it's scheduled in the next rotate_sale.
+		Workplan::<Test>::insert((4, core_index), system_workload.clone());
+
+		// Reservation is added for the workload.
+		System::assert_has_event(
+			Event::ReservationMade { index: 0, workload: system_workload.clone() }.into(),
+		);
+		System::assert_has_event(Event::CoreCountRequested { core_count: 1 }.into());
+
+		// It is also in the workplan for the next region.
+		assert_eq!(Workplan::<Test>::get((4, 0)), Some(system_workload.clone()));
+
+		// Go to next sale. Rotate sale puts it in the workplan.
+		advance_sale_period();
+		assert_eq!(Workplan::<Test>::get((7, 0)), Some(system_workload.clone()));
+
+		// Go to the second sale after reserving.
+		advance_sale_period();
+
+		// Check the trace to ensure it has a core in every region.
+		assert_eq!(
+			CoretimeTrace::get(),
+			vec![
+				(
+					2,
+					AssignCore {
+						core: 0,
+						begin: 2,
+						assignment: vec![(Task(1004), 57600)],
+						end_hint: None
+					}
+				),
+				(
+					6,
+					AssignCore {
+						core: 0,
+						begin: 8,
+						assignment: vec![(Task(1004), 57600)],
+						end_hint: None
+					}
+				),
+				(
+					12,
+					AssignCore {
+						core: 0,
+						begin: 14,
+						assignment: vec![(Task(1004), 57600)],
+						end_hint: None
+					}
+				)
+			]
+		);
+		System::assert_has_event(
+			Event::CoreAssigned {
+				core: 0,
+				when: 8,
+				assignment: vec![(CoreAssignment::Task(1004), 57600)],
+			}
+			.into(),
+		);
+		System::assert_has_event(
+			Event::CoreAssigned {
+				core: 0,
+				when: 14,
+				assignment: vec![(CoreAssignment::Task(1004), 57600)],
+			}
+			.into(),
+		);
+		System::assert_has_event(
+			Event::CoreAssigned {
+				core: 0,
+				when: 14,
+				assignment: vec![(CoreAssignment::Task(1004), 57600)],
+			}
+			.into(),
+		);
+
+		// And it's in the workplan for the next period.
+		assert_eq!(Workplan::<Test>::get((10, 0)), Some(system_workload.clone()));
+	});
+}
+
+// Add an extrinsic to do it properly.
+#[test]
+fn force_reserve_works() {
+	TestExt::new().execute_with(|| {
+		let system_workload = Schedule::truncate_from(vec![ScheduleItem {
+			mask: CoreMask::complete(),
+			assignment: Task(1004),
+		}]);
+
+		// Not intended to work before sales are started.
+		assert_noop!(
+			Broker::force_reserve(RuntimeOrigin::root(), system_workload.clone(), 0),
+			Error::<Test>::NoSales
+		);
+
+		// Start sales.
+		assert_ok!(Broker::do_start_sales(100, 0));
+		advance_to(1);
+
+		// Add a new core. With the mock this is instant, with current relay implementation it
+		// takes two sessions to come into effect.
+		assert_ok!(Broker::do_request_core_count(1));
+
+		// Force reserve should now work.
+		assert_ok!(Broker::force_reserve(RuntimeOrigin::root(), system_workload.clone(), 0));
+
+		// Reservation is added for the workload.
+		System::assert_has_event(
+			Event::ReservationMade { index: 0, workload: system_workload.clone() }.into(),
+		);
+		System::assert_has_event(Event::CoreCountRequested { core_count: 1 }.into());
+		assert_eq!(Reservations::<Test>::get(), vec![system_workload.clone()]);
+
+		// Advance to where that timeslice will be committed.
+		advance_to(3);
+		System::assert_has_event(
+			Event::CoreAssigned {
+				core: 0,
+				when: 4,
+				assignment: vec![(CoreAssignment::Task(1004), 57600)],
+			}
+			.into(),
+		);
+
+		// It is also in the workplan for the next region.
+		assert_eq!(Workplan::<Test>::get((4, 0)), Some(system_workload.clone()));
+
+		// Go to next sale. Rotate sale puts it in the workplan.
+		advance_sale_period();
+		assert_eq!(Workplan::<Test>::get((7, 0)), Some(system_workload.clone()));
+
+		// Go to the second sale after reserving.
+		advance_sale_period();
+
+		// Check the trace to ensure it has a core in every region.
+		assert_eq!(
+			CoretimeTrace::get(),
+			vec![
+				(
+					2,
+					AssignCore {
+						core: 0,
+						begin: 4,
+						assignment: vec![(Task(1004), 57600)],
+						end_hint: None
+					}
+				),
+				(
+					6,
+					AssignCore {
+						core: 0,
+						begin: 8,
+						assignment: vec![(Task(1004), 57600)],
+						end_hint: None
+					}
+				),
+				(
+					12,
+					AssignCore {
+						core: 0,
+						begin: 14,
+						assignment: vec![(Task(1004), 57600)],
+						end_hint: None
+					}
+				)
+			]
+		);
+		System::assert_has_event(
+			Event::CoreAssigned {
+				core: 0,
+				when: 8,
+				assignment: vec![(CoreAssignment::Task(1004), 57600)],
+			}
+			.into(),
+		);
+		System::assert_has_event(
+			Event::CoreAssigned {
+				core: 0,
+				when: 14,
+				assignment: vec![(CoreAssignment::Task(1004), 57600)],
+			}
+			.into(),
+		);
+		System::assert_has_event(
+			Event::CoreAssigned {
+				core: 0,
+				when: 14,
+				assignment: vec![(CoreAssignment::Task(1004), 57600)],
+			}
+			.into(),
+		);
+
+		// And it's in the workplan for the next period.
+		assert_eq!(Workplan::<Test>::get((10, 0)), Some(system_workload.clone()));
+	});
+}
diff --git a/substrate/frame/broker/src/weights.rs b/substrate/frame/broker/src/weights.rs
index 894fed5a6a00..87e588551661 100644
--- a/substrate/frame/broker/src/weights.rs
+++ b/substrate/frame/broker/src/weights.rs
@@ -77,6 +77,7 @@ pub trait WeightInfo {
 	fn notify_core_count() -> Weight;
 	fn notify_revenue() -> Weight;
 	fn do_tick_base() -> Weight;
+	fn force_reserve() -> Weight;
 	fn swap_leases() -> Weight;
 	fn enable_auto_renew() -> Weight;
 	fn disable_auto_renew() -> Weight;
@@ -487,6 +488,23 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
+	/// Storage: `Broker::SaleInfo` (r:1 w:0)
+	/// Proof: `Broker::SaleInfo` (`max_values`: Some(1), `max_size`: Some(57), added: 552, mode: `MaxEncodedLen`)
+	/// Storage: `Broker::Reservations` (r:1 w:1)
+	/// Proof: `Broker::Reservations` (`max_values`: Some(1), `max_size`: Some(6011), added: 6506, mode: `MaxEncodedLen`)
+	/// Storage: `Broker::Status` (r:1 w:0)
+	/// Proof: `Broker::Status` (`max_values`: Some(1), `max_size`: Some(18), added: 513, mode: `MaxEncodedLen`)
+	/// Storage: `Broker::Workplan` (r:0 w:2)
+	/// Proof: `Broker::Workplan` (`max_values`: None, `max_size`: Some(1216), added: 3691, mode: `MaxEncodedLen`)
+	fn force_reserve() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `5253`
+		//  Estimated: `7496`
+		// Minimum execution time: 28_363_000 picoseconds.
+		Weight::from_parts(29_243_000, 7496)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+	}
 	/// Storage: `Broker::Leases` (r:1 w:1)
 	/// Proof: `Broker::Leases` (`max_values`: Some(1), `max_size`: Some(41), added: 536, mode: `MaxEncodedLen`)
 	fn swap_leases() -> Weight {
@@ -944,6 +962,23 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
+	/// Storage: `Broker::SaleInfo` (r:1 w:0)
+	/// Proof: `Broker::SaleInfo` (`max_values`: Some(1), `max_size`: Some(57), added: 552, mode: `MaxEncodedLen`)
+	/// Storage: `Broker::Reservations` (r:1 w:1)
+	/// Proof: `Broker::Reservations` (`max_values`: Some(1), `max_size`: Some(6011), added: 6506, mode: `MaxEncodedLen`)
+	/// Storage: `Broker::Status` (r:1 w:0)
+	/// Proof: `Broker::Status` (`max_values`: Some(1), `max_size`: Some(18), added: 513, mode: `MaxEncodedLen`)
+	/// Storage: `Broker::Workplan` (r:0 w:2)
+	/// Proof: `Broker::Workplan` (`max_values`: None, `max_size`: Some(1216), added: 3691, mode: `MaxEncodedLen`)
+	fn force_reserve() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `5253`
+		//  Estimated: `7496`
+		// Minimum execution time: 28_363_000 picoseconds.
+		Weight::from_parts(29_243_000, 7496)
+			.saturating_add(RocksDbWeight::get().reads(3_u64))
+			.saturating_add(RocksDbWeight::get().writes(3_u64))
+	}
 	/// Storage: `Broker::Leases` (r:1 w:1)
 	/// Proof: `Broker::Leases` (`max_values`: Some(1), `max_size`: Some(41), added: 536, mode: `MaxEncodedLen`)
 	fn swap_leases() -> Weight {
diff --git a/substrate/frame/child-bounties/Cargo.toml b/substrate/frame/child-bounties/Cargo.toml
index a250886b5e3d..b7d9d245892a 100644
--- a/substrate/frame/child-bounties/Cargo.toml
+++ b/substrate/frame/child-bounties/Cargo.toml
@@ -19,13 +19,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-bounties = { workspace = true }
 pallet-treasury = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/collective/Cargo.toml b/substrate/frame/collective/Cargo.toml
index 59a9d23f7b19..8e53000352ae 100644
--- a/substrate/frame/collective/Cargo.toml
+++ b/substrate/frame/collective/Cargo.toml
@@ -18,11 +18,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { features = ["derive"], workspace = true }
 docify = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { features = ["experimental"], workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/contracts/Cargo.toml b/substrate/frame/contracts/Cargo.toml
index 96351752918a..e39128639e3e 100644
--- a/substrate/frame/contracts/Cargo.toml
+++ b/substrate/frame/contracts/Cargo.toml
@@ -18,25 +18,25 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-paste = { workspace = true }
 bitflags = { workspace = true }
 codec = { features = [
 	"derive",
 	"max-encoded-len",
 ], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
+impl-trait-for-tuples = { workspace = true }
 log = { workspace = true }
+paste = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
 smallvec = { features = [
 	"const_generics",
 ], workspace = true }
 wasmi = { workspace = true }
-impl-trait-for-tuples = { workspace = true }
 
 # Only used in benchmarking to generate contract code
-wasm-instrument = { optional = true, workspace = true }
 rand = { optional = true, workspace = true }
 rand_pcg = { optional = true, workspace = true }
+wasm-instrument = { optional = true, workspace = true }
 
 # Substrate Dependencies
 environmental = { workspace = true }
@@ -44,8 +44,8 @@ frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-balances = { optional = true, workspace = true }
-pallet-contracts-uapi = { workspace = true, default-features = true }
 pallet-contracts-proc-macro = { workspace = true, default-features = true }
+pallet-contracts-uapi = { workspace = true, default-features = true }
 sp-api = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
@@ -58,21 +58,21 @@ xcm-builder = { workspace = true }
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
 assert_matches = { workspace = true }
+pallet-contracts-fixtures = { workspace = true }
 pretty_assertions = { workspace = true }
 wat = { workspace = true }
-pallet-contracts-fixtures = { workspace = true }
 
 # Polkadot Dependencies
 xcm-builder = { workspace = true, default-features = true }
 
 # Substrate Dependencies
+pallet-assets = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
-pallet-message-queue = { workspace = true, default-features = true }
 pallet-insecure-randomness-collective-flip = { workspace = true, default-features = true }
-pallet-utility = { workspace = true, default-features = true }
-pallet-assets = { workspace = true, default-features = true }
+pallet-message-queue = { workspace = true, default-features = true }
 pallet-proxy = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
+pallet-utility = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 
diff --git a/substrate/frame/contracts/fixtures/Cargo.toml b/substrate/frame/contracts/fixtures/Cargo.toml
index 4c01c1f061b7..cf31f9eccc9c 100644
--- a/substrate/frame/contracts/fixtures/Cargo.toml
+++ b/substrate/frame/contracts/fixtures/Cargo.toml
@@ -11,13 +11,13 @@ description = "Fixtures for testing contracts pallet."
 workspace = true
 
 [dependencies]
+anyhow = { workspace = true, default-features = true }
 frame-system = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-anyhow = { workspace = true, default-features = true }
 
 [build-dependencies]
+anyhow = { workspace = true, default-features = true }
 parity-wasm = { workspace = true }
 tempfile = { workspace = true }
 toml = { workspace = true }
 twox-hash = { workspace = true, default-features = true }
-anyhow = { workspace = true, default-features = true }
diff --git a/substrate/frame/contracts/fixtures/build/Cargo.toml b/substrate/frame/contracts/fixtures/build/Cargo.toml
index ba487a2bb5ca..18e8c2767d5f 100644
--- a/substrate/frame/contracts/fixtures/build/Cargo.toml
+++ b/substrate/frame/contracts/fixtures/build/Cargo.toml
@@ -8,9 +8,9 @@ edition = "2021"
 
 # All paths or versions are injected dynamically by the build script.
 [dependencies]
-uapi = { package = 'pallet-contracts-uapi', path = "", default-features = false }
 common = { package = 'pallet-contracts-fixtures-common', path = "" }
 polkavm-derive = { version = "" }
+uapi = { package = 'pallet-contracts-uapi', path = "", default-features = false }
 
 [profile.release]
 opt-level = 3
diff --git a/substrate/frame/contracts/mock-network/Cargo.toml b/substrate/frame/contracts/mock-network/Cargo.toml
index 66137bc8a0c6..a7423b33abc1 100644
--- a/substrate/frame/contracts/mock-network/Cargo.toml
+++ b/substrate/frame/contracts/mock-network/Cargo.toml
@@ -19,8 +19,8 @@ frame-system = { workspace = true }
 pallet-assets = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
 pallet-contracts = { workspace = true, default-features = true }
-pallet-contracts-uapi = { workspace = true }
 pallet-contracts-proc-macro = { workspace = true, default-features = true }
+pallet-contracts-uapi = { workspace = true }
 pallet-insecure-randomness-collective-flip = { workspace = true, default-features = true }
 pallet-message-queue = { workspace = true, default-features = true }
 pallet-proxy = { workspace = true, default-features = true }
@@ -44,8 +44,8 @@ xcm-simulator = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
-pretty_assertions = { workspace = true }
 pallet-contracts-fixtures = { workspace = true }
+pretty_assertions = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/contracts/uapi/Cargo.toml b/substrate/frame/contracts/uapi/Cargo.toml
index 09c70c287899..8297c35b31db 100644
--- a/substrate/frame/contracts/uapi/Cargo.toml
+++ b/substrate/frame/contracts/uapi/Cargo.toml
@@ -12,16 +12,16 @@ description = "Exposes all the host functions that a contract can import."
 workspace = true
 
 [dependencies]
-paste = { workspace = true }
 bitflags = { workspace = true }
-scale-info = { features = ["derive"], optional = true, workspace = true }
 codec = { features = [
 	"derive",
 	"max-encoded-len",
 ], optional = true, workspace = true }
+paste = { workspace = true }
+scale-info = { features = ["derive"], optional = true, workspace = true }
 
 [package.metadata.docs.rs]
-default-target = ["wasm32-unknown-unknown"]
+targets = ["wasm32-unknown-unknown"]
 
 [features]
 default = ["scale"]
diff --git a/substrate/frame/conviction-voting/Cargo.toml b/substrate/frame/conviction-voting/Cargo.toml
index fdb4310610d9..2d23f493ea01 100644
--- a/substrate/frame/conviction-voting/Cargo.toml
+++ b/substrate/frame/conviction-voting/Cargo.toml
@@ -21,11 +21,11 @@ codec = { features = [
 	"derive",
 	"max-encoded-len",
 ], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
diff --git a/substrate/frame/core-fellowship/Cargo.toml b/substrate/frame/core-fellowship/Cargo.toml
index 3d73ec58d613..c0017f477251 100644
--- a/substrate/frame/core-fellowship/Cargo.toml
+++ b/substrate/frame/core-fellowship/Cargo.toml
@@ -17,16 +17,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+pallet-ranked-collective = { optional = true, workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-pallet-ranked-collective = { optional = true, workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/delegated-staking/Cargo.toml b/substrate/frame/delegated-staking/Cargo.toml
index 8d5ccd342b6b..576276dced52 100644
--- a/substrate/frame/delegated-staking/Cargo.toml
+++ b/substrate/frame/delegated-staking/Cargo.toml
@@ -15,23 +15,23 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
+sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-staking = { workspace = true }
-sp-io = { workspace = true }
-log = { workspace = true }
 
 [dev-dependencies]
+frame-election-provider-support = { workspace = true }
+pallet-balances = { workspace = true, default-features = true }
+pallet-nomination-pools = { workspace = true, default-features = true }
+pallet-staking = { workspace = true, default-features = true }
+pallet-staking-reward-curve = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-substrate-test-utils = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
-pallet-staking = { workspace = true, default-features = true }
-pallet-nomination-pools = { workspace = true, default-features = true }
-pallet-balances = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
-pallet-staking-reward-curve = { workspace = true, default-features = true }
-frame-election-provider-support = { workspace = true }
+substrate-test-utils = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/democracy/Cargo.toml b/substrate/frame/democracy/Cargo.toml
index 3cfea8bb3129..189d64ccaa74 100644
--- a/substrate/frame/democracy/Cargo.toml
+++ b/substrate/frame/democracy/Cargo.toml
@@ -19,20 +19,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
+sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-core = { workspace = true }
-log = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
-pallet-scheduler = { workspace = true, default-features = true }
 pallet-preimage = { workspace = true, default-features = true }
+pallet-scheduler = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/election-provider-multi-phase/Cargo.toml b/substrate/frame/election-provider-multi-phase/Cargo.toml
index ff2a997fafe0..9a4a2a839346 100644
--- a/substrate/frame/election-provider-multi-phase/Cargo.toml
+++ b/substrate/frame/election-provider-multi-phase/Cargo.toml
@@ -18,20 +18,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
+log = { workspace = true }
 scale-info = { features = [
 	"derive",
 ], workspace = true }
-log = { workspace = true }
 
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 
-sp-io = { workspace = true }
+frame-election-provider-support = { workspace = true }
+sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
-sp-runtime = { workspace = true }
+sp-io = { workspace = true }
 sp-npos-elections = { workspace = true }
-sp-arithmetic = { workspace = true }
-frame-election-provider-support = { workspace = true }
+sp-runtime = { workspace = true }
 
 # Optional imports for benchmarking
 frame-benchmarking = { optional = true, workspace = true }
@@ -40,14 +40,14 @@ rand = { features = ["alloc", "small_rng"], optional = true, workspace = true }
 strum = { features = ["derive"], optional = true, workspace = true }
 
 [dev-dependencies]
+frame-benchmarking = { workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true, default-features = true }
 sp-npos-elections = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
-pallet-balances = { workspace = true, default-features = true }
-frame-benchmarking = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml b/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml
index 771376e06656..5009d3d54d56 100644
--- a/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml
+++ b/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml
@@ -16,30 +16,30 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dev-dependencies]
-parking_lot = { workspace = true, default-features = true }
 codec = { features = ["derive"], workspace = true, default-features = true }
-scale-info = { features = ["derive"], workspace = true, default-features = true }
 log = { workspace = true }
+parking_lot = { workspace = true, default-features = true }
+scale-info = { features = ["derive"], workspace = true, default-features = true }
 
-sp-runtime = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
-sp-std = { workspace = true, default-features = true }
-sp-staking = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 sp-npos-elections = { workspace = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-staking = { workspace = true, default-features = true }
+sp-std = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 
-frame-system = { workspace = true, default-features = true }
-frame-support = { workspace = true, default-features = true }
 frame-election-provider-support = { workspace = true, default-features = true }
+frame-support = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
 
-pallet-election-provider-multi-phase = { workspace = true, default-features = true }
-pallet-staking = { workspace = true, default-features = true }
-pallet-nomination-pools = { workspace = true, default-features = true }
 pallet-bags-list = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
+pallet-election-provider-multi-phase = { workspace = true, default-features = true }
+pallet-nomination-pools = { workspace = true, default-features = true }
 pallet-session = { workspace = true, default-features = true }
+pallet-staking = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
 
 [features]
 try-runtime = [
diff --git a/substrate/frame/election-provider-support/Cargo.toml b/substrate/frame/election-provider-support/Cargo.toml
index cae20d1b46a4..32fa381e1d27 100644
--- a/substrate/frame/election-provider-support/Cargo.toml
+++ b/substrate/frame/election-provider-support/Cargo.toml
@@ -16,14 +16,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-election-provider-solution-type = { workspace = true, default-features = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-arithmetic = { workspace = true }
+sp-core = { workspace = true }
 sp-npos-elections = { workspace = true }
 sp-runtime = { workspace = true }
-sp-core = { workspace = true }
 
 [dev-dependencies]
 rand = { features = ["small_rng"], workspace = true, default-features = true }
diff --git a/substrate/frame/election-provider-support/solution-type/Cargo.toml b/substrate/frame/election-provider-support/solution-type/Cargo.toml
index e24ed7f079fe..c2f307016f6b 100644
--- a/substrate/frame/election-provider-support/solution-type/Cargo.toml
+++ b/substrate/frame/election-provider-support/solution-type/Cargo.toml
@@ -18,10 +18,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-syn = { features = ["full", "visit"], workspace = true }
-quote = { workspace = true }
-proc-macro2 = { workspace = true }
 proc-macro-crate = { workspace = true }
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
+syn = { features = ["full", "visit"], workspace = true }
 
 [dev-dependencies]
 codec = { workspace = true, default-features = true }
diff --git a/substrate/frame/election-provider-support/solution-type/fuzzer/Cargo.toml b/substrate/frame/election-provider-support/solution-type/fuzzer/Cargo.toml
index 86abbf9677e0..d82a8acb2f84 100644
--- a/substrate/frame/election-provider-support/solution-type/fuzzer/Cargo.toml
+++ b/substrate/frame/election-provider-support/solution-type/fuzzer/Cargo.toml
@@ -21,14 +21,14 @@ honggfuzz = { workspace = true }
 rand = { features = ["small_rng", "std"], workspace = true, default-features = true }
 
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-election-provider-solution-type = { workspace = true, default-features = true }
 frame-election-provider-support = { workspace = true, default-features = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-arithmetic = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 # used by generate_solution_type:
-sp-npos-elections = { workspace = true }
 frame-support = { workspace = true, default-features = true }
+sp-npos-elections = { workspace = true }
 
 [[bin]]
 name = "compact"
diff --git a/substrate/frame/elections-phragmen/Cargo.toml b/substrate/frame/elections-phragmen/Cargo.toml
index c1b12b3da4d8..b24ec7bd637e 100644
--- a/substrate/frame/elections-phragmen/Cargo.toml
+++ b/substrate/frame/elections-phragmen/Cargo.toml
@@ -19,11 +19,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-npos-elections = { workspace = true }
diff --git a/substrate/frame/examples/Cargo.toml b/substrate/frame/examples/Cargo.toml
index 0c6ad5ef0978..9eac53f0d98b 100644
--- a/substrate/frame/examples/Cargo.toml
+++ b/substrate/frame/examples/Cargo.toml
@@ -18,14 +18,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 pallet-default-config-example = { workspace = true }
 pallet-dev-mode = { workspace = true }
+pallet-example-authorization-tx-extension = { workspace = true }
 pallet-example-basic = { workspace = true }
 pallet-example-frame-crate = { workspace = true }
 pallet-example-kitchensink = { workspace = true }
 pallet-example-offchain-worker = { workspace = true }
-pallet-example-split = { workspace = true }
 pallet-example-single-block-migrations = { workspace = true }
+pallet-example-split = { workspace = true }
 pallet-example-tasks = { workspace = true }
-pallet-example-authorization-tx-extension = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/examples/basic/Cargo.toml b/substrate/frame/examples/basic/Cargo.toml
index f7e2b653c2d1..1deb82cc6ea5 100644
--- a/substrate/frame/examples/basic/Cargo.toml
+++ b/substrate/frame/examples/basic/Cargo.toml
@@ -18,12 +18,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-balances = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
diff --git a/substrate/frame/examples/default-config/Cargo.toml b/substrate/frame/examples/default-config/Cargo.toml
index fa376b4f9136..87485aa08ef0 100644
--- a/substrate/frame/examples/default-config/Cargo.toml
+++ b/substrate/frame/examples/default-config/Cargo.toml
@@ -18,10 +18,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/examples/dev-mode/Cargo.toml b/substrate/frame/examples/dev-mode/Cargo.toml
index 6625fb3a5851..7589abb929d5 100644
--- a/substrate/frame/examples/dev-mode/Cargo.toml
+++ b/substrate/frame/examples/dev-mode/Cargo.toml
@@ -17,11 +17,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-balances = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
diff --git a/substrate/frame/examples/multi-block-migrations/Cargo.toml b/substrate/frame/examples/multi-block-migrations/Cargo.toml
index 98569964a9c9..6e8e89784266 100644
--- a/substrate/frame/examples/multi-block-migrations/Cargo.toml
+++ b/substrate/frame/examples/multi-block-migrations/Cargo.toml
@@ -14,11 +14,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-pallet-migrations = { workspace = true }
+frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
 log = { workspace = true }
+pallet-migrations = { workspace = true }
 scale-info = { workspace = true }
 sp-io = { workspace = true }
 
diff --git a/substrate/frame/examples/offchain-worker/Cargo.toml b/substrate/frame/examples/offchain-worker/Cargo.toml
index a5664dd912d4..fabdfb0f9e0c 100644
--- a/substrate/frame/examples/offchain-worker/Cargo.toml
+++ b/substrate/frame/examples/offchain-worker/Cargo.toml
@@ -18,11 +18,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
 lite-json = { workspace = true }
 log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
-frame-support = { workspace = true }
-frame-system = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-keystore = { optional = true, workspace = true }
diff --git a/substrate/frame/examples/single-block-migrations/Cargo.toml b/substrate/frame/examples/single-block-migrations/Cargo.toml
index 26a3a9fff753..4df8693e0f37 100644
--- a/substrate/frame/examples/single-block-migrations/Cargo.toml
+++ b/substrate/frame/examples/single-block-migrations/Cargo.toml
@@ -13,18 +13,18 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-docify = { workspace = true }
-log = { workspace = true }
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-frame-support = { workspace = true }
+docify = { workspace = true }
 frame-executive = { workspace = true }
+frame-support = { workspace = true }
 frame-system = { workspace = true }
 frame-try-runtime = { optional = true, workspace = true }
+log = { workspace = true }
 pallet-balances = { workspace = true }
-sp-runtime = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
+sp-runtime = { workspace = true }
 sp-version = { workspace = true }
 
 [features]
diff --git a/substrate/frame/examples/tasks/Cargo.toml b/substrate/frame/examples/tasks/Cargo.toml
index 00695ceddf19..48f4d9e66e9c 100644
--- a/substrate/frame/examples/tasks/Cargo.toml
+++ b/substrate/frame/examples/tasks/Cargo.toml
@@ -22,9 +22,9 @@ scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 
+sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-core = { workspace = true }
 
 frame-benchmarking = { optional = true, workspace = true }
 
diff --git a/substrate/frame/executive/Cargo.toml b/substrate/frame/executive/Cargo.toml
index 76d084f49d9f..ee24a9fef13d 100644
--- a/substrate/frame/executive/Cargo.toml
+++ b/substrate/frame/executive/Cargo.toml
@@ -20,11 +20,11 @@ aquamarine = { workspace = true }
 codec = { features = [
 	"derive",
 ], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 frame-try-runtime = { optional = true, workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/fast-unstake/Cargo.toml b/substrate/frame/fast-unstake/Cargo.toml
index c1d0e80551c2..98a9655074e7 100644
--- a/substrate/frame/fast-unstake/Cargo.toml
+++ b/substrate/frame/fast-unstake/Cargo.toml
@@ -22,23 +22,23 @@ scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 
+frame-election-provider-support = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-staking = { workspace = true }
-frame-election-provider-support = { workspace = true }
 
 frame-benchmarking = { optional = true, workspace = true }
 
 docify = { workspace = true }
 
 [dev-dependencies]
+pallet-balances = { workspace = true, default-features = true }
+pallet-staking = { workspace = true, default-features = true }
 pallet-staking-reward-curve = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
 sp-core = { workspace = true }
-substrate-test-utils = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
-pallet-staking = { workspace = true, default-features = true }
-pallet-balances = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
+substrate-test-utils = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/glutton/Cargo.toml b/substrate/frame/glutton/Cargo.toml
index 6717176ffc95..317a9ea8b760 100644
--- a/substrate/frame/glutton/Cargo.toml
+++ b/substrate/frame/glutton/Cargo.toml
@@ -18,15 +18,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 blake2 = { workspace = true }
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-log = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
+sp-inherents = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-inherents = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
diff --git a/substrate/frame/grandpa/Cargo.toml b/substrate/frame/grandpa/Cargo.toml
index 86ace358d05d..4072d65b6267 100644
--- a/substrate/frame/grandpa/Cargo.toml
+++ b/substrate/frame/grandpa/Cargo.toml
@@ -17,13 +17,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive", "serde"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-session = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true }
 sp-application-crypto = { features = ["serde"], workspace = true }
 sp-consensus-grandpa = { features = ["serde"], workspace = true }
 sp-core = { features = ["serde"], workspace = true }
diff --git a/substrate/frame/identity/Cargo.toml b/substrate/frame/identity/Cargo.toml
index bf974221b857..4ea7f797d9ee 100644
--- a/substrate/frame/identity/Cargo.toml
+++ b/substrate/frame/identity/Cargo.toml
@@ -18,11 +18,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
 enumflags2 = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
diff --git a/substrate/frame/im-online/Cargo.toml b/substrate/frame/im-online/Cargo.toml
index 6c32c8ae898e..179c4c3ce3b1 100644
--- a/substrate/frame/im-online/Cargo.toml
+++ b/substrate/frame/im-online/Cargo.toml
@@ -17,12 +17,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive", "serde"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-authorship = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true }
 sp-application-crypto = { features = ["serde"], workspace = true }
 sp-core = { features = ["serde"], workspace = true }
 sp-io = { workspace = true }
diff --git a/substrate/frame/indices/Cargo.toml b/substrate/frame/indices/Cargo.toml
index d81b2d5cabf1..a0030b5b0edf 100644
--- a/substrate/frame/indices/Cargo.toml
+++ b/substrate/frame/indices/Cargo.toml
@@ -17,10 +17,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-keyring = { optional = true, workspace = true }
diff --git a/substrate/frame/insecure-randomness-collective-flip/Cargo.toml b/substrate/frame/insecure-randomness-collective-flip/Cargo.toml
index 1a47030812da..1682b52dfbf4 100644
--- a/substrate/frame/insecure-randomness-collective-flip/Cargo.toml
+++ b/substrate/frame/insecure-randomness-collective-flip/Cargo.toml
@@ -17,10 +17,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-safe-mix = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+safe-mix = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
diff --git a/substrate/frame/lottery/Cargo.toml b/substrate/frame/lottery/Cargo.toml
index eb6e0b703d08..23eb19c7ffa7 100644
--- a/substrate/frame/lottery/Cargo.toml
+++ b/substrate/frame/lottery/Cargo.toml
@@ -18,10 +18,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
diff --git a/substrate/frame/membership/Cargo.toml b/substrate/frame/membership/Cargo.toml
index 67aa3503ac0a..738d09b4b354 100644
--- a/substrate/frame/membership/Cargo.toml
+++ b/substrate/frame/membership/Cargo.toml
@@ -17,11 +17,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive", "serde"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true }
 sp-core = { features = ["serde"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { features = ["serde"], workspace = true }
diff --git a/substrate/frame/merkle-mountain-range/Cargo.toml b/substrate/frame/merkle-mountain-range/Cargo.toml
index 4daa394a82d7..04f5ab64100d 100644
--- a/substrate/frame/merkle-mountain-range/Cargo.toml
+++ b/substrate/frame/merkle-mountain-range/Cargo.toml
@@ -16,11 +16,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-mmr-primitives = { workspace = true }
@@ -28,8 +28,8 @@ sp-runtime = { workspace = true }
 
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
 itertools = { workspace = true }
+sp-tracing = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/message-queue/Cargo.toml b/substrate/frame/message-queue/Cargo.toml
index a6de61d70abf..7b0de7c1e4ff 100644
--- a/substrate/frame/message-queue/Cargo.toml
+++ b/substrate/frame/message-queue/Cargo.toml
@@ -13,15 +13,15 @@ workspace = true
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
+environmental = { workspace = true }
+log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
-log = { workspace = true }
-environmental = { workspace = true }
 
+sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-arithmetic = { workspace = true }
 sp-weights = { workspace = true }
 
 frame-benchmarking = { optional = true, workspace = true }
@@ -29,10 +29,10 @@ frame-support = { workspace = true }
 frame-system = { workspace = true }
 
 [dev-dependencies]
-sp-crypto-hashing = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
 rand_distr = { workspace = true }
+sp-crypto-hashing = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/metadata-hash-extension/Cargo.toml b/substrate/frame/metadata-hash-extension/Cargo.toml
index 8f4ba922984c..c7a417795ffe 100644
--- a/substrate/frame/metadata-hash-extension/Cargo.toml
+++ b/substrate/frame/metadata-hash-extension/Cargo.toml
@@ -11,22 +11,22 @@ description = "FRAME signed extension for verifying the metadata hash"
 [dependencies]
 array-bytes = { workspace = true, default-features = true }
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive", "serde"], workspace = true }
-sp-runtime = { features = ["serde"], workspace = true }
+const-hex = { workspace = true }
+docify = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 log = { workspace = true }
-docify = { workspace = true }
-const-hex = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true }
+sp-runtime = { features = ["serde"], workspace = true }
 
 [dev-dependencies]
-substrate-wasm-builder = { features = ["metadata-hash"], workspace = true, default-features = true }
-substrate-test-runtime-client = { workspace = true }
-sp-api = { workspace = true, default-features = true }
-sp-transaction-pool = { workspace = true, default-features = true }
-merkleized-metadata = { workspace = true }
 frame-metadata = { features = ["current", "unstable"], workspace = true, default-features = true }
+merkleized-metadata = { workspace = true }
+sp-api = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
+sp-transaction-pool = { workspace = true, default-features = true }
+substrate-test-runtime-client = { workspace = true }
+substrate-wasm-builder = { features = ["metadata-hash"], workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/migrations/Cargo.toml b/substrate/frame/migrations/Cargo.toml
index a32e48e65280..469592780beb 100644
--- a/substrate/frame/migrations/Cargo.toml
+++ b/substrate/frame/migrations/Cargo.toml
@@ -11,8 +11,8 @@ repository.workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { features = ["derive"], workspace = true }
 cfg-if = { workspace = true }
+codec = { features = ["derive"], workspace = true }
 docify = { workspace = true }
 impl-trait-for-tuples = { workspace = true }
 log = { workspace = true, default-features = true }
diff --git a/substrate/frame/multisig/Cargo.toml b/substrate/frame/multisig/Cargo.toml
index c96be908faef..0d175617c9c2 100644
--- a/substrate/frame/multisig/Cargo.toml
+++ b/substrate/frame/multisig/Cargo.toml
@@ -17,8 +17,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame = { workspace = true, features = ["experimental", "runtime"] }
+scale-info = { features = ["derive"], workspace = true }
 
 # third party
 log = { workspace = true }
diff --git a/substrate/frame/nft-fractionalization/Cargo.toml b/substrate/frame/nft-fractionalization/Cargo.toml
index 6a064204b895..7f6df86ed0e5 100644
--- a/substrate/frame/nft-fractionalization/Cargo.toml
+++ b/substrate/frame/nft-fractionalization/Cargo.toml
@@ -17,13 +17,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-assets = { workspace = true }
 pallet-nfts = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
diff --git a/substrate/frame/nfts/Cargo.toml b/substrate/frame/nfts/Cargo.toml
index a97b49e56524..18895018e1c5 100644
--- a/substrate/frame/nfts/Cargo.toml
+++ b/substrate/frame/nfts/Cargo.toml
@@ -18,11 +18,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { workspace = true }
 enumflags2 = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/nis/Cargo.toml b/substrate/frame/nis/Cargo.toml
index 78e086d0ed12..ec1a5d93bcba 100644
--- a/substrate/frame/nis/Cargo.toml
+++ b/substrate/frame/nis/Cargo.toml
@@ -17,10 +17,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/node-authorization/Cargo.toml b/substrate/frame/node-authorization/Cargo.toml
index 82aecc21d0b5..174736493934 100644
--- a/substrate/frame/node-authorization/Cargo.toml
+++ b/substrate/frame/node-authorization/Cargo.toml
@@ -16,10 +16,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/nomination-pools/Cargo.toml b/substrate/frame/nomination-pools/Cargo.toml
index aa90e4d81339..a5e8da17eb23 100644
--- a/substrate/frame/nomination-pools/Cargo.toml
+++ b/substrate/frame/nomination-pools/Cargo.toml
@@ -26,11 +26,11 @@ scale-info = { features = [
 # FRAME
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-sp-runtime = { workspace = true }
-sp-staking = { workspace = true }
+log = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
-log = { workspace = true }
+sp-runtime = { workspace = true }
+sp-staking = { workspace = true }
 
 # Optional: use for testing and/or fuzzing
 pallet-balances = { optional = true, workspace = true }
diff --git a/substrate/frame/nomination-pools/benchmarking/Cargo.toml b/substrate/frame/nomination-pools/benchmarking/Cargo.toml
index 7dd826a91224..0b3ac228e86f 100644
--- a/substrate/frame/nomination-pools/benchmarking/Cargo.toml
+++ b/substrate/frame/nomination-pools/benchmarking/Cargo.toml
@@ -26,9 +26,9 @@ frame-election-provider-support = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-bags-list = { workspace = true }
-pallet-staking = { workspace = true }
 pallet-delegated-staking = { workspace = true }
 pallet-nomination-pools = { workspace = true }
+pallet-staking = { workspace = true }
 
 # Substrate Primitives
 sp-runtime = { workspace = true }
@@ -37,8 +37,8 @@ sp-staking = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true }
-pallet-timestamp = { workspace = true, default-features = true }
 pallet-staking-reward-curve = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
 
diff --git a/substrate/frame/nomination-pools/fuzzer/Cargo.toml b/substrate/frame/nomination-pools/fuzzer/Cargo.toml
index e1518ed099ae..2f84004ece94 100644
--- a/substrate/frame/nomination-pools/fuzzer/Cargo.toml
+++ b/substrate/frame/nomination-pools/fuzzer/Cargo.toml
@@ -21,15 +21,15 @@ honggfuzz = { workspace = true }
 
 pallet-nomination-pools = { features = ["fuzzing"], workspace = true, default-features = true }
 
-frame-system = { workspace = true, default-features = true }
 frame-support = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
 
-sp-runtime = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 
-rand = { features = ["small_rng"], workspace = true, default-features = true }
 log = { workspace = true, default-features = true }
+rand = { features = ["small_rng"], workspace = true, default-features = true }
 
 [[bin]]
 name = "call"
diff --git a/substrate/frame/nomination-pools/runtime-api/Cargo.toml b/substrate/frame/nomination-pools/runtime-api/Cargo.toml
index 6de9fc8c8844..337cc31c7cbb 100644
--- a/substrate/frame/nomination-pools/runtime-api/Cargo.toml
+++ b/substrate/frame/nomination-pools/runtime-api/Cargo.toml
@@ -17,8 +17,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-sp-api = { workspace = true }
 pallet-nomination-pools = { workspace = true }
+sp-api = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/nomination-pools/test-delegate-stake/Cargo.toml b/substrate/frame/nomination-pools/test-delegate-stake/Cargo.toml
index 70e1591409b8..fe3743d7e5da 100644
--- a/substrate/frame/nomination-pools/test-delegate-stake/Cargo.toml
+++ b/substrate/frame/nomination-pools/test-delegate-stake/Cargo.toml
@@ -19,23 +19,23 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = ["derive"], workspace = true, default-features = true }
 scale-info = { features = ["derive"], workspace = true, default-features = true }
 
-sp-runtime = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-sp-std = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 sp-staking = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
+sp-std = { workspace = true, default-features = true }
 
-frame-system = { workspace = true, default-features = true }
-frame-support = { features = ["experimental"], workspace = true, default-features = true }
 frame-election-provider-support = { workspace = true, default-features = true }
+frame-support = { features = ["experimental"], workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
 
-pallet-timestamp = { workspace = true, default-features = true }
+pallet-bags-list = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
-pallet-staking = { workspace = true, default-features = true }
 pallet-delegated-staking = { workspace = true, default-features = true }
-pallet-bags-list = { workspace = true, default-features = true }
-pallet-staking-reward-curve = { workspace = true, default-features = true }
 pallet-nomination-pools = { workspace = true, default-features = true }
+pallet-staking = { workspace = true, default-features = true }
+pallet-staking-reward-curve = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
 
-sp-tracing = { workspace = true, default-features = true }
 log = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
diff --git a/substrate/frame/nomination-pools/test-transfer-stake/Cargo.toml b/substrate/frame/nomination-pools/test-transfer-stake/Cargo.toml
index 7398404c2351..2cdc4c41a083 100644
--- a/substrate/frame/nomination-pools/test-transfer-stake/Cargo.toml
+++ b/substrate/frame/nomination-pools/test-transfer-stake/Cargo.toml
@@ -19,22 +19,22 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = ["derive"], workspace = true, default-features = true }
 scale-info = { features = ["derive"], workspace = true, default-features = true }
 
-sp-runtime = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-sp-std = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 sp-staking = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
+sp-std = { workspace = true, default-features = true }
 
-frame-system = { workspace = true, default-features = true }
-frame-support = { workspace = true, default-features = true }
 frame-election-provider-support = { workspace = true, default-features = true }
+frame-support = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
 
-pallet-timestamp = { workspace = true, default-features = true }
+pallet-bags-list = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
+pallet-nomination-pools = { workspace = true, default-features = true }
 pallet-staking = { workspace = true, default-features = true }
-pallet-bags-list = { workspace = true, default-features = true }
 pallet-staking-reward-curve = { workspace = true, default-features = true }
-pallet-nomination-pools = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
 
-sp-tracing = { workspace = true, default-features = true }
 log = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
diff --git a/substrate/frame/offences/Cargo.toml b/substrate/frame/offences/Cargo.toml
index 98c320e1f808..4dd9d7f10c9f 100644
--- a/substrate/frame/offences/Cargo.toml
+++ b/substrate/frame/offences/Cargo.toml
@@ -17,12 +17,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { optional = true, workspace = true, default-features = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-balances = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, workspace = true, default-features = true }
 sp-runtime = { workspace = true }
 sp-staking = { workspace = true }
 
diff --git a/substrate/frame/offences/benchmarking/Cargo.toml b/substrate/frame/offences/benchmarking/Cargo.toml
index 28c7895180c4..76b167ebdb33 100644
--- a/substrate/frame/offences/benchmarking/Cargo.toml
+++ b/substrate/frame/offences/benchmarking/Cargo.toml
@@ -17,11 +17,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { workspace = true }
 frame-election-provider-support = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-babe = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-grandpa = { workspace = true }
@@ -29,9 +29,9 @@ pallet-im-online = { workspace = true }
 pallet-offences = { workspace = true }
 pallet-session = { workspace = true }
 pallet-staking = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 sp-staking = { workspace = true }
-log = { workspace = true }
 
 [dev-dependencies]
 pallet-staking-reward-curve = { workspace = true, default-features = true }
diff --git a/substrate/frame/paged-list/Cargo.toml b/substrate/frame/paged-list/Cargo.toml
index a680139c5fdc..da029bdd7423 100644
--- a/substrate/frame/paged-list/Cargo.toml
+++ b/substrate/frame/paged-list/Cargo.toml
@@ -23,10 +23,10 @@ frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 
-sp-runtime = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-metadata-ir = { optional = true, workspace = true }
+sp-runtime = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/paged-list/fuzzer/Cargo.toml b/substrate/frame/paged-list/fuzzer/Cargo.toml
index d0108254ed2d..7e6162df09ba 100644
--- a/substrate/frame/paged-list/fuzzer/Cargo.toml
+++ b/substrate/frame/paged-list/fuzzer/Cargo.toml
@@ -21,5 +21,5 @@ arbitrary = { workspace = true }
 honggfuzz = { workspace = true }
 
 frame-support = { features = ["std"], workspace = true }
-sp-io = { features = ["std"], workspace = true }
 pallet-paged-list = { features = ["std"], workspace = true }
+sp-io = { features = ["std"], workspace = true }
diff --git a/substrate/frame/parameters/Cargo.toml b/substrate/frame/parameters/Cargo.toml
index a97ba1172a50..dda218b618c4 100644
--- a/substrate/frame/parameters/Cargo.toml
+++ b/substrate/frame/parameters/Cargo.toml
@@ -9,22 +9,22 @@ edition.workspace = true
 
 [dependencies]
 codec = { features = ["max-encoded-len"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
+docify = { workspace = true }
 paste = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
-docify = { workspace = true }
 
+frame-benchmarking = { optional = true, workspace = true }
 frame-support = { features = ["experimental"], workspace = true }
 frame-system = { workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
 
 [dev-dependencies]
+pallet-balances = { features = ["std"], workspace = true, default-features = true }
+pallet-example-basic = { features = ["std"], workspace = true, default-features = true }
 sp-core = { features = ["std"], workspace = true, default-features = true }
 sp-io = { features = ["std"], workspace = true, default-features = true }
-pallet-example-basic = { features = ["std"], workspace = true, default-features = true }
-pallet-balances = { features = ["std"], workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/preimage/Cargo.toml b/substrate/frame/preimage/Cargo.toml
index 1356ac403d38..fae6627b6315 100644
--- a/substrate/frame/preimage/Cargo.toml
+++ b/substrate/frame/preimage/Cargo.toml
@@ -13,14 +13,14 @@ workspace = true
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { optional = true, workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-log = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
diff --git a/substrate/frame/proxy/Cargo.toml b/substrate/frame/proxy/Cargo.toml
index 8897c66419c7..a36b2c1cb9c3 100644
--- a/substrate/frame/proxy/Cargo.toml
+++ b/substrate/frame/proxy/Cargo.toml
@@ -17,8 +17,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["max-encoded-len"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame = { workspace = true, features = ["experimental", "runtime"] }
+scale-info = { features = ["derive"], workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
diff --git a/substrate/frame/ranked-collective/Cargo.toml b/substrate/frame/ranked-collective/Cargo.toml
index eca59cf7fc22..78a02bec8e97 100644
--- a/substrate/frame/ranked-collective/Cargo.toml
+++ b/substrate/frame/ranked-collective/Cargo.toml
@@ -17,16 +17,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+impl-trait-for-tuples = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-impl-trait-for-tuples = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/recovery/Cargo.toml b/substrate/frame/recovery/Cargo.toml
index 44335e8f575c..4f3a734d9868 100644
--- a/substrate/frame/recovery/Cargo.toml
+++ b/substrate/frame/recovery/Cargo.toml
@@ -17,10 +17,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
diff --git a/substrate/frame/recovery/src/lib.rs b/substrate/frame/recovery/src/lib.rs
index f8622880538e..d8f3c33fbea9 100644
--- a/substrate/frame/recovery/src/lib.rs
+++ b/substrate/frame/recovery/src/lib.rs
@@ -156,7 +156,10 @@ use alloc::{boxed::Box, vec::Vec};
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::{
-	traits::{CheckedAdd, CheckedMul, Dispatchable, SaturatedConversion, StaticLookup},
+	traits::{
+		BlockNumberProvider, CheckedAdd, CheckedMul, Dispatchable, SaturatedConversion,
+		StaticLookup,
+	},
 	RuntimeDebug,
 };
 
@@ -178,11 +181,12 @@ mod mock;
 mod tests;
 pub mod weights;
 
+type AccountIdLookupOf<T> = <<T as frame_system::Config>::Lookup as StaticLookup>::Source;
 type BalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-
+type BlockNumberFromProviderOf<T> =
+	<<T as Config>::BlockNumberProvider as BlockNumberProvider>::BlockNumber;
 type FriendsOf<T> = BoundedVec<<T as frame_system::Config>::AccountId, <T as Config>::MaxFriends>;
-type AccountIdLookupOf<T> = <<T as frame_system::Config>::Lookup as StaticLookup>::Source;
 
 /// An active recovery process.
 #[derive(Clone, Eq, PartialEq, Encode, Decode, Default, RuntimeDebug, TypeInfo, MaxEncodedLen)]
@@ -190,7 +194,7 @@ pub struct ActiveRecovery<BlockNumber, Balance, Friends> {
 	/// The block number when the recovery process started.
 	created: BlockNumber,
 	/// The amount held in reserve of the `depositor`,
-	/// To be returned once this recovery process is closed.
+	/// to be returned once this recovery process is closed.
 	deposit: Balance,
 	/// The friends which have vouched so far. Always sorted.
 	friends: Friends,
@@ -236,6 +240,9 @@ pub mod pallet {
 			+ GetDispatchInfo
 			+ From<frame_system::Call<Self>>;
 
+		/// Provider for the block number. Normally this is the `frame_system` pallet.
+		type BlockNumberProvider: BlockNumberProvider;
+
 		/// The currency mechanism.
 		type Currency: ReservableCurrency<Self::AccountId>;
 
@@ -339,7 +346,7 @@ pub mod pallet {
 		_,
 		Twox64Concat,
 		T::AccountId,
-		RecoveryConfig<BlockNumberFor<T>, BalanceOf<T>, FriendsOf<T>>,
+		RecoveryConfig<BlockNumberFromProviderOf<T>, BalanceOf<T>, FriendsOf<T>>,
 	>;
 
 	/// Active recovery attempts.
@@ -354,7 +361,7 @@ pub mod pallet {
 		T::AccountId,
 		Twox64Concat,
 		T::AccountId,
-		ActiveRecovery<BlockNumberFor<T>, BalanceOf<T>, FriendsOf<T>>,
+		ActiveRecovery<BlockNumberFromProviderOf<T>, BalanceOf<T>, FriendsOf<T>>,
 	>;
 
 	/// The list of allowed proxy accounts.
@@ -445,7 +452,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			friends: Vec<T::AccountId>,
 			threshold: u16,
-			delay_period: BlockNumberFor<T>,
+			delay_period: BlockNumberFromProviderOf<T>,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Check account is not already set up for recovery
@@ -511,7 +518,7 @@ pub mod pallet {
 			T::Currency::reserve(&who, recovery_deposit)?;
 			// Create an active recovery status
 			let recovery_status = ActiveRecovery {
-				created: <frame_system::Pallet<T>>::block_number(),
+				created: T::BlockNumberProvider::current_block_number(),
 				deposit: recovery_deposit,
 				friends: Default::default(),
 			};
@@ -596,7 +603,7 @@ pub mod pallet {
 				Self::active_recovery(&account, &who).ok_or(Error::<T>::NotStarted)?;
 			ensure!(!Proxy::<T>::contains_key(&who), Error::<T>::AlreadyProxy);
 			// Make sure the delay period has passed
-			let current_block_number = <frame_system::Pallet<T>>::block_number();
+			let current_block_number = T::BlockNumberProvider::current_block_number();
 			let recoverable_block_number = active_recovery
 				.created
 				.checked_add(&recovery_config.delay_period)
diff --git a/substrate/frame/recovery/src/mock.rs b/substrate/frame/recovery/src/mock.rs
index 8e30cbe997e1..3930db82d6c7 100644
--- a/substrate/frame/recovery/src/mock.rs
+++ b/substrate/frame/recovery/src/mock.rs
@@ -66,6 +66,7 @@ impl Config for Test {
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = ();
 	type RuntimeCall = RuntimeCall;
+	type BlockNumberProvider = System;
 	type Currency = Balances;
 	type ConfigDepositBase = ConfigDepositBase;
 	type FriendDepositFactor = FriendDepositFactor;
diff --git a/substrate/frame/referenda/Cargo.toml b/substrate/frame/referenda/Cargo.toml
index e9b4eb04ed51..0f35dc74382e 100644
--- a/substrate/frame/referenda/Cargo.toml
+++ b/substrate/frame/referenda/Cargo.toml
@@ -20,15 +20,15 @@ assert_matches = { optional = true, workspace = true }
 codec = { features = [
 	"derive",
 ], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
-sp-arithmetic = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
+sp-arithmetic = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-log = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
diff --git a/substrate/frame/remark/Cargo.toml b/substrate/frame/remark/Cargo.toml
index 487bada593cd..a40b577b52ea 100644
--- a/substrate/frame/remark/Cargo.toml
+++ b/substrate/frame/remark/Cargo.toml
@@ -17,11 +17,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { optional = true, workspace = true, default-features = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/revive/Cargo.toml b/substrate/frame/revive/Cargo.toml
index e61554f5cfa0..fa008f8e836a 100644
--- a/substrate/frame/revive/Cargo.toml
+++ b/substrate/frame/revive/Cargo.toml
@@ -17,30 +17,29 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+codec = { features = ["derive", "max-encoded-len"], workspace = true }
+derive_more = { workspace = true }
 environmental = { workspace = true }
+ethereum-types = { workspace = true, features = ["codec", "rlp", "serialize"] }
+hex = { workspace = true }
+impl-trait-for-tuples = { workspace = true }
+log = { workspace = true }
 paste = { workspace = true }
-polkavm = { version = "0.17.0", default-features = false }
-bitflags = { workspace = true }
-codec = { features = ["derive", "max-encoded-len"], workspace = true }
+polkavm = { version = "0.18.0", default-features = false }
+rlp = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
-log = { workspace = true }
 serde = { features = [
 	"alloc",
 	"derive",
 ], workspace = true, default-features = false }
-impl-trait-for-tuples = { workspace = true }
-rlp = { workspace = true }
-derive_more = { workspace = true }
-hex = { workspace = true }
-ethereum-types = { workspace = true, features = ["codec", "rlp", "serialize"] }
 
 # Polkadot SDK Dependencies
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-revive-fixtures = { workspace = true, optional = true }
-pallet-revive-uapi = { workspace = true, features = ["scale"] }
 pallet-revive-proc-macro = { workspace = true }
+pallet-revive-uapi = { workspace = true, features = ["scale"] }
 pallet-transaction-payment = { workspace = true }
 sp-api = { workspace = true }
 sp-arithmetic = { workspace = true }
@@ -48,27 +47,26 @@ sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
-sp-weights = { workspace = true }
-xcm = { workspace = true }
-xcm-builder = { workspace = true }
 subxt-signer = { workspace = true, optional = true, features = [
 	"unstable-eth",
 ] }
+xcm = { workspace = true }
+xcm-builder = { workspace = true }
 
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
 assert_matches = { workspace = true }
+hex-literal = { workspace = true }
 pretty_assertions = { workspace = true }
 secp256k1 = { workspace = true, features = ["recovery"] }
 serde_json = { workspace = true }
-hex-literal = { workspace = true }
 
 # Polkadot SDK Dependencies
 pallet-balances = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
-pallet-utility = { workspace = true, default-features = true }
 pallet-proxy = { workspace = true, default-features = true }
 pallet-revive-fixtures = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
+pallet-utility = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 xcm-builder = { workspace = true, default-features = true }
@@ -102,7 +100,6 @@ std = [
 	"sp-keystore/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"sp-weights/std",
 	"subxt-signer",
 	"xcm-builder/std",
 	"xcm/std",
diff --git a/substrate/frame/revive/fixtures/Cargo.toml b/substrate/frame/revive/fixtures/Cargo.toml
index 88921cca08ec..e17bc88a3847 100644
--- a/substrate/frame/revive/fixtures/Cargo.toml
+++ b/substrate/frame/revive/fixtures/Cargo.toml
@@ -15,19 +15,16 @@ exclude-from-umbrella = true
 workspace = true
 
 [dependencies]
-frame-system = { workspace = true, default-features = true, optional = true }
+anyhow = { workspace = true, default-features = true, optional = true }
 sp-core = { workspace = true, default-features = true, optional = true }
 sp-io = { workspace = true, default-features = true, optional = true }
-sp-runtime = { workspace = true, default-features = true, optional = true }
-anyhow = { workspace = true, default-features = true, optional = true }
-log = { workspace = true }
 
 [build-dependencies]
-toml = { workspace = true }
-polkavm-linker = { version = "0.17.0" }
 anyhow = { workspace = true, default-features = true }
+polkavm-linker = { version = "0.18.0" }
+toml = { workspace = true }
 
 [features]
 default = ["std"]
 # only when std is enabled all fixtures are available
-std = ["anyhow", "frame-system", "log/std", "sp-core", "sp-io", "sp-runtime"]
+std = ["anyhow", "sp-core", "sp-io"]
diff --git a/substrate/frame/revive/fixtures/build/_Cargo.toml b/substrate/frame/revive/fixtures/build/_Cargo.toml
index 8dc38e14c14b..bfb9aaedd6f5 100644
--- a/substrate/frame/revive/fixtures/build/_Cargo.toml
+++ b/substrate/frame/revive/fixtures/build/_Cargo.toml
@@ -12,9 +12,9 @@ edition = "2021"
 
 # All paths are injected dynamically by the build script.
 [dependencies]
-uapi = { package = 'pallet-revive-uapi', path = "", features = ["unstable-api"], default-features = false }
+uapi = { package = 'pallet-revive-uapi', path = "", features = ["unstable-hostfn"], default-features = false }
 common = { package = 'pallet-revive-fixtures-common', path = "" }
-polkavm-derive = { version = "0.17.0" }
+polkavm-derive = { version = "0.18.0" }
 
 [profile.release]
 opt-level = 3
diff --git a/substrate/frame/revive/fixtures/contracts/base_fee.rs b/substrate/frame/revive/fixtures/contracts/base_fee.rs
new file mode 100644
index 000000000000..157909463ee4
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/base_fee.rs
@@ -0,0 +1,36 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Returns the base fee back to the caller.
+
+#![no_std]
+#![no_main]
+
+extern crate common;
+use uapi::{HostFn, HostFnImpl as api, ReturnFlags};
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn deploy() {}
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn call() {
+	let mut buf = [0; 32];
+	api::base_fee(&mut buf);
+	api::return_value(ReturnFlags::empty(), &buf);
+}
diff --git a/substrate/frame/revive/fixtures/contracts/call_data_copy.rs b/substrate/frame/revive/fixtures/contracts/call_data_copy.rs
new file mode 100644
index 000000000000..ccf1664058e8
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/call_data_copy.rs
@@ -0,0 +1,53 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Expects a call data of [0xFF; 32] and executes the test vectors from
+//! [https://www.evm.codes/?fork=cancun#37] and some additional tests.
+
+#![no_std]
+#![no_main]
+
+extern crate common;
+use uapi::{HostFn, HostFnImpl as api};
+
+const TEST_DATA: [u8; 32] = [
+	255, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+];
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn deploy() {}
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn call() {
+	let mut buf = [0; 32];
+
+	api::call_data_copy(&mut &mut buf[..], 0);
+	assert_eq!(buf, [255; 32]);
+
+	api::call_data_copy(&mut &mut buf[..8], 31);
+	assert_eq!(buf, TEST_DATA);
+
+	api::call_data_copy(&mut &mut buf[..], 32);
+	assert_eq!(buf, [0; 32]);
+
+	let mut buf = [255; 32];
+	api::call_data_copy(&mut &mut buf[..], u32::MAX);
+	assert_eq!(buf, [0; 32]);
+}
diff --git a/substrate/frame/revive/fixtures/contracts/call_data_size.rs b/substrate/frame/revive/fixtures/contracts/call_data_size.rs
index 32205b921d47..7caf18d440b8 100644
--- a/substrate/frame/revive/fixtures/contracts/call_data_size.rs
+++ b/substrate/frame/revive/fixtures/contracts/call_data_size.rs
@@ -30,8 +30,5 @@ pub extern "C" fn deploy() {}
 #[no_mangle]
 #[polkavm_derive::polkavm_export]
 pub extern "C" fn call() {
-	let mut buf = [0; 32];
-	api::call_data_size(&mut buf);
-
-	api::return_value(ReturnFlags::empty(), &buf);
+	api::return_value(ReturnFlags::empty(), &api::call_data_size().to_le_bytes());
 }
diff --git a/substrate/frame/revive/fixtures/contracts/common/src/lib.rs b/substrate/frame/revive/fixtures/contracts/common/src/lib.rs
index abfba282bec1..302608ccf87c 100644
--- a/substrate/frame/revive/fixtures/contracts/common/src/lib.rs
+++ b/substrate/frame/revive/fixtures/contracts/common/src/lib.rs
@@ -121,8 +121,9 @@ macro_rules! input {
 	// e.g input!(buffer, 512, var1: u32, var2: [u8], );
 	($buffer:ident, $size:expr, $($rest:tt)*) => {
 		let mut $buffer = [0u8; $size];
-		let $buffer = &mut &mut $buffer[..];
-		$crate::api::input($buffer);
+		let input_size = $crate::api::call_data_size();
+		let $buffer = &mut &mut $buffer[..$size.min(input_size as usize)];
+		$crate::api::call_data_copy($buffer, 0);
 		input!(@inner $buffer, 0, $($rest)*);
 	};
 
diff --git a/substrate/frame/revive/fixtures/contracts/create_transient_storage_and_call.rs b/substrate/frame/revive/fixtures/contracts/create_transient_storage_and_call.rs
index d2efb26e5ceb..cf12fed27563 100644
--- a/substrate/frame/revive/fixtures/contracts/create_transient_storage_and_call.rs
+++ b/substrate/frame/revive/fixtures/contracts/create_transient_storage_and_call.rs
@@ -22,7 +22,7 @@
 use common::input;
 use uapi::{HostFn, HostFnImpl as api, StorageFlags};
 
-static BUFFER: [u8; 512] = [0u8; 512];
+static BUFFER: [u8; 448] = [0u8; 448];
 
 #[no_mangle]
 #[polkavm_derive::polkavm_export]
diff --git a/substrate/frame/revive/fixtures/contracts/extcodesize.rs b/substrate/frame/revive/fixtures/contracts/extcodesize.rs
index 0a1171be30e9..3f51b69b46db 100644
--- a/substrate/frame/revive/fixtures/contracts/extcodesize.rs
+++ b/substrate/frame/revive/fixtures/contracts/extcodesize.rs
@@ -18,7 +18,7 @@
 #![no_std]
 #![no_main]
 
-use common::{input, u64_output};
+use common::input;
 use uapi::{HostFn, HostFnImpl as api};
 
 #[no_mangle]
@@ -30,7 +30,7 @@ pub extern "C" fn deploy() {}
 pub extern "C" fn call() {
 	input!(address: &[u8; 20], expected: u64,);
 
-	let received = u64_output!(api::code_size, address);
+	let received = api::code_size(address);
 
 	assert_eq!(expected, received);
 }
diff --git a/substrate/frame/revive/fixtures/contracts/gas_limit.rs b/substrate/frame/revive/fixtures/contracts/gas_limit.rs
new file mode 100644
index 000000000000..9ce82227b64d
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/gas_limit.rs
@@ -0,0 +1,34 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Returns the block ref_time limit back to the caller.
+
+#![no_std]
+#![no_main]
+
+extern crate common;
+use uapi::{HostFn, HostFnImpl as api, ReturnFlags};
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn deploy() {}
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn call() {
+	api::return_value(ReturnFlags::empty(), &api::gas_limit().to_le_bytes());
+}
diff --git a/substrate/frame/revive/fixtures/contracts/gas_price.rs b/substrate/frame/revive/fixtures/contracts/gas_price.rs
new file mode 100644
index 000000000000..c1c8109fafbe
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/gas_price.rs
@@ -0,0 +1,34 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Returns the gas price back to the caller.
+
+#![no_std]
+#![no_main]
+
+extern crate common;
+use uapi::{HostFn, HostFnImpl as api, ReturnFlags};
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn deploy() {}
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn call() {
+	api::return_value(ReturnFlags::empty(), &api::gas_price().to_le_bytes());
+}
diff --git a/substrate/frame/revive/fixtures/contracts/ref_time_left.rs b/substrate/frame/revive/fixtures/contracts/ref_time_left.rs
new file mode 100644
index 000000000000..aa892a8ba440
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/ref_time_left.rs
@@ -0,0 +1,34 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#![no_std]
+#![no_main]
+
+extern crate common;
+use uapi::{HostFn, HostFnImpl as api, ReturnFlags};
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn deploy() {
+	assert!(api::ref_time_left() > api::ref_time_left());
+}
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn call() {
+	api::return_value(ReturnFlags::empty(), &api::ref_time_left().to_le_bytes());
+}
diff --git a/substrate/frame/revive/fixtures/contracts/return_data_api.rs b/substrate/frame/revive/fixtures/contracts/return_data_api.rs
index 2a390296a419..1d483373cffd 100644
--- a/substrate/frame/revive/fixtures/contracts/return_data_api.rs
+++ b/substrate/frame/revive/fixtures/contracts/return_data_api.rs
@@ -75,9 +75,7 @@ fn recursion_guard() -> [u8; 20] {
 
 /// Assert [api::return_data_size] to match the `expected` value.
 fn assert_return_data_size_of(expected: u64) {
-	let mut return_data_size = [0xff; 32];
-	api::return_data_size(&mut return_data_size);
-	assert_eq!(return_data_size, u256_bytes(expected));
+	assert_eq!(api::return_data_size(), expected);
 }
 
 /// Assert the return data to be reset after a balance transfer.
diff --git a/substrate/frame/revive/fixtures/src/lib.rs b/substrate/frame/revive/fixtures/src/lib.rs
index 24f6ee547dc7..38171edf1152 100644
--- a/substrate/frame/revive/fixtures/src/lib.rs
+++ b/substrate/frame/revive/fixtures/src/lib.rs
@@ -27,7 +27,6 @@ include!(concat!(env!("OUT_DIR"), "/fixture_location.rs"));
 pub fn compile_module(fixture_name: &str) -> anyhow::Result<(Vec<u8>, sp_core::H256)> {
 	let out_dir: std::path::PathBuf = FIXTURE_DIR.into();
 	let fixture_path = out_dir.join(format!("{fixture_name}.polkavm"));
-	log::debug!("Loading fixture from {fixture_path:?}");
 	let binary = std::fs::read(fixture_path)?;
 	let code_hash = sp_io::hashing::keccak_256(&binary);
 	Ok((binary, sp_core::H256(code_hash)))
diff --git a/substrate/frame/revive/mock-network/Cargo.toml b/substrate/frame/revive/mock-network/Cargo.toml
index 6208db45a91e..1ebeb2c95db7 100644
--- a/substrate/frame/revive/mock-network/Cargo.toml
+++ b/substrate/frame/revive/mock-network/Cargo.toml
@@ -18,22 +18,17 @@ frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-assets = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
+pallet-message-queue = { workspace = true, default-features = true }
 pallet-revive = { workspace = true, default-features = true }
 pallet-revive-uapi = { workspace = true }
-pallet-revive-proc-macro = { workspace = true, default-features = true }
-pallet-message-queue = { workspace = true, default-features = true }
-pallet-proxy = { workspace = true, default-features = true }
 pallet-timestamp = { workspace = true, default-features = true }
-pallet-utility = { workspace = true, default-features = true }
 pallet-xcm = { workspace = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
 polkadot-runtime-parachains = { workspace = true, default-features = true }
 scale-info = { features = ["derive"], workspace = true }
-sp-api = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
-sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
 xcm = { workspace = true }
@@ -43,8 +38,8 @@ xcm-simulator = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
-pretty_assertions = { workspace = true }
 pallet-revive-fixtures = { workspace = true }
+pretty_assertions = { workspace = true }
 
 [features]
 default = ["std"]
@@ -53,17 +48,13 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"pallet-balances/std",
-	"pallet-proxy/std",
 	"pallet-revive-fixtures/std",
 	"pallet-revive/std",
 	"pallet-timestamp/std",
-	"pallet-utility/std",
 	"pallet-xcm/std",
 	"scale-info/std",
-	"sp-api/std",
 	"sp-core/std",
 	"sp-io/std",
-	"sp-keystore/std",
 	"sp-runtime/std",
 	"xcm-executor/std",
 	"xcm/std",
@@ -74,10 +65,8 @@ runtime-benchmarks = [
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-message-queue/runtime-benchmarks",
-	"pallet-proxy/runtime-benchmarks",
 	"pallet-revive/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
-	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
 	"polkadot-parachain-primitives/runtime-benchmarks",
 	"polkadot-primitives/runtime-benchmarks",
@@ -93,10 +82,8 @@ try-runtime = [
 	"pallet-assets/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-message-queue/try-runtime",
-	"pallet-proxy/try-runtime",
 	"pallet-revive/try-runtime",
 	"pallet-timestamp/try-runtime",
-	"pallet-utility/try-runtime",
 	"pallet-xcm/try-runtime",
 	"polkadot-runtime-parachains/try-runtime",
 	"sp-runtime/try-runtime",
diff --git a/substrate/frame/revive/proc-macro/src/lib.rs b/substrate/frame/revive/proc-macro/src/lib.rs
index ed1798e5b689..b6ea1a06d94e 100644
--- a/substrate/frame/revive/proc-macro/src/lib.rs
+++ b/substrate/frame/revive/proc-macro/src/lib.rs
@@ -25,6 +25,17 @@ use proc_macro2::{Literal, Span, TokenStream as TokenStream2};
 use quote::{quote, ToTokens};
 use syn::{parse_quote, punctuated::Punctuated, spanned::Spanned, token::Comma, FnArg, Ident};
 
+#[proc_macro_attribute]
+pub fn unstable_hostfn(_attr: TokenStream, item: TokenStream) -> TokenStream {
+	let input = syn::parse_macro_input!(item as syn::Item);
+	let expanded = quote! {
+		#[cfg(feature = "unstable-hostfn")]
+		#[cfg_attr(docsrs, doc(cfg(feature = "unstable-hostfn")))]
+		#input
+	};
+	expanded.into()
+}
+
 /// Defines a host functions set that can be imported by contract wasm code.
 ///
 /// **NB**: Be advised that all functions defined by this macro
diff --git a/substrate/frame/revive/rpc/Cargo.toml b/substrate/frame/revive/rpc/Cargo.toml
index 674abdd5b73e..cfaaa102fc3d 100644
--- a/substrate/frame/revive/rpc/Cargo.toml
+++ b/substrate/frame/revive/rpc/Cargo.toml
@@ -38,44 +38,37 @@ path = "examples/rust/remark-extrinsic.rs"
 required-features = ["example"]
 
 [dependencies]
-clap = { workspace = true, features = ["derive"] }
 anyhow = { workspace = true }
+clap = { workspace = true, features = ["derive"] }
+codec = { workspace = true, features = ["derive"] }
+ethabi = { version = "18.0.0" }
 futures = { workspace = true, features = ["thread-pool"] }
+hex = { workspace = true }
 jsonrpsee = { workspace = true, features = ["full"] }
-serde_json = { workspace = true }
-thiserror = { workspace = true }
-sp-crypto-hashing = { workspace = true }
-subxt = { workspace = true, default-features = true, features = ["reconnecting-rpc-client"] }
-tokio = { workspace = true, features = ["full"] }
-codec = { workspace = true, features = ["derive"] }
-log.workspace = true
+log = { workspace = true }
 pallet-revive = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-weights = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
+prometheus-endpoint = { workspace = true, default-features = true }
+rlp = { workspace = true, optional = true }
+sc-cli = { workspace = true, default-features = true }
 sc-rpc = { workspace = true, default-features = true }
 sc-rpc-api = { workspace = true, default-features = true }
-sc-cli = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
-prometheus-endpoint = { workspace = true, default-features = true }
-
-rlp = { workspace = true, optional = true }
+sp-core = { workspace = true, default-features = true }
+sp-crypto-hashing = { workspace = true }
+sp-weights = { workspace = true, default-features = true }
+subxt = { workspace = true, default-features = true, features = ["reconnecting-rpc-client"] }
 subxt-signer = { workspace = true, optional = true, features = [
 	"unstable-eth",
 ] }
-hex = { workspace = true }
-hex-literal = { workspace = true, optional = true }
-scale-info = { workspace = true }
-secp256k1 = { workspace = true, optional = true, features = ["recovery"] }
-ethabi = { version = "18.0.0" }
+thiserror = { workspace = true }
+tokio = { workspace = true, features = ["full"] }
 
 [features]
-example = ["hex-literal", "rlp", "secp256k1", "subxt-signer"]
+example = ["rlp", "subxt-signer"]
 
 [dev-dependencies]
 env_logger = { workspace = true }
-static_init = { workspace = true }
-hex-literal = { workspace = true }
 pallet-revive-fixtures = { workspace = true, default-features = true }
+static_init = { workspace = true }
 substrate-cli-test-utils = { workspace = true }
 subxt-signer = { workspace = true, features = ["unstable-eth"] }
diff --git a/substrate/frame/revive/rpc/examples/js/pvm/ErrorTester.polkavm b/substrate/frame/revive/rpc/examples/js/pvm/ErrorTester.polkavm
index ffdbbe2f9c4b..77de4ff3b1b3 100644
Binary files a/substrate/frame/revive/rpc/examples/js/pvm/ErrorTester.polkavm and b/substrate/frame/revive/rpc/examples/js/pvm/ErrorTester.polkavm differ
diff --git a/substrate/frame/revive/rpc/examples/js/pvm/EventExample.polkavm b/substrate/frame/revive/rpc/examples/js/pvm/EventExample.polkavm
index 4b013b35852e..6dbc5ca8b108 100644
Binary files a/substrate/frame/revive/rpc/examples/js/pvm/EventExample.polkavm and b/substrate/frame/revive/rpc/examples/js/pvm/EventExample.polkavm differ
diff --git a/substrate/frame/revive/rpc/examples/js/pvm/Flipper.polkavm b/substrate/frame/revive/rpc/examples/js/pvm/Flipper.polkavm
index 7fb299e464dd..488ee684f0c4 100644
Binary files a/substrate/frame/revive/rpc/examples/js/pvm/Flipper.polkavm and b/substrate/frame/revive/rpc/examples/js/pvm/Flipper.polkavm differ
diff --git a/substrate/frame/revive/rpc/examples/js/pvm/FlipperCaller.polkavm b/substrate/frame/revive/rpc/examples/js/pvm/FlipperCaller.polkavm
index f112ca275df4..585fbb392a31 100644
Binary files a/substrate/frame/revive/rpc/examples/js/pvm/FlipperCaller.polkavm and b/substrate/frame/revive/rpc/examples/js/pvm/FlipperCaller.polkavm differ
diff --git a/substrate/frame/revive/rpc/examples/js/pvm/PiggyBank.polkavm b/substrate/frame/revive/rpc/examples/js/pvm/PiggyBank.polkavm
index 4423c605f746..3f96fdfc21d8 100644
Binary files a/substrate/frame/revive/rpc/examples/js/pvm/PiggyBank.polkavm and b/substrate/frame/revive/rpc/examples/js/pvm/PiggyBank.polkavm differ
diff --git a/substrate/frame/revive/src/benchmarking/mod.rs b/substrate/frame/revive/src/benchmarking/mod.rs
index 1fb4d7ab58a4..e67c39ec0899 100644
--- a/substrate/frame/revive/src/benchmarking/mod.rs
+++ b/substrate/frame/revive/src/benchmarking/mod.rs
@@ -23,6 +23,7 @@ mod call_builder;
 mod code;
 use self::{call_builder::CallSetup, code::WasmModule};
 use crate::{
+	evm::runtime::GAS_PRICE,
 	exec::{Key, MomentOf},
 	limits,
 	storage::WriteOutcome,
@@ -362,10 +363,10 @@ mod benchmarks {
 
 	// We just call a dummy contract to measure the overhead of the call extrinsic.
 	// The size of the data has no influence on the costs of this extrinsic as long as the contract
-	// won't call `seal_input` in its constructor to copy the data to contract memory.
+	// won't call `seal_call_data_copy` in its constructor to copy the data to contract memory.
 	// The dummy contract used here does not do this. The costs for the data copy is billed as
-	// part of `seal_input`. The costs for invoking a contract of a specific size are not part
-	// of this benchmark because we cannot know the size of the contract when issuing a call
+	// part of `seal_call_data_copy`. The costs for invoking a contract of a specific size are not
+	// part of this benchmark because we cannot know the size of the contract when issuing a call
 	// transaction. See `call_with_code_per_byte` for this.
 	#[benchmark(pov_mode = Measured)]
 	fn call() -> Result<(), BenchmarkError> {
@@ -596,19 +597,15 @@ mod benchmarks {
 	#[benchmark(pov_mode = Measured)]
 	fn seal_code_size() {
 		let contract = Contract::<T>::with_index(1, WasmModule::dummy(), vec![]).unwrap();
-		build_runtime!(runtime, memory: [contract.address.encode(), vec![0u8; 32], ]);
+		build_runtime!(runtime, memory: [contract.address.encode(),]);
 
 		let result;
 		#[block]
 		{
-			result = runtime.bench_code_size(memory.as_mut_slice(), 0, 20);
+			result = runtime.bench_code_size(memory.as_mut_slice(), 0);
 		}
 
-		assert_ok!(result);
-		assert_eq!(
-			U256::from_little_endian(&memory[20..]),
-			U256::from(WasmModule::dummy().code.len())
-		);
+		assert_eq!(result.unwrap(), WasmModule::dummy().code.len() as u64);
 	}
 
 	#[benchmark(pov_mode = Measured)]
@@ -671,6 +668,18 @@ mod benchmarks {
 		);
 	}
 
+	#[benchmark(pov_mode = Measured)]
+	fn seal_ref_time_left() {
+		build_runtime!(runtime, memory: [vec![], ]);
+
+		let result;
+		#[block]
+		{
+			result = runtime.bench_ref_time_left(memory.as_mut_slice());
+		}
+		assert_eq!(result.unwrap(), runtime.ext().gas_meter().gas_left().ref_time());
+	}
+
 	#[benchmark(pov_mode = Measured)]
 	fn seal_balance() {
 		build_runtime!(runtime, memory: [[0u8;32], ]);
@@ -771,19 +780,68 @@ mod benchmarks {
 		assert_eq!(U256::from_little_endian(&memory[..]), runtime.ext().minimum_balance());
 	}
 
+	#[benchmark(pov_mode = Measured)]
+	fn seal_return_data_size() {
+		let mut setup = CallSetup::<T>::default();
+		let (mut ext, _) = setup.ext();
+		let mut runtime = crate::wasm::Runtime::new(&mut ext, vec![]);
+		let mut memory = memory!(vec![],);
+		*runtime.ext().last_frame_output_mut() =
+			ExecReturnValue { data: vec![42; 256], ..Default::default() };
+		let result;
+		#[block]
+		{
+			result = runtime.bench_return_data_size(memory.as_mut_slice());
+		}
+		assert_eq!(result.unwrap(), 256);
+	}
+
 	#[benchmark(pov_mode = Measured)]
 	fn seal_call_data_size() {
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
 		let mut runtime = crate::wasm::Runtime::new(&mut ext, vec![42u8; 128 as usize]);
-		let mut memory = memory!(vec![0u8; 32 as usize],);
+		let mut memory = memory!(vec![0u8; 4],);
+		let result;
+		#[block]
+		{
+			result = runtime.bench_call_data_size(memory.as_mut_slice());
+		}
+		assert_eq!(result.unwrap(), 128);
+	}
+
+	#[benchmark(pov_mode = Measured)]
+	fn seal_gas_limit() {
+		build_runtime!(runtime, memory: []);
+		let result;
+		#[block]
+		{
+			result = runtime.bench_gas_limit(&mut memory);
+		}
+		assert_eq!(result.unwrap(), T::BlockWeights::get().max_block.ref_time());
+	}
+
+	#[benchmark(pov_mode = Measured)]
+	fn seal_gas_price() {
+		build_runtime!(runtime, memory: []);
 		let result;
 		#[block]
 		{
-			result = runtime.bench_call_data_size(memory.as_mut_slice(), 0);
+			result = runtime.bench_gas_price(memory.as_mut_slice());
+		}
+		assert_eq!(result.unwrap(), u64::from(GAS_PRICE));
+	}
+
+	#[benchmark(pov_mode = Measured)]
+	fn seal_base_fee() {
+		build_runtime!(runtime, memory: [[1u8;32], ]);
+		let result;
+		#[block]
+		{
+			result = runtime.bench_base_fee(memory.as_mut_slice(), 0);
 		}
 		assert_ok!(result);
-		assert_eq!(U256::from_little_endian(&memory[..]), U256::from(128));
+		assert_eq!(U256::from_little_endian(&memory[..]), U256::zero());
 	}
 
 	#[benchmark(pov_mode = Measured)]
@@ -853,6 +911,29 @@ mod benchmarks {
 		assert_eq!(U256::from_little_endian(&memory[..]), runtime.ext().get_weight_price(weight));
 	}
 
+	#[benchmark(pov_mode = Measured)]
+	fn seal_copy_to_contract(n: Linear<0, { limits::code::BLOB_BYTES - 4 }>) {
+		let mut setup = CallSetup::<T>::default();
+		let (mut ext, _) = setup.ext();
+		let mut runtime = crate::wasm::Runtime::new(&mut ext, vec![]);
+		let mut memory = memory!(n.encode(), vec![0u8; n as usize],);
+		let result;
+		#[block]
+		{
+			result = runtime.write_sandbox_output(
+				memory.as_mut_slice(),
+				4,
+				0,
+				&vec![42u8; n as usize],
+				false,
+				|_| None,
+			);
+		}
+		assert_ok!(result);
+		assert_eq!(&memory[..4], &n.encode());
+		assert_eq!(&memory[4..], &vec![42u8; n as usize]);
+	}
+
 	#[benchmark(pov_mode = Measured)]
 	fn seal_call_data_load() {
 		let mut setup = CallSetup::<T>::default();
@@ -869,18 +950,18 @@ mod benchmarks {
 	}
 
 	#[benchmark(pov_mode = Measured)]
-	fn seal_input(n: Linear<0, { limits::code::BLOB_BYTES - 4 }>) {
+	fn seal_call_data_copy(n: Linear<0, { limits::code::BLOB_BYTES }>) {
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
 		let mut runtime = crate::wasm::Runtime::new(&mut ext, vec![42u8; n as usize]);
-		let mut memory = memory!(n.to_le_bytes(), vec![0u8; n as usize],);
+		let mut memory = memory!(vec![0u8; n as usize],);
 		let result;
 		#[block]
 		{
-			result = runtime.bench_input(memory.as_mut_slice(), 4, 0);
+			result = runtime.bench_call_data_copy(memory.as_mut_slice(), 0, n, 0);
 		}
 		assert_ok!(result);
-		assert_eq!(&memory[4..], &vec![42u8; n as usize]);
+		assert_eq!(&memory[..], &vec![42u8; n as usize]);
 	}
 
 	#[benchmark(pov_mode = Measured)]
diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index b6f0e3ae1a81..a6a259149768 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -298,7 +298,7 @@ pub trait Ext: sealing::Sealed {
 	fn code_hash(&self, address: &H160) -> H256;
 
 	/// Returns the code size of the contract at the given `address` or zero.
-	fn code_size(&self, address: &H160) -> U256;
+	fn code_size(&self, address: &H160) -> u64;
 
 	/// Returns the code hash of the contract being executed.
 	fn own_code_hash(&mut self) -> &H256;
@@ -1663,7 +1663,7 @@ where
 			})
 	}
 
-	fn code_size(&self, address: &H160) -> U256 {
+	fn code_size(&self, address: &H160) -> u64 {
 		<ContractInfoOf<T>>::get(&address)
 			.and_then(|contract| CodeInfoOf::<T>::get(contract.code_hash))
 			.map(|info| info.code_len())
diff --git a/substrate/frame/revive/src/limits.rs b/substrate/frame/revive/src/limits.rs
index 2e112baae301..3b55106c67d8 100644
--- a/substrate/frame/revive/src/limits.rs
+++ b/substrate/frame/revive/src/limits.rs
@@ -47,7 +47,7 @@ pub const NUM_EVENT_TOPICS: u32 = 4;
 pub const DELEGATE_DEPENDENCIES: u32 = 32;
 
 /// Maximum size of events (including topics) and storage values.
-pub const PAYLOAD_BYTES: u32 = 512;
+pub const PAYLOAD_BYTES: u32 = 448;
 
 /// The maximum size of the transient storage in bytes.
 ///
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 27ec7948e8fd..664578bf7672 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -29,7 +29,7 @@ use crate::{
 		ChainExtension, Environment, Ext, RegisteredChainExtension, Result as ExtensionResult,
 		RetVal, ReturnFlags,
 	},
-	evm::GenericTransaction,
+	evm::{runtime::GAS_PRICE, GenericTransaction},
 	exec::Key,
 	limits,
 	primitives::CodeUploadReturnValue,
@@ -374,7 +374,7 @@ impl RegisteredChainExtension<Test> for TempStorageExtension {
 parameter_types! {
 	pub BlockWeights: frame_system::limits::BlockWeights =
 		frame_system::limits::BlockWeights::simple_max(
-			Weight::from_parts(2u64 * WEIGHT_REF_TIME_PER_SECOND, u64::MAX),
+			Weight::from_parts(2 * WEIGHT_REF_TIME_PER_SECOND, u64::MAX),
 		);
 	pub static ExistentialDeposit: u64 = 1;
 }
@@ -382,6 +382,7 @@ parameter_types! {
 #[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
 impl frame_system::Config for Test {
 	type Block = Block;
+	type BlockWeights = BlockWeights;
 	type AccountId = AccountId32;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type AccountData = pallet_balances::AccountData<u64>;
@@ -438,7 +439,7 @@ parameter_types! {
 	pub static DepositPerByte: BalanceOf<Test> = 1;
 	pub const DepositPerItem: BalanceOf<Test> = 2;
 	pub static CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(0);
-	pub static ChainId: u64 = 384;
+	pub static ChainId: u64 = 448;
 }
 
 impl Convert<Weight, BalanceOf<Self>> for Test {
@@ -1874,6 +1875,27 @@ fn lazy_batch_removal_works() {
 	});
 }
 
+#[test]
+fn ref_time_left_api_works() {
+	let (code, _) = compile_module("ref_time_left").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor calls ref_time_left twice and asserts it to decrease
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: It echoes back the ref_time returned by the ref_time_left API.
+		let received = builder::bare_call(addr).build_and_unwrap_result();
+		assert_eq!(received.flags, ReturnFlags::empty());
+
+		let returned_value = u64::from_le_bytes(received.data[..8].try_into().unwrap());
+		assert!(returned_value > 0);
+		assert!(returned_value < GAS_LIMIT.ref_time());
+	});
+}
+
 #[test]
 fn lazy_removal_partial_remove_works() {
 	let (code, _hash) = compile_module("self_destruct").unwrap();
@@ -3483,7 +3505,7 @@ fn deposit_limit_in_nested_calls() {
 		// Require more than the sender's balance.
 		// Limit the sub call to little balance so it should fail in there
 		let ret = builder::bare_call(addr_caller)
-			.data((512u32, &addr_callee, U256::from(1u64)).encode())
+			.data((448, &addr_callee, U256::from(1u64)).encode())
 			.build_and_unwrap_result();
 		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
 
@@ -4342,6 +4364,42 @@ fn create1_with_value_works() {
 	});
 }
 
+#[test]
+fn gas_price_api_works() {
+	let (code, _) = compile_module("gas_price").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: It echoes back the value returned by the gas price API.
+		let received = builder::bare_call(addr).build_and_unwrap_result();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(u64::from_le_bytes(received.data[..].try_into().unwrap()), u64::from(GAS_PRICE));
+	});
+}
+
+#[test]
+fn base_fee_api_works() {
+	let (code, _) = compile_module("base_fee").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: It echoes back the value returned by the base fee API.
+		let received = builder::bare_call(addr).build_and_unwrap_result();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(U256::from_little_endian(received.data[..].try_into().unwrap()), U256::zero());
+	});
+}
+
 #[test]
 fn call_data_size_api_works() {
 	let (code, _) = compile_module("call_data_size").unwrap();
@@ -4356,11 +4414,27 @@ fn call_data_size_api_works() {
 		// Call the contract: It echoes back the value returned by the call data size API.
 		let received = builder::bare_call(addr).build_and_unwrap_result();
 		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(U256::from_little_endian(&received.data), U256::zero());
+		assert_eq!(u64::from_le_bytes(received.data.try_into().unwrap()), 0);
 
 		let received = builder::bare_call(addr).data(vec![1; 256]).build_and_unwrap_result();
 		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(U256::from_little_endian(&received.data), U256::from(256));
+		assert_eq!(u64::from_le_bytes(received.data.try_into().unwrap()), 256);
+	});
+}
+
+#[test]
+fn call_data_copy_api_works() {
+	let (code, _) = compile_module("call_data_copy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call fixture: Expects an input of [255; 32] and executes tests.
+		assert_ok!(builder::call(addr).data(vec![255; 32]).build());
 	});
 }
 
@@ -4818,6 +4892,27 @@ fn skip_transfer_works() {
 	});
 }
 
+#[test]
+fn gas_limit_api_works() {
+	let (code, _) = compile_module("gas_limit").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: It echoes back the value returned by the gas limit API.
+		let received = builder::bare_call(addr).build_and_unwrap_result();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(
+			u64::from_le_bytes(received.data[..].try_into().unwrap()),
+			<Test as frame_system::Config>::BlockWeights::get().max_block.ref_time()
+		);
+	});
+}
+
 #[test]
 fn unknown_syscall_rejected() {
 	let (code, _) = compile_module("unknown_syscall").unwrap();
diff --git a/substrate/frame/revive/src/wasm/mod.rs b/substrate/frame/revive/src/wasm/mod.rs
index e963895dafae..b24de61314f9 100644
--- a/substrate/frame/revive/src/wasm/mod.rs
+++ b/substrate/frame/revive/src/wasm/mod.rs
@@ -242,7 +242,7 @@ impl<T: Config> CodeInfo<T> {
 	}
 
 	/// Returns the code length.
-	pub fn code_len(&self) -> U256 {
+	pub fn code_len(&self) -> u64 {
 		self.code_len.into()
 	}
 }
diff --git a/substrate/frame/revive/src/wasm/runtime.rs b/substrate/frame/revive/src/wasm/runtime.rs
index 648a1621c198..52f79f2eb55a 100644
--- a/substrate/frame/revive/src/wasm/runtime.rs
+++ b/substrate/frame/revive/src/wasm/runtime.rs
@@ -19,6 +19,7 @@
 
 use crate::{
 	address::AddressMapper,
+	evm::runtime::GAS_PRICE,
 	exec::{ExecError, ExecResult, Ext, Key},
 	gas::{ChargedAmount, Token},
 	limits,
@@ -65,6 +66,13 @@ pub trait Memory<T: Config> {
 	/// - designated area is not within the bounds of the sandbox memory.
 	fn write(&mut self, ptr: u32, buf: &[u8]) -> Result<(), DispatchError>;
 
+	/// Zero the designated location in the sandbox memory.
+	///
+	/// Returns `Err` if one of the following conditions occurs:
+	///
+	/// - designated area is not within the bounds of the sandbox memory.
+	fn zero(&mut self, ptr: u32, len: u32) -> Result<(), DispatchError>;
+
 	/// Read designated chunk from the sandbox memory.
 	///
 	/// Returns `Err` if one of the following conditions occurs:
@@ -162,6 +170,10 @@ impl<T: Config> Memory<T> for [u8] {
 		bound_checked.copy_from_slice(buf);
 		Ok(())
 	}
+
+	fn zero(&mut self, ptr: u32, len: u32) -> Result<(), DispatchError> {
+		<[u8] as Memory<T>>::write(self, ptr, &vec![0; len as usize])
+	}
 }
 
 impl<T: Config> Memory<T> for polkavm::RawInstance {
@@ -174,6 +186,10 @@ impl<T: Config> Memory<T> for polkavm::RawInstance {
 	fn write(&mut self, ptr: u32, buf: &[u8]) -> Result<(), DispatchError> {
 		self.write_memory(ptr, buf).map_err(|_| Error::<T>::OutOfBounds.into())
 	}
+
+	fn zero(&mut self, ptr: u32, len: u32) -> Result<(), DispatchError> {
+		self.zero_memory(ptr, len).map_err(|_| Error::<T>::OutOfBounds.into())
+	}
 }
 
 impl<T: Config> PolkaVmInstance<T> for polkavm::RawInstance {
@@ -269,10 +285,14 @@ pub enum RuntimeCosts {
 	CopyToContract(u32),
 	/// Weight of calling `seal_call_data_load``.
 	CallDataLoad,
+	/// Weight of calling `seal_call_data_copy`.
+	CallDataCopy(u32),
 	/// Weight of calling `seal_caller`.
 	Caller,
 	/// Weight of calling `seal_call_data_size`.
 	CallDataSize,
+	/// Weight of calling `seal_return_data_size`.
+	ReturnDataSize,
 	/// Weight of calling `seal_origin`.
 	Origin,
 	/// Weight of calling `seal_is_contract`.
@@ -289,6 +309,8 @@ pub enum RuntimeCosts {
 	CallerIsRoot,
 	/// Weight of calling `seal_address`.
 	Address,
+	/// Weight of calling `seal_ref_time_left`.
+	RefTimeLeft,
 	/// Weight of calling `seal_weight_left`.
 	WeightLeft,
 	/// Weight of calling `seal_balance`.
@@ -303,8 +325,14 @@ pub enum RuntimeCosts {
 	BlockNumber,
 	/// Weight of calling `seal_block_hash`.
 	BlockHash,
+	/// Weight of calling `seal_gas_price`.
+	GasPrice,
+	/// Weight of calling `seal_base_fee`.
+	BaseFee,
 	/// Weight of calling `seal_now`.
 	Now,
+	/// Weight of calling `seal_gas_limit`.
+	GasLimit,
 	/// Weight of calling `seal_weight_to_fee`.
 	WeightToFee,
 	/// Weight of calling `seal_terminate`, passing the number of locked dependencies.
@@ -431,10 +459,12 @@ impl<T: Config> Token<T> for RuntimeCosts {
 		use self::RuntimeCosts::*;
 		match *self {
 			HostFn => cost_args!(noop_host_fn, 1),
-			CopyToContract(len) => T::WeightInfo::seal_input(len),
+			CopyToContract(len) => T::WeightInfo::seal_copy_to_contract(len),
 			CopyFromContract(len) => T::WeightInfo::seal_return(len),
 			CallDataSize => T::WeightInfo::seal_call_data_size(),
+			ReturnDataSize => T::WeightInfo::seal_return_data_size(),
 			CallDataLoad => T::WeightInfo::seal_call_data_load(),
+			CallDataCopy(len) => T::WeightInfo::seal_call_data_copy(len),
 			Caller => T::WeightInfo::seal_caller(),
 			Origin => T::WeightInfo::seal_origin(),
 			IsContract => T::WeightInfo::seal_is_contract(),
@@ -444,6 +474,7 @@ impl<T: Config> Token<T> for RuntimeCosts {
 			CallerIsOrigin => T::WeightInfo::seal_caller_is_origin(),
 			CallerIsRoot => T::WeightInfo::seal_caller_is_root(),
 			Address => T::WeightInfo::seal_address(),
+			RefTimeLeft => T::WeightInfo::seal_ref_time_left(),
 			WeightLeft => T::WeightInfo::seal_weight_left(),
 			Balance => T::WeightInfo::seal_balance(),
 			BalanceOf => T::WeightInfo::seal_balance_of(),
@@ -451,7 +482,10 @@ impl<T: Config> Token<T> for RuntimeCosts {
 			MinimumBalance => T::WeightInfo::seal_minimum_balance(),
 			BlockNumber => T::WeightInfo::seal_block_number(),
 			BlockHash => T::WeightInfo::seal_block_hash(),
+			GasPrice => T::WeightInfo::seal_gas_price(),
+			BaseFee => T::WeightInfo::seal_base_fee(),
 			Now => T::WeightInfo::seal_now(),
+			GasLimit => T::WeightInfo::seal_gas_limit(),
 			WeightToFee => T::WeightInfo::seal_weight_to_fee(),
 			Terminate(locked_dependencies) => T::WeightInfo::seal_terminate(locked_dependencies),
 			DepositEvent { num_topic, len } => T::WeightInfo::seal_deposit_event(num_topic, len),
@@ -1262,32 +1296,44 @@ pub mod env {
 	/// Returns the total size of the contract call input data.
 	/// See [`pallet_revive_uapi::HostFn::call_data_size `].
 	#[stable]
-	fn call_data_size(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+	fn call_data_size(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
 		self.charge_gas(RuntimeCosts::CallDataSize)?;
-		let value =
-			U256::from(self.input_data.as_ref().map(|input| input.len()).unwrap_or_default());
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&value.to_little_endian(),
-			false,
-			already_charged,
-		)?)
+		Ok(self
+			.input_data
+			.as_ref()
+			.map(|input| input.len().try_into().expect("usize fits into u64; qed"))
+			.unwrap_or_default())
 	}
 
 	/// Stores the input passed by the caller into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::input`].
+	/// See [`pallet_revive_uapi::HostFn::call_data_copy`].
 	#[stable]
-	fn input(&mut self, memory: &mut M, out_ptr: u32, out_len_ptr: u32) -> Result<(), TrapReason> {
-		if let Some(input) = self.input_data.take() {
-			self.write_sandbox_output(memory, out_ptr, out_len_ptr, &input, false, |len| {
-				Some(RuntimeCosts::CopyToContract(len))
-			})?;
-			self.input_data = Some(input);
-			Ok(())
-		} else {
-			Err(Error::<E::T>::InputForwarded.into())
+	fn call_data_copy(
+		&mut self,
+		memory: &mut M,
+		out_ptr: u32,
+		out_len: u32,
+		offset: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::CallDataCopy(out_len))?;
+
+		let Some(input) = self.input_data.as_ref() else {
+			return Err(Error::<E::T>::InputForwarded.into());
+		};
+
+		let start = offset as usize;
+		if start >= input.len() {
+			memory.zero(out_ptr, out_len)?;
+			return Ok(());
 		}
+
+		let end = start.saturating_add(out_len as usize).min(input.len());
+		memory.write(out_ptr, &input[start..end])?;
+
+		let bytes_written = (end - start) as u32;
+		memory.zero(out_ptr.saturating_add(bytes_written), out_len - bytes_written)?;
+
+		Ok(())
 	}
 
 	/// Stores the U256 value at given call input `offset` into the supplied buffer.
@@ -1383,16 +1429,10 @@ pub mod env {
 	/// Retrieve the code size for a given contract address.
 	/// See [`pallet_revive_uapi::HostFn::code_size`].
 	#[stable]
-	fn code_size(&mut self, memory: &mut M, addr_ptr: u32, out_ptr: u32) -> Result<(), TrapReason> {
+	fn code_size(&mut self, memory: &mut M, addr_ptr: u32) -> Result<u64, TrapReason> {
 		self.charge_gas(RuntimeCosts::CodeSize)?;
 		let address = memory.read_h160(addr_ptr)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&self.ext.code_size(&address).to_little_endian(),
-			false,
-			already_charged,
-		)?)
+		Ok(self.ext.code_size(&address))
 	}
 
 	/// Stores the address of the current contract into the supplied buffer.
@@ -1508,6 +1548,14 @@ pub mod env {
 		)?)
 	}
 
+	/// Returns the block ref_time limit.
+	/// See [`pallet_revive_uapi::HostFn::gas_limit`].
+	#[stable]
+	fn gas_limit(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
+		self.charge_gas(RuntimeCosts::GasLimit)?;
+		Ok(<E::T as frame_system::Config>::BlockWeights::get().max_block.ref_time())
+	}
+
 	/// Stores the value transferred along with this call/instantiate into the supplied buffer.
 	/// See [`pallet_revive_uapi::HostFn::value_transferred`].
 	#[stable]
@@ -1522,6 +1570,28 @@ pub mod env {
 		)?)
 	}
 
+	/// Returns the simulated ethereum `GASPRICE` value.
+	/// See [`pallet_revive_uapi::HostFn::gas_price`].
+	#[stable]
+	fn gas_price(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
+		self.charge_gas(RuntimeCosts::GasPrice)?;
+		Ok(GAS_PRICE.into())
+	}
+
+	/// Returns the simulated ethereum `BASEFEE` value.
+	/// See [`pallet_revive_uapi::HostFn::base_fee`].
+	#[stable]
+	fn base_fee(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::BaseFee)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&U256::zero().to_little_endian(),
+			false,
+			already_charged,
+		)?)
+	}
+
 	/// Load the latest block timestamp into the supplied buffer
 	/// See [`pallet_revive_uapi::HostFn::now`].
 	#[stable]
@@ -1630,14 +1700,15 @@ pub mod env {
 	/// Stores the length of the data returned by the last call into the supplied buffer.
 	/// See [`pallet_revive_uapi::HostFn::return_data_size`].
 	#[stable]
-	fn return_data_size(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&U256::from(self.ext.last_frame_output().data.len()).to_little_endian(),
-			false,
-			|len| Some(RuntimeCosts::CopyToContract(len)),
-		)?)
+	fn return_data_size(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
+		self.charge_gas(RuntimeCosts::ReturnDataSize)?;
+		Ok(self
+			.ext
+			.last_frame_output()
+			.data
+			.len()
+			.try_into()
+			.expect("usize fits into u64; qed"))
 	}
 
 	/// Stores data returned by the last call, starting from `offset`, into the supplied buffer.
@@ -1667,6 +1738,14 @@ pub mod env {
 		Ok(result?)
 	}
 
+	/// Returns the amount of ref_time left.
+	/// See [`pallet_revive_uapi::HostFn::ref_time_left`].
+	#[stable]
+	fn ref_time_left(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
+		self.charge_gas(RuntimeCosts::RefTimeLeft)?;
+		Ok(self.ext.gas_meter().gas_left().ref_time())
+	}
+
 	/// Call into the chain extension provided by the chain if any.
 	/// See [`pallet_revive_uapi::HostFn::call_chain_extension`].
 	fn call_chain_extension(
diff --git a/substrate/frame/revive/src/weights.rs b/substrate/frame/revive/src/weights.rs
index e8fec31b19e5..e35ba5ca0766 100644
--- a/substrate/frame/revive/src/weights.rs
+++ b/substrate/frame/revive/src/weights.rs
@@ -18,9 +18,9 @@
 //! Autogenerated weights for `pallet_revive`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-12-12, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-12-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `a0d5968554fc`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `19e0eeaa3bc2`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
@@ -74,19 +74,25 @@ pub trait WeightInfo {
 	fn seal_caller_is_root() -> Weight;
 	fn seal_address() -> Weight;
 	fn seal_weight_left() -> Weight;
+	fn seal_ref_time_left() -> Weight;
 	fn seal_balance() -> Weight;
 	fn seal_balance_of() -> Weight;
 	fn seal_get_immutable_data(n: u32, ) -> Weight;
 	fn seal_set_immutable_data(n: u32, ) -> Weight;
 	fn seal_value_transferred() -> Weight;
 	fn seal_minimum_balance() -> Weight;
+	fn seal_return_data_size() -> Weight;
 	fn seal_call_data_size() -> Weight;
+	fn seal_gas_limit() -> Weight;
+	fn seal_gas_price() -> Weight;
+	fn seal_base_fee() -> Weight;
 	fn seal_block_number() -> Weight;
 	fn seal_block_hash() -> Weight;
 	fn seal_now() -> Weight;
 	fn seal_weight_to_fee() -> Weight;
+	fn seal_copy_to_contract(n: u32, ) -> Weight;
 	fn seal_call_data_load() -> Weight;
-	fn seal_input(n: u32, ) -> Weight;
+	fn seal_call_data_copy(n: u32, ) -> Weight;
 	fn seal_return(n: u32, ) -> Weight;
 	fn seal_terminate(n: u32, ) -> Weight;
 	fn seal_deposit_event(t: u32, n: u32, ) -> Weight;
@@ -135,8 +141,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `1594`
-		// Minimum execution time: 2_921_000 picoseconds.
-		Weight::from_parts(3_048_000, 1594)
+		// Minimum execution time: 2_859_000 picoseconds.
+		Weight::from_parts(3_007_000, 1594)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -146,10 +152,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `425 + k * (69 ±0)`
 		//  Estimated: `415 + k * (70 ±0)`
-		// Minimum execution time: 16_060_000 picoseconds.
-		Weight::from_parts(3_234_033, 415)
-			// Standard Error: 1_160
-			.saturating_add(Weight::from_parts(1_184_188, 0).saturating_mul(k.into()))
+		// Minimum execution time: 15_640_000 picoseconds.
+		Weight::from_parts(1_609_026, 415)
+			// Standard Error: 1_359
+			.saturating_add(Weight::from_parts(1_204_420, 0).saturating_mul(k.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(k.into())))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
@@ -171,10 +177,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `c` is `[0, 262144]`.
 	fn call_with_code_per_byte(_c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1536`
-		//  Estimated: `7476`
-		// Minimum execution time: 93_624_000 picoseconds.
-		Weight::from_parts(98_332_129, 7476)
+		//  Measured:  `1463`
+		//  Estimated: `7403`
+		// Minimum execution time: 89_437_000 picoseconds.
+		Weight::from_parts(94_285_182, 7403)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -196,14 +202,14 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `i` is `[0, 262144]`.
 	fn instantiate_with_code(c: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `416`
-		//  Estimated: `6345`
-		// Minimum execution time: 196_202_000 picoseconds.
-		Weight::from_parts(169_823_092, 6345)
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(30, 0).saturating_mul(c.into()))
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(4_487, 0).saturating_mul(i.into()))
+		//  Measured:  `364`
+		//  Estimated: `6327`
+		// Minimum execution time: 187_904_000 picoseconds.
+		Weight::from_parts(153_252_081, 6327)
+			// Standard Error: 11
+			.saturating_add(Weight::from_parts(49, 0).saturating_mul(c.into()))
+			// Standard Error: 11
+			.saturating_add(Weight::from_parts(4_528, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
@@ -225,11 +231,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn instantiate(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1296`
-		//  Estimated: `4753`
-		// Minimum execution time: 162_423_000 picoseconds.
-		Weight::from_parts(144_467_590, 4753)
+		//  Estimated: `4758`
+		// Minimum execution time: 154_656_000 picoseconds.
+		Weight::from_parts(139_308_398, 4758)
 			// Standard Error: 16
-			.saturating_add(Weight::from_parts(4_405, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(4_421, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -247,10 +253,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	fn call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1536`
-		//  Estimated: `7476`
-		// Minimum execution time: 144_454_000 picoseconds.
-		Weight::from_parts(151_756_000, 7476)
+		//  Measured:  `1463`
+		//  Estimated: `7403`
+		// Minimum execution time: 138_815_000 picoseconds.
+		Weight::from_parts(149_067_000, 7403)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -261,12 +267,14 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	/// The range of component `c` is `[0, 262144]`.
-	fn upload_code(_c: u32, ) -> Weight {
+	fn upload_code(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `3574`
-		// Minimum execution time: 50_712_000 picoseconds.
-		Weight::from_parts(52_831_382, 3574)
+		// Minimum execution time: 49_978_000 picoseconds.
+		Weight::from_parts(51_789_325, 3574)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(1, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -280,8 +288,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `285`
 		//  Estimated: `3750`
-		// Minimum execution time: 44_441_000 picoseconds.
-		Weight::from_parts(46_242_000, 3750)
+		// Minimum execution time: 43_833_000 picoseconds.
+		Weight::from_parts(44_660_000, 3750)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -293,8 +301,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `529`
 		//  Estimated: `6469`
-		// Minimum execution time: 27_157_000 picoseconds.
-		Weight::from_parts(28_182_000, 6469)
+		// Minimum execution time: 26_717_000 picoseconds.
+		Weight::from_parts(28_566_000, 6469)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -306,8 +314,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `3574`
-		// Minimum execution time: 40_588_000 picoseconds.
-		Weight::from_parts(41_125_000, 3574)
+		// Minimum execution time: 39_401_000 picoseconds.
+		Weight::from_parts(40_542_000, 3574)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -319,8 +327,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `56`
 		//  Estimated: `3521`
-		// Minimum execution time: 31_849_000 picoseconds.
-		Weight::from_parts(32_674_000, 3521)
+		// Minimum execution time: 31_570_000 picoseconds.
+		Weight::from_parts(32_302_000, 3521)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -332,8 +340,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 14_510_000 picoseconds.
-		Weight::from_parts(14_986_000, 3610)
+		// Minimum execution time: 13_607_000 picoseconds.
+		Weight::from_parts(13_903_000, 3610)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	/// The range of component `r` is `[0, 1600]`.
@@ -341,24 +349,24 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_324_000 picoseconds.
-		Weight::from_parts(8_363_388, 0)
-			// Standard Error: 230
-			.saturating_add(Weight::from_parts(170_510, 0).saturating_mul(r.into()))
+		// Minimum execution time: 7_400_000 picoseconds.
+		Weight::from_parts(8_388_251, 0)
+			// Standard Error: 283
+			.saturating_add(Weight::from_parts(165_630, 0).saturating_mul(r.into()))
 	}
 	fn seal_caller() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 275_000 picoseconds.
-		Weight::from_parts(326_000, 0)
+		Weight::from_parts(305_000, 0)
 	}
 	fn seal_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 263_000 picoseconds.
-		Weight::from_parts(292_000, 0)
+		// Minimum execution time: 224_000 picoseconds.
+		Weight::from_parts(265_000, 0)
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
 	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(1779), added: 4254, mode: `Measured`)
@@ -366,8 +374,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `306`
 		//  Estimated: `3771`
-		// Minimum execution time: 10_011_000 picoseconds.
-		Weight::from_parts(10_476_000, 3771)
+		// Minimum execution time: 10_004_000 picoseconds.
+		Weight::from_parts(10_336_000, 3771)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
@@ -376,16 +384,16 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `403`
 		//  Estimated: `3868`
-		// Minimum execution time: 11_253_000 picoseconds.
-		Weight::from_parts(11_642_000, 3868)
+		// Minimum execution time: 11_054_000 picoseconds.
+		Weight::from_parts(11_651_000, 3868)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	fn seal_own_code_hash() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 244_000 picoseconds.
-		Weight::from_parts(318_000, 0)
+		// Minimum execution time: 252_000 picoseconds.
+		Weight::from_parts(305_000, 0)
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
 	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(1779), added: 4254, mode: `Measured`)
@@ -395,44 +403,51 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `473`
 		//  Estimated: `3938`
-		// Minimum execution time: 14_904_000 picoseconds.
-		Weight::from_parts(15_281_000, 3938)
+		// Minimum execution time: 14_461_000 picoseconds.
+		Weight::from_parts(15_049_000, 3938)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	fn seal_caller_is_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 382_000 picoseconds.
-		Weight::from_parts(422_000, 0)
+		// Minimum execution time: 312_000 picoseconds.
+		Weight::from_parts(338_000, 0)
 	}
 	fn seal_caller_is_root() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 258_000 picoseconds.
-		Weight::from_parts(310_000, 0)
+		// Minimum execution time: 243_000 picoseconds.
+		Weight::from_parts(299_000, 0)
 	}
 	fn seal_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 283_000 picoseconds.
-		Weight::from_parts(315_000, 0)
+		// Minimum execution time: 231_000 picoseconds.
+		Weight::from_parts(271_000, 0)
 	}
 	fn seal_weight_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 637_000 picoseconds.
-		Weight::from_parts(726_000, 0)
+		// Minimum execution time: 683_000 picoseconds.
+		Weight::from_parts(732_000, 0)
+	}
+	fn seal_ref_time_left() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 226_000 picoseconds.
+		Weight::from_parts(273_000, 0)
 	}
 	fn seal_balance() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `103`
+		//  Measured:  `102`
 		//  Estimated: `0`
-		// Minimum execution time: 4_649_000 picoseconds.
-		Weight::from_parts(4_860_000, 0)
+		// Minimum execution time: 4_626_000 picoseconds.
+		Weight::from_parts(4_842_000, 0)
 	}
 	/// Storage: `Revive::AddressSuffix` (r:1 w:0)
 	/// Proof: `Revive::AddressSuffix` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `Measured`)
@@ -442,8 +457,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `264`
 		//  Estimated: `3729`
-		// Minimum execution time: 9_053_000 picoseconds.
-		Weight::from_parts(9_480_000, 3729)
+		// Minimum execution time: 12_309_000 picoseconds.
+		Weight::from_parts(12_653_000, 3729)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	/// Storage: `Revive::ImmutableDataOf` (r:1 w:0)
@@ -453,10 +468,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `238 + n * (1 ±0)`
 		//  Estimated: `3703 + n * (1 ±0)`
-		// Minimum execution time: 5_991_000 picoseconds.
-		Weight::from_parts(6_760_389, 3703)
-			// Standard Error: 5
-			.saturating_add(Weight::from_parts(627, 0).saturating_mul(n.into()))
+		// Minimum execution time: 5_838_000 picoseconds.
+		Weight::from_parts(9_570_778, 3703)
+			// Standard Error: 19
+			.saturating_add(Weight::from_parts(721, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -467,39 +482,67 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_062_000 picoseconds.
-		Weight::from_parts(2_277_051, 0)
+		// Minimum execution time: 1_910_000 picoseconds.
+		Weight::from_parts(2_205_396, 0)
 			// Standard Error: 2
-			.saturating_add(Weight::from_parts(530, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(538, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	fn seal_value_transferred() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 267_000 picoseconds.
-		Weight::from_parts(299_000, 0)
+		// Minimum execution time: 224_000 picoseconds.
+		Weight::from_parts(274_000, 0)
 	}
 	fn seal_minimum_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 263_000 picoseconds.
-		Weight::from_parts(318_000, 0)
+		// Minimum execution time: 231_000 picoseconds.
+		Weight::from_parts(279_000, 0)
+	}
+	fn seal_return_data_size() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 229_000 picoseconds.
+		Weight::from_parts(267_000, 0)
 	}
 	fn seal_call_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 264_000 picoseconds.
-		Weight::from_parts(303_000, 0)
+		// Minimum execution time: 218_000 picoseconds.
+		Weight::from_parts(267_000, 0)
+	}
+	fn seal_gas_limit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 225_000 picoseconds.
+		Weight::from_parts(280_000, 0)
+	}
+	fn seal_gas_price() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 274_000 picoseconds.
+		Weight::from_parts(323_000, 0)
+	}
+	fn seal_base_fee() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 239_000 picoseconds.
+		Weight::from_parts(290_000, 0)
 	}
 	fn seal_block_number() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 267_000 picoseconds.
-		Weight::from_parts(296_000, 0)
+		// Minimum execution time: 224_000 picoseconds.
+		Weight::from_parts(274_000, 0)
 	}
 	/// Storage: `System::BlockHash` (r:1 w:0)
 	/// Proof: `System::BlockHash` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `Measured`)
@@ -507,38 +550,48 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `30`
 		//  Estimated: `3495`
-		// Minimum execution time: 3_622_000 picoseconds.
-		Weight::from_parts(3_794_000, 3495)
+		// Minimum execution time: 3_430_000 picoseconds.
+		Weight::from_parts(3_692_000, 3495)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	fn seal_now() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 244_000 picoseconds.
-		Weight::from_parts(298_000, 0)
+		// Minimum execution time: 241_000 picoseconds.
+		Weight::from_parts(290_000, 0)
 	}
 	fn seal_weight_to_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_340_000 picoseconds.
-		Weight::from_parts(1_483_000, 0)
+		// Minimum execution time: 1_355_000 picoseconds.
+		Weight::from_parts(1_493_000, 0)
+	}
+	/// The range of component `n` is `[0, 262140]`.
+	fn seal_copy_to_contract(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 348_000 picoseconds.
+		Weight::from_parts(1_004_890, 0)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(202, 0).saturating_mul(n.into()))
 	}
 	fn seal_call_data_load() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 244_000 picoseconds.
-		Weight::from_parts(295_000, 0)
+		// Minimum execution time: 222_000 picoseconds.
+		Weight::from_parts(256_000, 0)
 	}
-	/// The range of component `n` is `[0, 262140]`.
-	fn seal_input(n: u32, ) -> Weight {
+	/// The range of component `n` is `[0, 262144]`.
+	fn seal_call_data_copy(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 475_000 picoseconds.
-		Weight::from_parts(427_145, 0)
+		// Minimum execution time: 240_000 picoseconds.
+		Weight::from_parts(330_609, 0)
 			// Standard Error: 0
 			.saturating_add(Weight::from_parts(114, 0).saturating_mul(n.into()))
 	}
@@ -547,10 +600,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 291_000 picoseconds.
-		Weight::from_parts(846_264, 0)
+		// Minimum execution time: 232_000 picoseconds.
+		Weight::from_parts(264_000, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(200, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(208, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::AddressSuffix` (r:1 w:0)
 	/// Proof: `Revive::AddressSuffix` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `Measured`)
@@ -565,12 +618,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `n` is `[0, 32]`.
 	fn seal_terminate(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `324 + n * (88 ±0)`
-		//  Estimated: `3791 + n * (2563 ±0)`
-		// Minimum execution time: 22_494_000 picoseconds.
-		Weight::from_parts(23_028_153, 3791)
-			// Standard Error: 12_407
-			.saturating_add(Weight::from_parts(4_238_442, 0).saturating_mul(n.into()))
+		//  Measured:  `322 + n * (88 ±0)`
+		//  Estimated: `3787 + n * (2563 ±0)`
+		// Minimum execution time: 21_920_000 picoseconds.
+		Weight::from_parts(21_725_868, 3787)
+			// Standard Error: 11_165
+			.saturating_add(Weight::from_parts(4_317_986, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
@@ -578,56 +631,56 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(Weight::from_parts(0, 2563).saturating_mul(n.into()))
 	}
 	/// The range of component `t` is `[0, 4]`.
-	/// The range of component `n` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
 	fn seal_deposit_event(t: u32, n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_383_000 picoseconds.
-		Weight::from_parts(4_364_292, 0)
-			// Standard Error: 2_775
-			.saturating_add(Weight::from_parts(210_189, 0).saturating_mul(t.into()))
-			// Standard Error: 24
-			.saturating_add(Weight::from_parts(952, 0).saturating_mul(n.into()))
+		// Minimum execution time: 4_140_000 picoseconds.
+		Weight::from_parts(4_259_301, 0)
+			// Standard Error: 3_362
+			.saturating_add(Weight::from_parts(194_546, 0).saturating_mul(t.into()))
+			// Standard Error: 34
+			.saturating_add(Weight::from_parts(774, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_debug_message(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 328_000 picoseconds.
-		Weight::from_parts(393_925, 0)
+		// Minimum execution time: 340_000 picoseconds.
+		Weight::from_parts(306_527, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(725, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(728, 0).saturating_mul(i.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn get_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `744`
-		//  Estimated: `744`
-		// Minimum execution time: 7_649_000 picoseconds.
-		Weight::from_parts(8_025_000, 744)
+		//  Measured:  `680`
+		//  Estimated: `680`
+		// Minimum execution time: 10_747_000 picoseconds.
+		Weight::from_parts(11_276_000, 680)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn get_storage_full() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `10754`
-		//  Estimated: `10754`
-		// Minimum execution time: 43_439_000 picoseconds.
-		Weight::from_parts(44_296_000, 10754)
+		//  Measured:  `10690`
+		//  Estimated: `10690`
+		// Minimum execution time: 42_076_000 picoseconds.
+		Weight::from_parts(43_381_000, 10690)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `744`
-		//  Estimated: `744`
-		// Minimum execution time: 8_919_000 picoseconds.
-		Weight::from_parts(9_392_000, 744)
+		//  Measured:  `680`
+		//  Estimated: `680`
+		// Minimum execution time: 11_703_000 picoseconds.
+		Weight::from_parts(12_308_000, 680)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -635,85 +688,85 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_storage_full() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `10754`
-		//  Estimated: `10754`
-		// Minimum execution time: 45_032_000 picoseconds.
-		Weight::from_parts(46_050_000, 10754)
+		//  Measured:  `10690`
+		//  Estimated: `10690`
+		// Minimum execution time: 43_460_000 picoseconds.
+		Weight::from_parts(45_165_000, 10690)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `n` is `[0, 512]`.
-	/// The range of component `o` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
+	/// The range of component `o` is `[0, 448]`.
 	fn seal_set_storage(n: u32, o: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + o * (1 ±0)`
 		//  Estimated: `247 + o * (1 ±0)`
-		// Minimum execution time: 9_272_000 picoseconds.
-		Weight::from_parts(10_022_838, 247)
-			// Standard Error: 43
-			.saturating_add(Weight::from_parts(513, 0).saturating_mul(n.into()))
-			// Standard Error: 43
-			.saturating_add(Weight::from_parts(625, 0).saturating_mul(o.into()))
+		// Minimum execution time: 9_087_000 picoseconds.
+		Weight::from_parts(11_787_486, 247)
+			// Standard Error: 179
+			.saturating_add(Weight::from_parts(976, 0).saturating_mul(n.into()))
+			// Standard Error: 179
+			.saturating_add(Weight::from_parts(3_151, 0).saturating_mul(o.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(o.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `n` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
 	fn seal_clear_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_885_000 picoseconds.
-		Weight::from_parts(9_785_932, 247)
-			// Standard Error: 55
-			.saturating_add(Weight::from_parts(612, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_611_000 picoseconds.
+		Weight::from_parts(11_791_390, 247)
+			// Standard Error: 308
+			.saturating_add(Weight::from_parts(3_943, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `n` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
 	fn seal_get_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_440_000 picoseconds.
-		Weight::from_parts(9_453_769, 247)
-			// Standard Error: 62
-			.saturating_add(Weight::from_parts(1_529, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_389_000 picoseconds.
+		Weight::from_parts(11_625_480, 247)
+			// Standard Error: 315
+			.saturating_add(Weight::from_parts(4_487, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `n` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
 	fn seal_contains_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_212_000 picoseconds.
-		Weight::from_parts(8_880_676, 247)
-			// Standard Error: 54
-			.saturating_add(Weight::from_parts(673, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_947_000 picoseconds.
+		Weight::from_parts(10_970_587, 247)
+			// Standard Error: 310
+			.saturating_add(Weight::from_parts(3_675, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `n` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
 	fn seal_take_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 9_491_000 picoseconds.
-		Weight::from_parts(10_313_570, 247)
-			// Standard Error: 65
-			.saturating_add(Weight::from_parts(1_681, 0).saturating_mul(n.into()))
+		// Minimum execution time: 9_071_000 picoseconds.
+		Weight::from_parts(12_525_027, 247)
+			// Standard Error: 328
+			.saturating_add(Weight::from_parts(4_427, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
@@ -722,89 +775,89 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_530_000 picoseconds.
-		Weight::from_parts(1_642_000, 0)
+		// Minimum execution time: 1_487_000 picoseconds.
+		Weight::from_parts(1_611_000, 0)
 	}
 	fn set_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_851_000 picoseconds.
-		Weight::from_parts(1_999_000, 0)
+		// Minimum execution time: 1_852_000 picoseconds.
+		Weight::from_parts(1_982_000, 0)
 	}
 	fn get_transient_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_429_000 picoseconds.
-		Weight::from_parts(1_527_000, 0)
+		// Minimum execution time: 1_467_000 picoseconds.
+		Weight::from_parts(1_529_000, 0)
 	}
 	fn get_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_689_000 picoseconds.
-		Weight::from_parts(1_772_000, 0)
+		// Minimum execution time: 1_630_000 picoseconds.
+		Weight::from_parts(1_712_000, 0)
 	}
 	fn rollback_transient_storage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_049_000 picoseconds.
-		Weight::from_parts(1_153_000, 0)
+		// Minimum execution time: 1_188_000 picoseconds.
+		Weight::from_parts(1_268_000, 0)
 	}
-	/// The range of component `n` is `[0, 512]`.
-	/// The range of component `o` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
+	/// The range of component `o` is `[0, 448]`.
 	fn seal_set_transient_storage(n: u32, o: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_338_000 picoseconds.
-		Weight::from_parts(2_514_685, 0)
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(299, 0).saturating_mul(n.into()))
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(403, 0).saturating_mul(o.into()))
+		// Minimum execution time: 2_197_000 picoseconds.
+		Weight::from_parts(2_464_654, 0)
+			// Standard Error: 17
+			.saturating_add(Weight::from_parts(296, 0).saturating_mul(n.into()))
+			// Standard Error: 17
+			.saturating_add(Weight::from_parts(342, 0).saturating_mul(o.into()))
 	}
-	/// The range of component `n` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
 	fn seal_clear_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_045_000 picoseconds.
-		Weight::from_parts(2_409_843, 0)
-			// Standard Error: 16
-			.saturating_add(Weight::from_parts(350, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_005_000 picoseconds.
+		Weight::from_parts(2_381_053, 0)
+			// Standard Error: 23
+			.saturating_add(Weight::from_parts(322, 0).saturating_mul(n.into()))
 	}
-	/// The range of component `n` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
 	fn seal_get_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_891_000 picoseconds.
-		Weight::from_parts(2_117_702, 0)
-			// Standard Error: 12
-			.saturating_add(Weight::from_parts(289, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_853_000 picoseconds.
+		Weight::from_parts(2_082_772, 0)
+			// Standard Error: 20
+			.saturating_add(Weight::from_parts(322, 0).saturating_mul(n.into()))
 	}
-	/// The range of component `n` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
 	fn seal_contains_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_786_000 picoseconds.
-		Weight::from_parts(1_949_290, 0)
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(232, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_711_000 picoseconds.
+		Weight::from_parts(1_899_649, 0)
+			// Standard Error: 16
+			.saturating_add(Weight::from_parts(208, 0).saturating_mul(n.into()))
 	}
-	/// The range of component `n` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
 	fn seal_take_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_465_000 picoseconds.
-		Weight::from_parts(2_712_107, 0)
-			// Standard Error: 14
-			.saturating_add(Weight::from_parts(79, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_460_000 picoseconds.
+		Weight::from_parts(2_684_364, 0)
+			// Standard Error: 22
+			.saturating_add(Weight::from_parts(56, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::AddressSuffix` (r:1 w:0)
 	/// Proof: `Revive::AddressSuffix` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `Measured`)
@@ -820,18 +873,18 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_call(t: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1294 + t * (243 ±0)`
-		//  Estimated: `4759 + t * (2501 ±0)`
-		// Minimum execution time: 41_377_000 picoseconds.
-		Weight::from_parts(43_024_676, 4759)
-			// Standard Error: 44_099
-			.saturating_add(Weight::from_parts(1_689_315, 0).saturating_mul(t.into()))
+		//  Measured:  `1292 + t * (203 ±0)`
+		//  Estimated: `4757 + t * (2480 ±0)`
+		// Minimum execution time: 40_031_000 picoseconds.
+		Weight::from_parts(41_527_691, 4757)
+			// Standard Error: 50_351
+			.saturating_add(Weight::from_parts(1_112_950, 0).saturating_mul(t.into()))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(2, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(1, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(t.into())))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
-			.saturating_add(Weight::from_parts(0, 2501).saturating_mul(t.into()))
+			.saturating_add(Weight::from_parts(0, 2480).saturating_mul(t.into()))
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
 	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(1779), added: 4254, mode: `Measured`)
@@ -843,8 +896,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1237`
 		//  Estimated: `4702`
-		// Minimum execution time: 36_324_000 picoseconds.
-		Weight::from_parts(37_657_000, 4702)
+		// Minimum execution time: 35_759_000 picoseconds.
+		Weight::from_parts(37_086_000, 4702)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
@@ -858,12 +911,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_instantiate(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1273`
-		//  Estimated: `4736`
-		// Minimum execution time: 117_657_000 picoseconds.
-		Weight::from_parts(110_177_403, 4736)
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(4_097, 0).saturating_mul(i.into()))
+		//  Measured:  `1271`
+		//  Estimated: `4710`
+		// Minimum execution time: 116_485_000 picoseconds.
+		Weight::from_parts(108_907_717, 4710)
+			// Standard Error: 12
+			.saturating_add(Weight::from_parts(4_125, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -872,64 +925,64 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 650_000 picoseconds.
-		Weight::from_parts(4_208_007, 0)
+		// Minimum execution time: 651_000 picoseconds.
+		Weight::from_parts(3_867_609, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_396, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_384, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_hash_keccak_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_101_000 picoseconds.
-		Weight::from_parts(4_521_803, 0)
+		// Minimum execution time: 1_090_000 picoseconds.
+		Weight::from_parts(5_338_460, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(3_609, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_601, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_hash_blake2_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 654_000 picoseconds.
-		Weight::from_parts(3_060_461, 0)
+		// Minimum execution time: 717_000 picoseconds.
+		Weight::from_parts(2_629_461, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_531, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_528, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_hash_blake2_128(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 628_000 picoseconds.
-		Weight::from_parts(3_784_567, 0)
+		// Minimum execution time: 660_000 picoseconds.
+		Weight::from_parts(4_807_814, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_526, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_509, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 261889]`.
 	fn seal_sr25519_verify(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 42_892_000 picoseconds.
-		Weight::from_parts(25_002_714, 0)
-			// Standard Error: 12
-			.saturating_add(Weight::from_parts(5_252, 0).saturating_mul(n.into()))
+		// Minimum execution time: 42_829_000 picoseconds.
+		Weight::from_parts(24_650_992, 0)
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(5_212, 0).saturating_mul(n.into()))
 	}
 	fn seal_ecdsa_recover() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 46_990_000 picoseconds.
-		Weight::from_parts(48_960_000, 0)
+		// Minimum execution time: 46_902_000 picoseconds.
+		Weight::from_parts(48_072_000, 0)
 	}
 	fn seal_ecdsa_to_eth_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_870_000 picoseconds.
-		Weight::from_parts(13_062_000, 0)
+		// Minimum execution time: 12_713_000 picoseconds.
+		Weight::from_parts(12_847_000, 0)
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
@@ -937,8 +990,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `300`
 		//  Estimated: `3765`
-		// Minimum execution time: 17_810_000 picoseconds.
-		Weight::from_parts(18_667_000, 3765)
+		// Minimum execution time: 17_657_000 picoseconds.
+		Weight::from_parts(18_419_000, 3765)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -948,8 +1001,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `338`
 		//  Estimated: `3803`
-		// Minimum execution time: 13_762_000 picoseconds.
-		Weight::from_parts(14_526_000, 3803)
+		// Minimum execution time: 13_650_000 picoseconds.
+		Weight::from_parts(14_209_000, 3803)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -959,8 +1012,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `338`
 		//  Estimated: `3561`
-		// Minimum execution time: 12_753_000 picoseconds.
-		Weight::from_parts(13_199_000, 3561)
+		// Minimum execution time: 12_341_000 picoseconds.
+		Weight::from_parts(13_011_000, 3561)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -969,10 +1022,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_060_000 picoseconds.
-		Weight::from_parts(10_131_024, 0)
-			// Standard Error: 72
-			.saturating_add(Weight::from_parts(71_842, 0).saturating_mul(r.into()))
+		// Minimum execution time: 8_899_000 picoseconds.
+		Weight::from_parts(10_489_171, 0)
+			// Standard Error: 104
+			.saturating_add(Weight::from_parts(73_814, 0).saturating_mul(r.into()))
 	}
 }
 
@@ -984,8 +1037,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `1594`
-		// Minimum execution time: 2_921_000 picoseconds.
-		Weight::from_parts(3_048_000, 1594)
+		// Minimum execution time: 2_859_000 picoseconds.
+		Weight::from_parts(3_007_000, 1594)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -995,10 +1048,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `425 + k * (69 ±0)`
 		//  Estimated: `415 + k * (70 ±0)`
-		// Minimum execution time: 16_060_000 picoseconds.
-		Weight::from_parts(3_234_033, 415)
-			// Standard Error: 1_160
-			.saturating_add(Weight::from_parts(1_184_188, 0).saturating_mul(k.into()))
+		// Minimum execution time: 15_640_000 picoseconds.
+		Weight::from_parts(1_609_026, 415)
+			// Standard Error: 1_359
+			.saturating_add(Weight::from_parts(1_204_420, 0).saturating_mul(k.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(k.into())))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
@@ -1020,10 +1073,10 @@ impl WeightInfo for () {
 	/// The range of component `c` is `[0, 262144]`.
 	fn call_with_code_per_byte(_c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1536`
-		//  Estimated: `7476`
-		// Minimum execution time: 93_624_000 picoseconds.
-		Weight::from_parts(98_332_129, 7476)
+		//  Measured:  `1463`
+		//  Estimated: `7403`
+		// Minimum execution time: 89_437_000 picoseconds.
+		Weight::from_parts(94_285_182, 7403)
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1045,14 +1098,14 @@ impl WeightInfo for () {
 	/// The range of component `i` is `[0, 262144]`.
 	fn instantiate_with_code(c: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `416`
-		//  Estimated: `6345`
-		// Minimum execution time: 196_202_000 picoseconds.
-		Weight::from_parts(169_823_092, 6345)
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(30, 0).saturating_mul(c.into()))
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(4_487, 0).saturating_mul(i.into()))
+		//  Measured:  `364`
+		//  Estimated: `6327`
+		// Minimum execution time: 187_904_000 picoseconds.
+		Weight::from_parts(153_252_081, 6327)
+			// Standard Error: 11
+			.saturating_add(Weight::from_parts(49, 0).saturating_mul(c.into()))
+			// Standard Error: 11
+			.saturating_add(Weight::from_parts(4_528, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
@@ -1074,11 +1127,11 @@ impl WeightInfo for () {
 	fn instantiate(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1296`
-		//  Estimated: `4753`
-		// Minimum execution time: 162_423_000 picoseconds.
-		Weight::from_parts(144_467_590, 4753)
+		//  Estimated: `4758`
+		// Minimum execution time: 154_656_000 picoseconds.
+		Weight::from_parts(139_308_398, 4758)
 			// Standard Error: 16
-			.saturating_add(Weight::from_parts(4_405, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(4_421, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -1096,10 +1149,10 @@ impl WeightInfo for () {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	fn call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1536`
-		//  Estimated: `7476`
-		// Minimum execution time: 144_454_000 picoseconds.
-		Weight::from_parts(151_756_000, 7476)
+		//  Measured:  `1463`
+		//  Estimated: `7403`
+		// Minimum execution time: 138_815_000 picoseconds.
+		Weight::from_parts(149_067_000, 7403)
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1110,12 +1163,14 @@ impl WeightInfo for () {
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	/// The range of component `c` is `[0, 262144]`.
-	fn upload_code(_c: u32, ) -> Weight {
+	fn upload_code(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `3574`
-		// Minimum execution time: 50_712_000 picoseconds.
-		Weight::from_parts(52_831_382, 3574)
+		// Minimum execution time: 49_978_000 picoseconds.
+		Weight::from_parts(51_789_325, 3574)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(1, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1129,8 +1184,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `285`
 		//  Estimated: `3750`
-		// Minimum execution time: 44_441_000 picoseconds.
-		Weight::from_parts(46_242_000, 3750)
+		// Minimum execution time: 43_833_000 picoseconds.
+		Weight::from_parts(44_660_000, 3750)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1142,8 +1197,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `529`
 		//  Estimated: `6469`
-		// Minimum execution time: 27_157_000 picoseconds.
-		Weight::from_parts(28_182_000, 6469)
+		// Minimum execution time: 26_717_000 picoseconds.
+		Weight::from_parts(28_566_000, 6469)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1155,8 +1210,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `3574`
-		// Minimum execution time: 40_588_000 picoseconds.
-		Weight::from_parts(41_125_000, 3574)
+		// Minimum execution time: 39_401_000 picoseconds.
+		Weight::from_parts(40_542_000, 3574)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1168,8 +1223,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `56`
 		//  Estimated: `3521`
-		// Minimum execution time: 31_849_000 picoseconds.
-		Weight::from_parts(32_674_000, 3521)
+		// Minimum execution time: 31_570_000 picoseconds.
+		Weight::from_parts(32_302_000, 3521)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1181,8 +1236,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 14_510_000 picoseconds.
-		Weight::from_parts(14_986_000, 3610)
+		// Minimum execution time: 13_607_000 picoseconds.
+		Weight::from_parts(13_903_000, 3610)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	/// The range of component `r` is `[0, 1600]`.
@@ -1190,24 +1245,24 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_324_000 picoseconds.
-		Weight::from_parts(8_363_388, 0)
-			// Standard Error: 230
-			.saturating_add(Weight::from_parts(170_510, 0).saturating_mul(r.into()))
+		// Minimum execution time: 7_400_000 picoseconds.
+		Weight::from_parts(8_388_251, 0)
+			// Standard Error: 283
+			.saturating_add(Weight::from_parts(165_630, 0).saturating_mul(r.into()))
 	}
 	fn seal_caller() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 275_000 picoseconds.
-		Weight::from_parts(326_000, 0)
+		Weight::from_parts(305_000, 0)
 	}
 	fn seal_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 263_000 picoseconds.
-		Weight::from_parts(292_000, 0)
+		// Minimum execution time: 224_000 picoseconds.
+		Weight::from_parts(265_000, 0)
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
 	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(1779), added: 4254, mode: `Measured`)
@@ -1215,8 +1270,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `306`
 		//  Estimated: `3771`
-		// Minimum execution time: 10_011_000 picoseconds.
-		Weight::from_parts(10_476_000, 3771)
+		// Minimum execution time: 10_004_000 picoseconds.
+		Weight::from_parts(10_336_000, 3771)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
@@ -1225,16 +1280,16 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `403`
 		//  Estimated: `3868`
-		// Minimum execution time: 11_253_000 picoseconds.
-		Weight::from_parts(11_642_000, 3868)
+		// Minimum execution time: 11_054_000 picoseconds.
+		Weight::from_parts(11_651_000, 3868)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	fn seal_own_code_hash() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 244_000 picoseconds.
-		Weight::from_parts(318_000, 0)
+		// Minimum execution time: 252_000 picoseconds.
+		Weight::from_parts(305_000, 0)
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
 	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(1779), added: 4254, mode: `Measured`)
@@ -1244,44 +1299,51 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `473`
 		//  Estimated: `3938`
-		// Minimum execution time: 14_904_000 picoseconds.
-		Weight::from_parts(15_281_000, 3938)
+		// Minimum execution time: 14_461_000 picoseconds.
+		Weight::from_parts(15_049_000, 3938)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	fn seal_caller_is_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 382_000 picoseconds.
-		Weight::from_parts(422_000, 0)
+		// Minimum execution time: 312_000 picoseconds.
+		Weight::from_parts(338_000, 0)
 	}
 	fn seal_caller_is_root() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 258_000 picoseconds.
-		Weight::from_parts(310_000, 0)
+		// Minimum execution time: 243_000 picoseconds.
+		Weight::from_parts(299_000, 0)
 	}
 	fn seal_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 283_000 picoseconds.
-		Weight::from_parts(315_000, 0)
+		// Minimum execution time: 231_000 picoseconds.
+		Weight::from_parts(271_000, 0)
 	}
 	fn seal_weight_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 637_000 picoseconds.
-		Weight::from_parts(726_000, 0)
+		// Minimum execution time: 683_000 picoseconds.
+		Weight::from_parts(732_000, 0)
+	}
+	fn seal_ref_time_left() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 226_000 picoseconds.
+		Weight::from_parts(273_000, 0)
 	}
 	fn seal_balance() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `103`
+		//  Measured:  `102`
 		//  Estimated: `0`
-		// Minimum execution time: 4_649_000 picoseconds.
-		Weight::from_parts(4_860_000, 0)
+		// Minimum execution time: 4_626_000 picoseconds.
+		Weight::from_parts(4_842_000, 0)
 	}
 	/// Storage: `Revive::AddressSuffix` (r:1 w:0)
 	/// Proof: `Revive::AddressSuffix` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `Measured`)
@@ -1291,8 +1353,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `264`
 		//  Estimated: `3729`
-		// Minimum execution time: 9_053_000 picoseconds.
-		Weight::from_parts(9_480_000, 3729)
+		// Minimum execution time: 12_309_000 picoseconds.
+		Weight::from_parts(12_653_000, 3729)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	/// Storage: `Revive::ImmutableDataOf` (r:1 w:0)
@@ -1302,10 +1364,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `238 + n * (1 ±0)`
 		//  Estimated: `3703 + n * (1 ±0)`
-		// Minimum execution time: 5_991_000 picoseconds.
-		Weight::from_parts(6_760_389, 3703)
-			// Standard Error: 5
-			.saturating_add(Weight::from_parts(627, 0).saturating_mul(n.into()))
+		// Minimum execution time: 5_838_000 picoseconds.
+		Weight::from_parts(9_570_778, 3703)
+			// Standard Error: 19
+			.saturating_add(Weight::from_parts(721, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1316,39 +1378,67 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_062_000 picoseconds.
-		Weight::from_parts(2_277_051, 0)
+		// Minimum execution time: 1_910_000 picoseconds.
+		Weight::from_parts(2_205_396, 0)
 			// Standard Error: 2
-			.saturating_add(Weight::from_parts(530, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(538, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	fn seal_value_transferred() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 267_000 picoseconds.
-		Weight::from_parts(299_000, 0)
+		// Minimum execution time: 224_000 picoseconds.
+		Weight::from_parts(274_000, 0)
 	}
 	fn seal_minimum_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 263_000 picoseconds.
-		Weight::from_parts(318_000, 0)
+		// Minimum execution time: 231_000 picoseconds.
+		Weight::from_parts(279_000, 0)
+	}
+	fn seal_return_data_size() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 229_000 picoseconds.
+		Weight::from_parts(267_000, 0)
 	}
 	fn seal_call_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 264_000 picoseconds.
-		Weight::from_parts(303_000, 0)
+		// Minimum execution time: 218_000 picoseconds.
+		Weight::from_parts(267_000, 0)
+	}
+	fn seal_gas_limit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 225_000 picoseconds.
+		Weight::from_parts(280_000, 0)
+	}
+	fn seal_gas_price() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 274_000 picoseconds.
+		Weight::from_parts(323_000, 0)
+	}
+	fn seal_base_fee() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 239_000 picoseconds.
+		Weight::from_parts(290_000, 0)
 	}
 	fn seal_block_number() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 267_000 picoseconds.
-		Weight::from_parts(296_000, 0)
+		// Minimum execution time: 224_000 picoseconds.
+		Weight::from_parts(274_000, 0)
 	}
 	/// Storage: `System::BlockHash` (r:1 w:0)
 	/// Proof: `System::BlockHash` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `Measured`)
@@ -1356,38 +1446,48 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `30`
 		//  Estimated: `3495`
-		// Minimum execution time: 3_622_000 picoseconds.
-		Weight::from_parts(3_794_000, 3495)
+		// Minimum execution time: 3_430_000 picoseconds.
+		Weight::from_parts(3_692_000, 3495)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	fn seal_now() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 244_000 picoseconds.
-		Weight::from_parts(298_000, 0)
+		// Minimum execution time: 241_000 picoseconds.
+		Weight::from_parts(290_000, 0)
 	}
 	fn seal_weight_to_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_340_000 picoseconds.
-		Weight::from_parts(1_483_000, 0)
+		// Minimum execution time: 1_355_000 picoseconds.
+		Weight::from_parts(1_493_000, 0)
+	}
+	/// The range of component `n` is `[0, 262140]`.
+	fn seal_copy_to_contract(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 348_000 picoseconds.
+		Weight::from_parts(1_004_890, 0)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(202, 0).saturating_mul(n.into()))
 	}
 	fn seal_call_data_load() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 244_000 picoseconds.
-		Weight::from_parts(295_000, 0)
+		// Minimum execution time: 222_000 picoseconds.
+		Weight::from_parts(256_000, 0)
 	}
-	/// The range of component `n` is `[0, 262140]`.
-	fn seal_input(n: u32, ) -> Weight {
+	/// The range of component `n` is `[0, 262144]`.
+	fn seal_call_data_copy(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 475_000 picoseconds.
-		Weight::from_parts(427_145, 0)
+		// Minimum execution time: 240_000 picoseconds.
+		Weight::from_parts(330_609, 0)
 			// Standard Error: 0
 			.saturating_add(Weight::from_parts(114, 0).saturating_mul(n.into()))
 	}
@@ -1396,10 +1496,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 291_000 picoseconds.
-		Weight::from_parts(846_264, 0)
+		// Minimum execution time: 232_000 picoseconds.
+		Weight::from_parts(264_000, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(200, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(208, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::AddressSuffix` (r:1 w:0)
 	/// Proof: `Revive::AddressSuffix` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `Measured`)
@@ -1414,12 +1514,12 @@ impl WeightInfo for () {
 	/// The range of component `n` is `[0, 32]`.
 	fn seal_terminate(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `324 + n * (88 ±0)`
-		//  Estimated: `3791 + n * (2563 ±0)`
-		// Minimum execution time: 22_494_000 picoseconds.
-		Weight::from_parts(23_028_153, 3791)
-			// Standard Error: 12_407
-			.saturating_add(Weight::from_parts(4_238_442, 0).saturating_mul(n.into()))
+		//  Measured:  `322 + n * (88 ±0)`
+		//  Estimated: `3787 + n * (2563 ±0)`
+		// Minimum execution time: 21_920_000 picoseconds.
+		Weight::from_parts(21_725_868, 3787)
+			// Standard Error: 11_165
+			.saturating_add(Weight::from_parts(4_317_986, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
@@ -1427,56 +1527,56 @@ impl WeightInfo for () {
 			.saturating_add(Weight::from_parts(0, 2563).saturating_mul(n.into()))
 	}
 	/// The range of component `t` is `[0, 4]`.
-	/// The range of component `n` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
 	fn seal_deposit_event(t: u32, n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_383_000 picoseconds.
-		Weight::from_parts(4_364_292, 0)
-			// Standard Error: 2_775
-			.saturating_add(Weight::from_parts(210_189, 0).saturating_mul(t.into()))
-			// Standard Error: 24
-			.saturating_add(Weight::from_parts(952, 0).saturating_mul(n.into()))
+		// Minimum execution time: 4_140_000 picoseconds.
+		Weight::from_parts(4_259_301, 0)
+			// Standard Error: 3_362
+			.saturating_add(Weight::from_parts(194_546, 0).saturating_mul(t.into()))
+			// Standard Error: 34
+			.saturating_add(Weight::from_parts(774, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_debug_message(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 328_000 picoseconds.
-		Weight::from_parts(393_925, 0)
+		// Minimum execution time: 340_000 picoseconds.
+		Weight::from_parts(306_527, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(725, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(728, 0).saturating_mul(i.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn get_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `744`
-		//  Estimated: `744`
-		// Minimum execution time: 7_649_000 picoseconds.
-		Weight::from_parts(8_025_000, 744)
+		//  Measured:  `680`
+		//  Estimated: `680`
+		// Minimum execution time: 10_747_000 picoseconds.
+		Weight::from_parts(11_276_000, 680)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn get_storage_full() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `10754`
-		//  Estimated: `10754`
-		// Minimum execution time: 43_439_000 picoseconds.
-		Weight::from_parts(44_296_000, 10754)
+		//  Measured:  `10690`
+		//  Estimated: `10690`
+		// Minimum execution time: 42_076_000 picoseconds.
+		Weight::from_parts(43_381_000, 10690)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `744`
-		//  Estimated: `744`
-		// Minimum execution time: 8_919_000 picoseconds.
-		Weight::from_parts(9_392_000, 744)
+		//  Measured:  `680`
+		//  Estimated: `680`
+		// Minimum execution time: 11_703_000 picoseconds.
+		Weight::from_parts(12_308_000, 680)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1484,85 +1584,85 @@ impl WeightInfo for () {
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_storage_full() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `10754`
-		//  Estimated: `10754`
-		// Minimum execution time: 45_032_000 picoseconds.
-		Weight::from_parts(46_050_000, 10754)
+		//  Measured:  `10690`
+		//  Estimated: `10690`
+		// Minimum execution time: 43_460_000 picoseconds.
+		Weight::from_parts(45_165_000, 10690)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `n` is `[0, 512]`.
-	/// The range of component `o` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
+	/// The range of component `o` is `[0, 448]`.
 	fn seal_set_storage(n: u32, o: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + o * (1 ±0)`
 		//  Estimated: `247 + o * (1 ±0)`
-		// Minimum execution time: 9_272_000 picoseconds.
-		Weight::from_parts(10_022_838, 247)
-			// Standard Error: 43
-			.saturating_add(Weight::from_parts(513, 0).saturating_mul(n.into()))
-			// Standard Error: 43
-			.saturating_add(Weight::from_parts(625, 0).saturating_mul(o.into()))
+		// Minimum execution time: 9_087_000 picoseconds.
+		Weight::from_parts(11_787_486, 247)
+			// Standard Error: 179
+			.saturating_add(Weight::from_parts(976, 0).saturating_mul(n.into()))
+			// Standard Error: 179
+			.saturating_add(Weight::from_parts(3_151, 0).saturating_mul(o.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(o.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `n` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
 	fn seal_clear_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_885_000 picoseconds.
-		Weight::from_parts(9_785_932, 247)
-			// Standard Error: 55
-			.saturating_add(Weight::from_parts(612, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_611_000 picoseconds.
+		Weight::from_parts(11_791_390, 247)
+			// Standard Error: 308
+			.saturating_add(Weight::from_parts(3_943, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `n` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
 	fn seal_get_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_440_000 picoseconds.
-		Weight::from_parts(9_453_769, 247)
-			// Standard Error: 62
-			.saturating_add(Weight::from_parts(1_529, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_389_000 picoseconds.
+		Weight::from_parts(11_625_480, 247)
+			// Standard Error: 315
+			.saturating_add(Weight::from_parts(4_487, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `n` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
 	fn seal_contains_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_212_000 picoseconds.
-		Weight::from_parts(8_880_676, 247)
-			// Standard Error: 54
-			.saturating_add(Weight::from_parts(673, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_947_000 picoseconds.
+		Weight::from_parts(10_970_587, 247)
+			// Standard Error: 310
+			.saturating_add(Weight::from_parts(3_675, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `n` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
 	fn seal_take_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 9_491_000 picoseconds.
-		Weight::from_parts(10_313_570, 247)
-			// Standard Error: 65
-			.saturating_add(Weight::from_parts(1_681, 0).saturating_mul(n.into()))
+		// Minimum execution time: 9_071_000 picoseconds.
+		Weight::from_parts(12_525_027, 247)
+			// Standard Error: 328
+			.saturating_add(Weight::from_parts(4_427, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
@@ -1571,89 +1671,89 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_530_000 picoseconds.
-		Weight::from_parts(1_642_000, 0)
+		// Minimum execution time: 1_487_000 picoseconds.
+		Weight::from_parts(1_611_000, 0)
 	}
 	fn set_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_851_000 picoseconds.
-		Weight::from_parts(1_999_000, 0)
+		// Minimum execution time: 1_852_000 picoseconds.
+		Weight::from_parts(1_982_000, 0)
 	}
 	fn get_transient_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_429_000 picoseconds.
-		Weight::from_parts(1_527_000, 0)
+		// Minimum execution time: 1_467_000 picoseconds.
+		Weight::from_parts(1_529_000, 0)
 	}
 	fn get_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_689_000 picoseconds.
-		Weight::from_parts(1_772_000, 0)
+		// Minimum execution time: 1_630_000 picoseconds.
+		Weight::from_parts(1_712_000, 0)
 	}
 	fn rollback_transient_storage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_049_000 picoseconds.
-		Weight::from_parts(1_153_000, 0)
+		// Minimum execution time: 1_188_000 picoseconds.
+		Weight::from_parts(1_268_000, 0)
 	}
-	/// The range of component `n` is `[0, 512]`.
-	/// The range of component `o` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
+	/// The range of component `o` is `[0, 448]`.
 	fn seal_set_transient_storage(n: u32, o: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_338_000 picoseconds.
-		Weight::from_parts(2_514_685, 0)
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(299, 0).saturating_mul(n.into()))
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(403, 0).saturating_mul(o.into()))
+		// Minimum execution time: 2_197_000 picoseconds.
+		Weight::from_parts(2_464_654, 0)
+			// Standard Error: 17
+			.saturating_add(Weight::from_parts(296, 0).saturating_mul(n.into()))
+			// Standard Error: 17
+			.saturating_add(Weight::from_parts(342, 0).saturating_mul(o.into()))
 	}
-	/// The range of component `n` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
 	fn seal_clear_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_045_000 picoseconds.
-		Weight::from_parts(2_409_843, 0)
-			// Standard Error: 16
-			.saturating_add(Weight::from_parts(350, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_005_000 picoseconds.
+		Weight::from_parts(2_381_053, 0)
+			// Standard Error: 23
+			.saturating_add(Weight::from_parts(322, 0).saturating_mul(n.into()))
 	}
-	/// The range of component `n` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
 	fn seal_get_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_891_000 picoseconds.
-		Weight::from_parts(2_117_702, 0)
-			// Standard Error: 12
-			.saturating_add(Weight::from_parts(289, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_853_000 picoseconds.
+		Weight::from_parts(2_082_772, 0)
+			// Standard Error: 20
+			.saturating_add(Weight::from_parts(322, 0).saturating_mul(n.into()))
 	}
-	/// The range of component `n` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
 	fn seal_contains_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_786_000 picoseconds.
-		Weight::from_parts(1_949_290, 0)
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(232, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_711_000 picoseconds.
+		Weight::from_parts(1_899_649, 0)
+			// Standard Error: 16
+			.saturating_add(Weight::from_parts(208, 0).saturating_mul(n.into()))
 	}
-	/// The range of component `n` is `[0, 512]`.
+	/// The range of component `n` is `[0, 448]`.
 	fn seal_take_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_465_000 picoseconds.
-		Weight::from_parts(2_712_107, 0)
-			// Standard Error: 14
-			.saturating_add(Weight::from_parts(79, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_460_000 picoseconds.
+		Weight::from_parts(2_684_364, 0)
+			// Standard Error: 22
+			.saturating_add(Weight::from_parts(56, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::AddressSuffix` (r:1 w:0)
 	/// Proof: `Revive::AddressSuffix` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `Measured`)
@@ -1669,18 +1769,18 @@ impl WeightInfo for () {
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_call(t: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1294 + t * (243 ±0)`
-		//  Estimated: `4759 + t * (2501 ±0)`
-		// Minimum execution time: 41_377_000 picoseconds.
-		Weight::from_parts(43_024_676, 4759)
-			// Standard Error: 44_099
-			.saturating_add(Weight::from_parts(1_689_315, 0).saturating_mul(t.into()))
+		//  Measured:  `1292 + t * (203 ±0)`
+		//  Estimated: `4757 + t * (2480 ±0)`
+		// Minimum execution time: 40_031_000 picoseconds.
+		Weight::from_parts(41_527_691, 4757)
+			// Standard Error: 50_351
+			.saturating_add(Weight::from_parts(1_112_950, 0).saturating_mul(t.into()))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(2, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(1, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(t.into())))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
-			.saturating_add(Weight::from_parts(0, 2501).saturating_mul(t.into()))
+			.saturating_add(Weight::from_parts(0, 2480).saturating_mul(t.into()))
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
 	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(1779), added: 4254, mode: `Measured`)
@@ -1692,8 +1792,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1237`
 		//  Estimated: `4702`
-		// Minimum execution time: 36_324_000 picoseconds.
-		Weight::from_parts(37_657_000, 4702)
+		// Minimum execution time: 35_759_000 picoseconds.
+		Weight::from_parts(37_086_000, 4702)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
@@ -1707,12 +1807,12 @@ impl WeightInfo for () {
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_instantiate(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1273`
-		//  Estimated: `4736`
-		// Minimum execution time: 117_657_000 picoseconds.
-		Weight::from_parts(110_177_403, 4736)
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(4_097, 0).saturating_mul(i.into()))
+		//  Measured:  `1271`
+		//  Estimated: `4710`
+		// Minimum execution time: 116_485_000 picoseconds.
+		Weight::from_parts(108_907_717, 4710)
+			// Standard Error: 12
+			.saturating_add(Weight::from_parts(4_125, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1721,64 +1821,64 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 650_000 picoseconds.
-		Weight::from_parts(4_208_007, 0)
+		// Minimum execution time: 651_000 picoseconds.
+		Weight::from_parts(3_867_609, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_396, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_384, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_hash_keccak_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_101_000 picoseconds.
-		Weight::from_parts(4_521_803, 0)
+		// Minimum execution time: 1_090_000 picoseconds.
+		Weight::from_parts(5_338_460, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(3_609, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_601, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_hash_blake2_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 654_000 picoseconds.
-		Weight::from_parts(3_060_461, 0)
+		// Minimum execution time: 717_000 picoseconds.
+		Weight::from_parts(2_629_461, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_531, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_528, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_hash_blake2_128(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 628_000 picoseconds.
-		Weight::from_parts(3_784_567, 0)
+		// Minimum execution time: 660_000 picoseconds.
+		Weight::from_parts(4_807_814, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_526, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_509, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 261889]`.
 	fn seal_sr25519_verify(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 42_892_000 picoseconds.
-		Weight::from_parts(25_002_714, 0)
-			// Standard Error: 12
-			.saturating_add(Weight::from_parts(5_252, 0).saturating_mul(n.into()))
+		// Minimum execution time: 42_829_000 picoseconds.
+		Weight::from_parts(24_650_992, 0)
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(5_212, 0).saturating_mul(n.into()))
 	}
 	fn seal_ecdsa_recover() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 46_990_000 picoseconds.
-		Weight::from_parts(48_960_000, 0)
+		// Minimum execution time: 46_902_000 picoseconds.
+		Weight::from_parts(48_072_000, 0)
 	}
 	fn seal_ecdsa_to_eth_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_870_000 picoseconds.
-		Weight::from_parts(13_062_000, 0)
+		// Minimum execution time: 12_713_000 picoseconds.
+		Weight::from_parts(12_847_000, 0)
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
@@ -1786,8 +1886,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `300`
 		//  Estimated: `3765`
-		// Minimum execution time: 17_810_000 picoseconds.
-		Weight::from_parts(18_667_000, 3765)
+		// Minimum execution time: 17_657_000 picoseconds.
+		Weight::from_parts(18_419_000, 3765)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1797,8 +1897,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `338`
 		//  Estimated: `3803`
-		// Minimum execution time: 13_762_000 picoseconds.
-		Weight::from_parts(14_526_000, 3803)
+		// Minimum execution time: 13_650_000 picoseconds.
+		Weight::from_parts(14_209_000, 3803)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1808,8 +1908,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `338`
 		//  Estimated: `3561`
-		// Minimum execution time: 12_753_000 picoseconds.
-		Weight::from_parts(13_199_000, 3561)
+		// Minimum execution time: 12_341_000 picoseconds.
+		Weight::from_parts(13_011_000, 3561)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1818,9 +1918,9 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_060_000 picoseconds.
-		Weight::from_parts(10_131_024, 0)
-			// Standard Error: 72
-			.saturating_add(Weight::from_parts(71_842, 0).saturating_mul(r.into()))
+		// Minimum execution time: 8_899_000 picoseconds.
+		Weight::from_parts(10_489_171, 0)
+			// Standard Error: 104
+			.saturating_add(Weight::from_parts(73_814, 0).saturating_mul(r.into()))
 	}
 }
diff --git a/substrate/frame/revive/uapi/Cargo.toml b/substrate/frame/revive/uapi/Cargo.toml
index 1af5b327dfc7..7241d667fcdc 100644
--- a/substrate/frame/revive/uapi/Cargo.toml
+++ b/substrate/frame/revive/uapi/Cargo.toml
@@ -12,21 +12,23 @@ description = "Exposes all the host functions that a contract can import."
 workspace = true
 
 [dependencies]
-paste = { workspace = true }
 bitflags = { workspace = true }
-scale-info = { features = ["derive"], optional = true, workspace = true }
 codec = { features = [
 	"derive",
 	"max-encoded-len",
 ], optional = true, workspace = true }
+pallet-revive-proc-macro = { workspace = true }
+paste = { workspace = true }
+scale-info = { features = ["derive"], optional = true, workspace = true }
 
 [target.'cfg(target_arch = "riscv64")'.dependencies]
-polkavm-derive = { version = "0.17.0" }
+polkavm-derive = { version = "0.18.0" }
 
 [package.metadata.docs.rs]
-default-target = ["riscv64imac-unknown-none-elf"]
+features = ["unstable-hostfn"]
+targets = ["riscv64imac-unknown-none-elf"]
 
 [features]
 default = ["scale"]
 scale = ["dep:codec", "scale-info"]
-unstable-api = []
+unstable-hostfn = []
diff --git a/substrate/frame/revive/uapi/src/flags.rs b/substrate/frame/revive/uapi/src/flags.rs
index 763a89d6c030..6a0f47c38c2c 100644
--- a/substrate/frame/revive/uapi/src/flags.rs
+++ b/substrate/frame/revive/uapi/src/flags.rs
@@ -38,7 +38,7 @@ bitflags! {
 		///
 		/// A forwarding call will consume the current contracts input. Any attempt to
 		/// access the input after this call returns will lead to [`Error::InputForwarded`].
-		/// It does not matter if this is due to calling `seal_input` or trying another
+		/// It does not matter if this is due to calling `call_data_copy` or trying another
 		/// forwarding call. Consider using [`Self::CLONE_INPUT`] in order to preserve
 		/// the input.
 		const FORWARD_INPUT = 0b0000_0001;
diff --git a/substrate/frame/revive/uapi/src/host.rs b/substrate/frame/revive/uapi/src/host.rs
index aa3203697898..eced4843b552 100644
--- a/substrate/frame/revive/uapi/src/host.rs
+++ b/substrate/frame/revive/uapi/src/host.rs
@@ -12,27 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 use crate::{CallFlags, Result, ReturnFlags, StorageFlags};
-use paste::paste;
+use pallet_revive_proc_macro::unstable_hostfn;
 
 #[cfg(target_arch = "riscv64")]
 mod riscv64;
 
-macro_rules! hash_fn {
-	( $name:ident, $bytes:literal ) => {
-		paste! {
-			#[doc = "Computes the " $name " " $bytes "-bit hash on the given input buffer."]
-			#[doc = "\n# Notes\n"]
-			#[doc = "- The `input` and `output` buffer may overlap."]
-			#[doc = "- The output buffer is expected to hold at least " $bytes " bits."]
-			#[doc = "- It is the callers responsibility to provide an output buffer that is large enough to hold the expected amount of bytes returned by the hash function."]
-			#[doc = "\n# Parameters\n"]
-			#[doc = "- `input`: The input data buffer."]
-			#[doc = "- `output`: The output buffer to write the hash result to."]
-			fn [<hash_ $name>](input: &[u8], output: &mut [u8; $bytes]);
-		}
-	};
-}
-
 /// Implements [`HostFn`] when compiled on supported architectures (RISC-V).
 pub enum HostFnImpl {}
 
@@ -87,12 +71,16 @@ pub trait HostFn: private::Sealed {
 	/// Returns the [EIP-155](https://eips.ethereum.org/EIPS/eip-155) chain ID.
 	fn chain_id(output: &mut [u8; 32]);
 
-	/// Stores the call data size as little endian U256 value into the supplied buffer.
-	///
-	/// # Parameters
-	///
-	/// - `output`: A reference to the output data buffer to write the call data size.
-	fn call_data_size(output: &mut [u8; 32]);
+	/// Returns the price per ref_time, akin to the EVM
+	/// [GASPRICE](https://www.evm.codes/?fork=cancun#3a) opcode.
+	fn gas_price() -> u64;
+
+	/// Returns the base fee, akin to the EVM
+	/// [BASEFEE](https://www.evm.codes/?fork=cancun#48) opcode.
+	fn base_fee(output: &mut [u8; 32]);
+
+	/// Returns the call data size.
+	fn call_data_size() -> u64;
 
 	/// Call (possibly transferring some amount of funds) into the specified account.
 	///
@@ -170,17 +158,16 @@ pub trait HostFn: private::Sealed {
 	/// otherwise `zero`.
 	fn code_hash(addr: &[u8; 20], output: &mut [u8; 32]);
 
-	/// Retrieve the code size for a specified contract address.
+	/// Returns the code size for a specified contract address.
 	///
 	/// # Parameters
 	///
 	/// - `addr`: The address of the contract.
-	/// - `output`: A reference to the output data buffer to write the code size.
 	///
 	/// # Note
 	///
 	/// If `addr` is not a contract the `output` will be zero.
-	fn code_size(addr: &[u8; 20], output: &mut [u8; 32]);
+	fn code_size(addr: &[u8; 20]) -> u64;
 
 	/// Execute code in the context (storage, caller, value) of the current contract.
 	///
@@ -243,20 +230,41 @@ pub trait HostFn: private::Sealed {
 	/// [KeyNotFound][`crate::ReturnErrorCode::KeyNotFound]
 	fn get_storage(flags: StorageFlags, key: &[u8], output: &mut &mut [u8]) -> Result;
 
-	hash_fn!(keccak_256, 32);
+	/// Computes the keccak_256 32-bit hash on the given input buffer.
+	///
+	/// - The `input` and `output` buffer may overlap.
+	/// - The output buffer is expected to hold at least 32 bits.
+	/// - It is the callers responsibility to provide an output buffer that is large enough to hold
+	///   the expected amount of bytes returned by the hash function.
+	///
+	/// # Parameters
+	///
+	/// - `input`: The input data buffer.
+	/// - `output`: The output buffer to write the hash result to.
+	fn hash_keccak_256(input: &[u8], output: &mut [u8; 32]);
 
-	/// Stores the input passed by the caller into the supplied buffer.
+	/// Stores the input data passed by the caller into the supplied `output` buffer,
+	/// starting from the given input data `offset`.
+	///
+	/// The `output` buffer is guaranteed to always be fully populated:
+	/// - If the call data (starting from the given `offset`) is larger than the `output` buffer,
+	///   only what fits into the `output` buffer is written.
+	/// - If the `output` buffer size exceeds the call data size (starting from `offset`), remaining
+	///   bytes in the `output` buffer are zeroed out.
+	/// - If the provided call data `offset` is out-of-bounds, the whole `output` buffer is zeroed
+	///   out.
 	///
 	/// # Note
 	///
 	/// This function traps if:
-	/// - the input is larger than the available space.
 	/// - the input was previously forwarded by a [`call()`][`Self::call()`].
+	/// - the `output` buffer is located in an PolkaVM invalid memory range.
 	///
 	/// # Parameters
 	///
-	/// - `output`: A reference to the output data buffer to write the input data.
-	fn input(output: &mut &mut [u8]);
+	/// - `output`: A reference to the output data buffer to write the call data.
+	/// - `offset`: The offset index into the call data from where to start copying.
+	fn call_data_copy(output: &mut [u8], offset: u32);
 
 	/// Stores the U256 value at given `offset` from the input passed by the caller
 	/// into the supplied buffer.
@@ -325,6 +333,9 @@ pub trait HostFn: private::Sealed {
 	/// - `output`: A reference to the output data buffer to write the timestamp.
 	fn now(output: &mut [u8; 32]);
 
+	/// Returns the block ref_time limit.
+	fn gas_limit() -> u64;
+
 	/// Cease contract execution and save a data buffer as a result of the execution.
 	///
 	/// This function never returns as it stops execution of the caller.
@@ -374,12 +385,8 @@ pub trait HostFn: private::Sealed {
 	/// - `output`: A reference to the output data buffer to write the price.
 	fn weight_to_fee(ref_time_limit: u64, proof_size_limit: u64, output: &mut [u8; 32]);
 
-	/// Stores the size of the returned data of the last contract call or instantiation.
-	///
-	/// # Parameters
-	///
-	/// - `output`: A reference to the output buffer to write the size.
-	fn return_data_size(output: &mut [u8; 32]);
+	/// Returns the size of the returned data of the last contract call or instantiation.
+	fn return_data_size() -> u64;
 
 	/// Stores the returned data of the last contract call or contract instantiation.
 	///
@@ -388,12 +395,15 @@ pub trait HostFn: private::Sealed {
 	/// - `offset`: Byte offset into the returned data
 	fn return_data_copy(output: &mut &mut [u8], offset: u32);
 
+	/// Returns the amount of ref_time left.
+	fn ref_time_left() -> u64;
+
 	/// Stores the current block number of the current contract into the supplied buffer.
 	///
 	/// # Parameters
 	///
 	/// - `output`: A reference to the output data buffer to write the block number.
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn block_number(output: &mut [u8; 32]);
 
 	/// Stores the block hash of the given block number into the supplied buffer.
@@ -402,7 +412,7 @@ pub trait HostFn: private::Sealed {
 	///
 	/// - `block_number`: A reference to the block number buffer.
 	/// - `output`: A reference to the output data buffer to write the block number.
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn block_hash(block_number: &[u8; 32], output: &mut [u8; 32]);
 
 	/// Call into the chain extension provided by the chain if any.
@@ -427,7 +437,7 @@ pub trait HostFn: private::Sealed {
 	/// # Return
 	///
 	/// The chain extension returned value, if executed successfully.
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn call_chain_extension(func_id: u32, input: &[u8], output: Option<&mut &mut [u8]>) -> u32;
 
 	/// Call some dispatchable of the runtime.
@@ -454,7 +464,7 @@ pub trait HostFn: private::Sealed {
 	/// - Provide functionality **exclusively** to contracts.
 	/// - Provide custom weights.
 	/// - Avoid the need to keep the `Call` data structure stable.
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn call_runtime(call: &[u8]) -> Result;
 
 	/// Checks whether the caller of the current contract is the origin of the whole call stack.
@@ -467,7 +477,7 @@ pub trait HostFn: private::Sealed {
 	///
 	/// A return value of `true` indicates that this contract is being called by a plain account
 	/// and `false` indicates that the caller is another contract.
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn caller_is_origin() -> bool;
 
 	/// Checks whether the caller of the current contract is root.
@@ -477,7 +487,7 @@ pub trait HostFn: private::Sealed {
 	///
 	/// A return value of `true` indicates that this contract is being called by a root origin,
 	/// and `false` indicates that the caller is a signed origin.
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn caller_is_root() -> u32;
 
 	/// Clear the value at the given key in the contract storage.
@@ -489,7 +499,7 @@ pub trait HostFn: private::Sealed {
 	/// # Return
 	///
 	/// Returns the size of the pre-existing value at the specified key if any.
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn clear_storage(flags: StorageFlags, key: &[u8]) -> Option<u32>;
 
 	/// Checks whether there is a value stored under the given key.
@@ -502,7 +512,7 @@ pub trait HostFn: private::Sealed {
 	/// # Return
 	///
 	/// Returns the size of the pre-existing value at the specified key if any.
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn contains_storage(flags: StorageFlags, key: &[u8]) -> Option<u32>;
 
 	/// Emit a custom debug message.
@@ -522,7 +532,7 @@ pub trait HostFn: private::Sealed {
 	/// not being executed as an RPC. For example, they could allow users to disable logging
 	/// through compile time flags (cargo features) for on-chain deployment. Additionally, the
 	/// return value of this function can be cached in order to prevent further calls at runtime.
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn debug_message(str: &[u8]) -> Result;
 
 	/// Recovers the ECDSA public key from the given message hash and signature.
@@ -539,7 +549,7 @@ pub trait HostFn: private::Sealed {
 	/// # Errors
 	///
 	/// - [EcdsaRecoveryFailed][`crate::ReturnErrorCode::EcdsaRecoveryFailed]
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn ecdsa_recover(
 		signature: &[u8; 65],
 		message_hash: &[u8; 32],
@@ -557,15 +567,49 @@ pub trait HostFn: private::Sealed {
 	/// # Errors
 	///
 	/// - [EcdsaRecoveryFailed][`crate::ReturnErrorCode::EcdsaRecoveryFailed]
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn ecdsa_to_eth_address(pubkey: &[u8; 33], output: &mut [u8; 20]) -> Result;
 
-	#[cfg(feature = "unstable-api")]
-	hash_fn!(sha2_256, 32);
-	#[cfg(feature = "unstable-api")]
-	hash_fn!(blake2_256, 32);
-	#[cfg(feature = "unstable-api")]
-	hash_fn!(blake2_128, 16);
+	/// Computes the sha2_256 32-bit hash on the given input buffer.
+	///
+	/// - The `input` and `output` buffer may overlap.
+	/// - The output buffer is expected to hold at least 32 bits.
+	/// - It is the callers responsibility to provide an output buffer that is large enough to hold
+	///   the expected amount of bytes returned by the hash function.
+	///
+	/// # Parameters
+	///
+	/// - `input`: The input data buffer.
+	/// - `output`: The output buffer to write the hash result to.
+	#[unstable_hostfn]
+	fn hash_sha2_256(input: &[u8], output: &mut [u8; 32]);
+
+	/// Computes the blake2_256 32-bit hash on the given input buffer.
+	///
+	/// - The `input` and `output` buffer may overlap.
+	/// - The output buffer is expected to hold at least 32 bits.
+	/// - It is the callers responsibility to provide an output buffer that is large enough to hold
+	///   the expected amount of bytes returned by the hash function.
+	///
+	/// # Parameters
+	///											*/
+	/// - `input`: The input data buffer.
+	/// - `output`: The output buffer to write the hash result to.
+	#[unstable_hostfn]
+	fn hash_blake2_256(input: &[u8], output: &mut [u8; 32]);
+
+	/// Computes the blake2_128 16-bit hash on the given input buffer.
+	///
+	/// - The `input` and `output` buffer may overlap.
+	/// - The output buffer is expected to hold at least 16 bits.
+	/// - It is the callers responsibility to provide an output buffer that is large enough to hold
+	///   the expected amount of bytes returned by the hash function.
+	/// # Parameters
+	///
+	/// - `input`: The input data buffer.
+	/// - `output`: The output buffer to write the hash result to.
+	#[unstable_hostfn]
+	fn hash_blake2_128(input: &[u8], output: &mut [u8; 16]);
 
 	/// Checks whether a specified address belongs to a contract.
 	///
@@ -576,7 +620,7 @@ pub trait HostFn: private::Sealed {
 	/// # Return
 	///
 	/// Returns `true` if the address belongs to a contract.
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn is_contract(address: &[u8; 20]) -> bool;
 
 	/// Lock a new delegate dependency to the contract.
@@ -588,7 +632,7 @@ pub trait HostFn: private::Sealed {
 	///
 	/// - `code_hash`: The code hash of the dependency. Should be decodable as an `T::Hash`. Traps
 	///   otherwise.
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn lock_delegate_dependency(code_hash: &[u8; 32]);
 
 	/// Stores the minimum balance (a.k.a. existential deposit) into the supplied buffer.
@@ -596,7 +640,7 @@ pub trait HostFn: private::Sealed {
 	/// # Parameters
 	///
 	/// - `output`: A reference to the output data buffer to write the minimum balance.
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn minimum_balance(output: &mut [u8; 32]);
 
 	/// Retrieve the code hash of the currently executing contract.
@@ -604,7 +648,7 @@ pub trait HostFn: private::Sealed {
 	/// # Parameters
 	///
 	/// - `output`: A reference to the output data buffer to write the code hash.
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn own_code_hash(output: &mut [u8; 32]);
 
 	/// Replace the contract code at the specified address with new code.
@@ -635,7 +679,7 @@ pub trait HostFn: private::Sealed {
 	/// # Panics
 	///
 	/// Panics if there is no code on-chain with the specified hash.
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn set_code_hash(code_hash: &[u8; 32]);
 
 	/// Verify a sr25519 signature
@@ -648,7 +692,7 @@ pub trait HostFn: private::Sealed {
 	/// # Errors
 	///
 	/// - [Sr25519VerifyFailed][`crate::ReturnErrorCode::Sr25519VerifyFailed]
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn sr25519_verify(signature: &[u8; 64], message: &[u8], pub_key: &[u8; 32]) -> Result;
 
 	/// Retrieve and remove the value under the given key from storage.
@@ -660,7 +704,7 @@ pub trait HostFn: private::Sealed {
 	/// # Errors
 	///
 	/// [KeyNotFound][`crate::ReturnErrorCode::KeyNotFound]
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn take_storage(flags: StorageFlags, key: &[u8], output: &mut &mut [u8]) -> Result;
 
 	/// Remove the calling account and transfer remaining **free** balance.
@@ -678,7 +722,7 @@ pub trait HostFn: private::Sealed {
 	/// - The contract is live i.e is already on the call stack.
 	/// - Failed to send the balance to the beneficiary.
 	/// - The deletion queue is full.
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn terminate(beneficiary: &[u8; 20]) -> !;
 
 	/// Removes the delegate dependency from the contract.
@@ -689,7 +733,7 @@ pub trait HostFn: private::Sealed {
 	///
 	/// - `code_hash`: The code hash of the dependency. Should be decodable as an `T::Hash`. Traps
 	///   otherwise.
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn unlock_delegate_dependency(code_hash: &[u8; 32]);
 
 	/// Stores the amount of weight left into the supplied buffer.
@@ -700,7 +744,7 @@ pub trait HostFn: private::Sealed {
 	/// # Parameters
 	///
 	/// - `output`: A reference to the output data buffer to write the weight left.
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn weight_left(output: &mut &mut [u8]);
 
 	/// Execute an XCM program locally, using the contract's address as the origin.
@@ -717,7 +761,7 @@ pub trait HostFn: private::Sealed {
 	///
 	/// Returns `Error::Success` when the XCM execution attempt is successful. When the XCM
 	/// execution fails, `ReturnCode::XcmExecutionFailed` is returned
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn xcm_execute(msg: &[u8]) -> Result;
 
 	/// Send an XCM program from the contract to the specified destination.
@@ -735,7 +779,7 @@ pub trait HostFn: private::Sealed {
 	///
 	/// Returns `ReturnCode::Success` when the message was successfully sent. When the XCM
 	/// execution fails, `ReturnErrorCode::XcmSendFailed` is returned.
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn xcm_send(dest: &[u8], msg: &[u8], output: &mut [u8; 32]) -> Result;
 }
 
diff --git a/substrate/frame/revive/uapi/src/host/riscv64.rs b/substrate/frame/revive/uapi/src/host/riscv64.rs
index d5a695262a24..6fdda86892d5 100644
--- a/substrate/frame/revive/uapi/src/host/riscv64.rs
+++ b/substrate/frame/revive/uapi/src/host/riscv64.rs
@@ -18,6 +18,7 @@ use crate::{
 	host::{CallFlags, HostFn, HostFnImpl, Result, StorageFlags},
 	ReturnFlags,
 };
+use pallet_revive_proc_macro::unstable_hostfn;
 
 mod sys {
 	use crate::ReturnCode;
@@ -62,20 +63,21 @@ mod sys {
 		pub fn delegate_call(ptr: *const u8) -> ReturnCode;
 		pub fn instantiate(ptr: *const u8) -> ReturnCode;
 		pub fn terminate(beneficiary_ptr: *const u8);
-		pub fn input(out_ptr: *mut u8, out_len_ptr: *mut u32);
+		pub fn call_data_copy(out_ptr: *mut u8, out_len: u32, offset: u32);
 		pub fn call_data_load(out_ptr: *mut u8, offset: u32);
 		pub fn seal_return(flags: u32, data_ptr: *const u8, data_len: u32);
 		pub fn caller(out_ptr: *mut u8);
 		pub fn origin(out_ptr: *mut u8);
 		pub fn is_contract(account_ptr: *const u8) -> ReturnCode;
 		pub fn code_hash(address_ptr: *const u8, out_ptr: *mut u8);
-		pub fn code_size(address_ptr: *const u8, out_ptr: *mut u8);
+		pub fn code_size(address_ptr: *const u8) -> u64;
 		pub fn own_code_hash(out_ptr: *mut u8);
 		pub fn caller_is_origin() -> ReturnCode;
 		pub fn caller_is_root() -> ReturnCode;
 		pub fn address(out_ptr: *mut u8);
 		pub fn weight_to_fee(ref_time: u64, proof_size: u64, out_ptr: *mut u8);
 		pub fn weight_left(out_ptr: *mut u8, out_len_ptr: *mut u32);
+		pub fn ref_time_left() -> u64;
 		pub fn get_immutable_data(out_ptr: *mut u8, out_len_ptr: *mut u32);
 		pub fn set_immutable_data(ptr: *const u8, len: u32);
 		pub fn balance(out_ptr: *mut u8);
@@ -83,6 +85,7 @@ mod sys {
 		pub fn chain_id(out_ptr: *mut u8);
 		pub fn value_transferred(out_ptr: *mut u8);
 		pub fn now(out_ptr: *mut u8);
+		pub fn gas_limit() -> u64;
 		pub fn minimum_balance(out_ptr: *mut u8);
 		pub fn deposit_event(
 			topics_ptr: *const [u8; 32],
@@ -90,7 +93,9 @@ mod sys {
 			data_ptr: *const u8,
 			data_len: u32,
 		);
-		pub fn call_data_size(out_ptr: *mut u8);
+		pub fn gas_price() -> u64;
+		pub fn base_fee(out_ptr: *mut u8);
+		pub fn call_data_size() -> u64;
 		pub fn block_number(out_ptr: *mut u8);
 		pub fn block_hash(block_number_ptr: *const u8, out_ptr: *mut u8);
 		pub fn hash_sha2_256(input_ptr: *const u8, input_len: u32, out_ptr: *mut u8);
@@ -130,43 +135,11 @@ mod sys {
 			msg_len: u32,
 			out_ptr: *mut u8,
 		) -> ReturnCode;
-		pub fn return_data_size(out_ptr: *mut u8);
+		pub fn return_data_size() -> u64;
 		pub fn return_data_copy(out_ptr: *mut u8, out_len_ptr: *mut u32, offset: u32);
 	}
 }
 
-/// A macro to implement all Host functions with a signature of `fn(&mut [u8; n])`.
-macro_rules! impl_wrapper_for {
-	(@impl_fn $name:ident, $n: literal) => {
-		fn $name(output: &mut [u8; $n]) {
-			unsafe { sys::$name(output.as_mut_ptr()) }
-		}
-	};
-
-	() => {};
-
-	([u8; $n: literal] => $($name:ident),*; $($tail:tt)*) => {
-		$(impl_wrapper_for!(@impl_fn $name, $n);)*
-		impl_wrapper_for!($($tail)*);
-	};
-}
-
-macro_rules! impl_hash_fn {
-	( $name:ident, $bytes_result:literal ) => {
-		paste::item! {
-			fn [<hash_ $name>](input: &[u8], output: &mut [u8; $bytes_result]) {
-				unsafe {
-					sys::[<hash_ $name>](
-						input.as_ptr(),
-						input.len() as u32,
-						output.as_mut_ptr(),
-					)
-				}
-			}
-		}
-	};
-}
-
 #[inline(always)]
 fn extract_from_slice(output: &mut &mut [u8], new_len: usize) {
 	debug_assert!(new_len <= output.len());
@@ -381,38 +354,70 @@ impl HostFn for HostFnImpl {
 		ret_code.into()
 	}
 
-	fn input(output: &mut &mut [u8]) {
-		let mut output_len = output.len() as u32;
-		{
-			unsafe { sys::input(output.as_mut_ptr(), &mut output_len) };
-		}
-		extract_from_slice(output, output_len as usize);
-	}
-
 	fn call_data_load(out_ptr: &mut [u8; 32], offset: u32) {
 		unsafe { sys::call_data_load(out_ptr.as_mut_ptr(), offset) };
 	}
 
+	fn gas_limit() -> u64 {
+		unsafe { sys::gas_limit() }
+	}
+
+	fn call_data_size() -> u64 {
+		unsafe { sys::call_data_size() }
+	}
+
 	fn return_value(flags: ReturnFlags, return_value: &[u8]) -> ! {
 		unsafe { sys::seal_return(flags.bits(), return_value.as_ptr(), return_value.len() as u32) }
 		panic!("seal_return does not return");
 	}
 
-	impl_wrapper_for! {
-		[u8; 32] => call_data_size, balance, value_transferred, now, chain_id;
-		[u8; 20] => address, caller, origin;
+	fn gas_price() -> u64 {
+		unsafe { sys::gas_price() }
+	}
+
+	fn base_fee(output: &mut [u8; 32]) {
+		unsafe { sys::base_fee(output.as_mut_ptr()) }
 	}
 
-	#[cfg(feature = "unstable-api")]
-	impl_wrapper_for! {
-		[u8; 32] => block_number, minimum_balance;
+	fn balance(output: &mut [u8; 32]) {
+		unsafe { sys::balance(output.as_mut_ptr()) }
+	}
+
+	fn value_transferred(output: &mut [u8; 32]) {
+		unsafe { sys::value_transferred(output.as_mut_ptr()) }
+	}
+
+	fn now(output: &mut [u8; 32]) {
+		unsafe { sys::now(output.as_mut_ptr()) }
+	}
+
+	fn chain_id(output: &mut [u8; 32]) {
+		unsafe { sys::chain_id(output.as_mut_ptr()) }
+	}
+
+	fn address(output: &mut [u8; 20]) {
+		unsafe { sys::address(output.as_mut_ptr()) }
+	}
+
+	fn caller(output: &mut [u8; 20]) {
+		unsafe { sys::caller(output.as_mut_ptr()) }
+	}
+
+	fn origin(output: &mut [u8; 20]) {
+		unsafe { sys::origin(output.as_mut_ptr()) }
+	}
+
+	fn block_number(output: &mut [u8; 32]) {
+		unsafe { sys::block_number(output.as_mut_ptr()) }
 	}
 
 	fn weight_to_fee(ref_time_limit: u64, proof_size_limit: u64, output: &mut [u8; 32]) {
 		unsafe { sys::weight_to_fee(ref_time_limit, proof_size_limit, output.as_mut_ptr()) };
 	}
 
-	impl_hash_fn!(keccak_256, 32);
+	fn hash_keccak_256(input: &[u8], output: &mut [u8; 32]) {
+		unsafe { sys::hash_keccak_256(input.as_ptr(), input.len() as u32, output.as_mut_ptr()) }
+	}
 
 	fn get_immutable_data(output: &mut &mut [u8]) {
 		let mut output_len = output.len() as u32;
@@ -432,12 +437,12 @@ impl HostFn for HostFnImpl {
 		unsafe { sys::code_hash(address.as_ptr(), output.as_mut_ptr()) }
 	}
 
-	fn code_size(address: &[u8; 20], output: &mut [u8; 32]) {
-		unsafe { sys::code_size(address.as_ptr(), output.as_mut_ptr()) }
+	fn code_size(address: &[u8; 20]) -> u64 {
+		unsafe { sys::code_size(address.as_ptr()) }
 	}
 
-	fn return_data_size(output: &mut [u8; 32]) {
-		unsafe { sys::return_data_size(output.as_mut_ptr()) };
+	fn return_data_size() -> u64 {
+		unsafe { sys::return_data_size() }
 	}
 
 	fn return_data_copy(output: &mut &mut [u8], offset: u32) {
@@ -448,12 +453,16 @@ impl HostFn for HostFnImpl {
 		extract_from_slice(output, output_len as usize);
 	}
 
-	#[cfg(feature = "unstable-api")]
+	fn ref_time_left() -> u64 {
+		unsafe { sys::ref_time_left() }
+	}
+
+	#[unstable_hostfn]
 	fn block_hash(block_number_ptr: &[u8; 32], output: &mut [u8; 32]) {
 		unsafe { sys::block_hash(block_number_ptr.as_ptr(), output.as_mut_ptr()) };
 	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn call_chain_extension(func_id: u32, input: &[u8], mut output: Option<&mut &mut [u8]>) -> u32 {
 		let (output_ptr, mut output_len) = ptr_len_or_sentinel(&mut output);
 		let ret_code = {
@@ -474,43 +483,48 @@ impl HostFn for HostFnImpl {
 		ret_code.into_u32()
 	}
 
-	#[cfg(feature = "unstable-api")]
+	fn call_data_copy(output: &mut [u8], offset: u32) {
+		let len = output.len() as u32;
+		unsafe { sys::call_data_copy(output.as_mut_ptr(), len, offset) };
+	}
+
+	#[unstable_hostfn]
 	fn call_runtime(call: &[u8]) -> Result {
 		let ret_code = unsafe { sys::call_runtime(call.as_ptr(), call.len() as u32) };
 		ret_code.into()
 	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn caller_is_origin() -> bool {
 		let ret_val = unsafe { sys::caller_is_origin() };
 		ret_val.into_bool()
 	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn caller_is_root() -> u32 {
 		unsafe { sys::caller_is_root() }.into_u32()
 	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn clear_storage(flags: StorageFlags, key: &[u8]) -> Option<u32> {
 		let ret_code = unsafe { sys::clear_storage(flags.bits(), key.as_ptr(), key.len() as u32) };
 		ret_code.into()
 	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn contains_storage(flags: StorageFlags, key: &[u8]) -> Option<u32> {
 		let ret_code =
 			unsafe { sys::contains_storage(flags.bits(), key.as_ptr(), key.len() as u32) };
 		ret_code.into()
 	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn debug_message(str: &[u8]) -> Result {
 		let ret_code = unsafe { sys::debug_message(str.as_ptr(), str.len() as u32) };
 		ret_code.into()
 	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn ecdsa_recover(
 		signature: &[u8; 65],
 		message_hash: &[u8; 32],
@@ -522,41 +536,54 @@ impl HostFn for HostFnImpl {
 		ret_code.into()
 	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn ecdsa_to_eth_address(pubkey: &[u8; 33], output: &mut [u8; 20]) -> Result {
 		let ret_code = unsafe { sys::ecdsa_to_eth_address(pubkey.as_ptr(), output.as_mut_ptr()) };
 		ret_code.into()
 	}
 
-	#[cfg(feature = "unstable-api")]
-	impl_hash_fn!(sha2_256, 32);
-	#[cfg(feature = "unstable-api")]
-	impl_hash_fn!(blake2_256, 32);
-	#[cfg(feature = "unstable-api")]
-	impl_hash_fn!(blake2_128, 16);
+	#[unstable_hostfn]
+	fn hash_sha2_256(input: &[u8], output: &mut [u8; 32]) {
+		unsafe { sys::hash_sha2_256(input.as_ptr(), input.len() as u32, output.as_mut_ptr()) }
+	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
+	fn hash_blake2_256(input: &[u8], output: &mut [u8; 32]) {
+		unsafe { sys::hash_blake2_256(input.as_ptr(), input.len() as u32, output.as_mut_ptr()) }
+	}
+
+	#[unstable_hostfn]
+	fn hash_blake2_128(input: &[u8], output: &mut [u8; 16]) {
+		unsafe { sys::hash_blake2_128(input.as_ptr(), input.len() as u32, output.as_mut_ptr()) }
+	}
+
+	#[unstable_hostfn]
 	fn is_contract(address: &[u8; 20]) -> bool {
 		let ret_val = unsafe { sys::is_contract(address.as_ptr()) };
 		ret_val.into_bool()
 	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn lock_delegate_dependency(code_hash: &[u8; 32]) {
 		unsafe { sys::lock_delegate_dependency(code_hash.as_ptr()) }
 	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
+	fn minimum_balance(output: &mut [u8; 32]) {
+		unsafe { sys::minimum_balance(output.as_mut_ptr()) }
+	}
+
+	#[unstable_hostfn]
 	fn own_code_hash(output: &mut [u8; 32]) {
 		unsafe { sys::own_code_hash(output.as_mut_ptr()) }
 	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn set_code_hash(code_hash: &[u8; 32]) {
 		unsafe { sys::set_code_hash(code_hash.as_ptr()) }
 	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn sr25519_verify(signature: &[u8; 64], message: &[u8], pub_key: &[u8; 32]) -> Result {
 		let ret_code = unsafe {
 			sys::sr25519_verify(
@@ -569,7 +596,7 @@ impl HostFn for HostFnImpl {
 		ret_code.into()
 	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn take_storage(flags: StorageFlags, key: &[u8], output: &mut &mut [u8]) -> Result {
 		let mut output_len = output.len() as u32;
 		let ret_code = {
@@ -587,31 +614,31 @@ impl HostFn for HostFnImpl {
 		ret_code.into()
 	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn terminate(beneficiary: &[u8; 20]) -> ! {
 		unsafe { sys::terminate(beneficiary.as_ptr()) }
 		panic!("terminate does not return");
 	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn unlock_delegate_dependency(code_hash: &[u8; 32]) {
 		unsafe { sys::unlock_delegate_dependency(code_hash.as_ptr()) }
 	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn weight_left(output: &mut &mut [u8]) {
 		let mut output_len = output.len() as u32;
 		unsafe { sys::weight_left(output.as_mut_ptr(), &mut output_len) }
 		extract_from_slice(output, output_len as usize)
 	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn xcm_execute(msg: &[u8]) -> Result {
 		let ret_code = unsafe { sys::xcm_execute(msg.as_ptr(), msg.len() as _) };
 		ret_code.into()
 	}
 
-	#[cfg(feature = "unstable-api")]
+	#[unstable_hostfn]
 	fn xcm_send(dest: &[u8], msg: &[u8], output: &mut [u8; 32]) -> Result {
 		let ret_code = unsafe {
 			sys::xcm_send(
diff --git a/substrate/frame/revive/uapi/src/lib.rs b/substrate/frame/revive/uapi/src/lib.rs
index 14a5e3f28889..ef1798b4bf61 100644
--- a/substrate/frame/revive/uapi/src/lib.rs
+++ b/substrate/frame/revive/uapi/src/lib.rs
@@ -17,6 +17,7 @@
 //! Refer to substrate FRAME contract module for more documentation.
 
 #![no_std]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 
 mod flags;
 pub use flags::*;
diff --git a/substrate/frame/root-offences/Cargo.toml b/substrate/frame/root-offences/Cargo.toml
index f80fed11b971..dedde9956b6f 100644
--- a/substrate/frame/root-offences/Cargo.toml
+++ b/substrate/frame/root-offences/Cargo.toml
@@ -29,8 +29,8 @@ sp-staking = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
 pallet-staking-reward-curve = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
 
 sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true }
diff --git a/substrate/frame/root-testing/Cargo.toml b/substrate/frame/root-testing/Cargo.toml
index ee3ce8011009..fd0f4da2e80c 100644
--- a/substrate/frame/root-testing/Cargo.toml
+++ b/substrate/frame/root-testing/Cargo.toml
@@ -17,9 +17,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/safe-mode/Cargo.toml b/substrate/frame/safe-mode/Cargo.toml
index e7f165ae67d8..3f1f6bc1f1d6 100644
--- a/substrate/frame/safe-mode/Cargo.toml
+++ b/substrate/frame/safe-mode/Cargo.toml
@@ -20,20 +20,20 @@ docify = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+pallet-balances = { optional = true, workspace = true }
+pallet-proxy = { optional = true, workspace = true }
+pallet-utility = { optional = true, workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 sp-arithmetic = { workspace = true }
 sp-runtime = { workspace = true }
-pallet-balances = { optional = true, workspace = true }
-pallet-utility = { optional = true, workspace = true }
-pallet-proxy = { optional = true, workspace = true }
 
 [dev-dependencies]
-sp-core = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
+frame-support = { features = ["experimental"], workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
-pallet-utility = { workspace = true, default-features = true }
 pallet-proxy = { workspace = true, default-features = true }
-frame-support = { features = ["experimental"], workspace = true, default-features = true }
+pallet-utility = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/salary/Cargo.toml b/substrate/frame/salary/Cargo.toml
index 9e4cf06288dd..b3ed95bf1de5 100644
--- a/substrate/frame/salary/Cargo.toml
+++ b/substrate/frame/salary/Cargo.toml
@@ -17,16 +17,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+pallet-ranked-collective = { optional = true, workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-pallet-ranked-collective = { optional = true, workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/sassafras/Cargo.toml b/substrate/frame/sassafras/Cargo.toml
index 7eb2bda96ffc..dd091b6f8ed7 100644
--- a/substrate/frame/sassafras/Cargo.toml
+++ b/substrate/frame/sassafras/Cargo.toml
@@ -18,11 +18,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-consensus-sassafras = { features = ["serde"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/scheduler/Cargo.toml b/substrate/frame/scheduler/Cargo.toml
index 1432ada91335..0506470e72c3 100644
--- a/substrate/frame/scheduler/Cargo.toml
+++ b/substrate/frame/scheduler/Cargo.toml
@@ -14,15 +14,15 @@ workspace = true
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
+docify = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-weights = { workspace = true }
-docify = { workspace = true }
 
 [dev-dependencies]
 pallet-preimage = { workspace = true, default-features = true }
diff --git a/substrate/frame/scored-pool/Cargo.toml b/substrate/frame/scored-pool/Cargo.toml
index d945ef42a47b..227868fa2a4f 100644
--- a/substrate/frame/scored-pool/Cargo.toml
+++ b/substrate/frame/scored-pool/Cargo.toml
@@ -17,9 +17,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
diff --git a/substrate/frame/session/Cargo.toml b/substrate/frame/session/Cargo.toml
index b82112681e67..737678bea8a3 100644
--- a/substrate/frame/session/Cargo.toml
+++ b/substrate/frame/session/Cargo.toml
@@ -17,19 +17,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-impl-trait-for-tuples = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive", "serde"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+impl-trait-for-tuples = { workspace = true }
+log = { workspace = true }
 pallet-timestamp = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true }
 sp-core = { features = ["serde"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { features = ["serde"], workspace = true }
 sp-session = { workspace = true }
 sp-staking = { features = ["serde"], workspace = true }
-sp-trie = { optional = true, workspace = true }
 sp-state-machine = { workspace = true }
+sp-trie = { optional = true, workspace = true }
 
 [features]
 default = ["historical", "std"]
diff --git a/substrate/frame/session/benchmarking/Cargo.toml b/substrate/frame/session/benchmarking/Cargo.toml
index 264bc10a33f6..72e4b3deabfd 100644
--- a/substrate/frame/session/benchmarking/Cargo.toml
+++ b/substrate/frame/session/benchmarking/Cargo.toml
@@ -17,22 +17,22 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-rand = { features = ["std_rng"], workspace = true }
 frame-benchmarking = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-session = { workspace = true }
 pallet-staking = { workspace = true }
+rand = { features = ["std_rng"], workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
 
 [dev-dependencies]
 codec = { features = ["derive"], workspace = true, default-features = true }
-scale-info = { workspace = true, default-features = true }
 frame-election-provider-support = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
 pallet-staking-reward-curve = { workspace = true, default-features = true }
 pallet-timestamp = { workspace = true, default-features = true }
+scale-info = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
 
diff --git a/substrate/frame/society/Cargo.toml b/substrate/frame/society/Cargo.toml
index 555dee68ba01..d5860518fdda 100644
--- a/substrate/frame/society/Cargo.toml
+++ b/substrate/frame/society/Cargo.toml
@@ -16,17 +16,17 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+codec = { features = ["derive"], workspace = true }
 log = { workspace = true }
 rand_chacha = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
-codec = { features = ["derive"], workspace = true }
 
-sp-io = { workspace = true }
-sp-arithmetic = { workspace = true }
-sp-runtime = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+sp-arithmetic = { workspace = true }
+sp-io = { workspace = true }
+sp-runtime = { workspace = true }
 
 [dev-dependencies]
 frame-support-test = { workspace = true }
diff --git a/substrate/frame/staking/Cargo.toml b/substrate/frame/staking/Cargo.toml
index a6a0ccd3b0a7..22176b6d720b 100644
--- a/substrate/frame/staking/Cargo.toml
+++ b/substrate/frame/staking/Cargo.toml
@@ -16,40 +16,40 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { features = ["alloc", "derive"], workspace = true }
 codec = { features = [
 	"derive",
 ], workspace = true }
-scale-info = { features = ["derive", "serde"], workspace = true }
-sp-io = { workspace = true }
-sp-runtime = { features = ["serde"], workspace = true }
-sp-staking = { features = ["serde"], workspace = true }
+frame-election-provider-support = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+pallet-authorship = { workspace = true }
 pallet-session = { features = [
 	"historical",
 ], workspace = true }
-pallet-authorship = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true }
+serde = { features = ["alloc", "derive"], workspace = true }
 sp-application-crypto = { features = ["serde"], workspace = true }
-frame-election-provider-support = { workspace = true }
-log = { workspace = true }
+sp-io = { workspace = true }
+sp-runtime = { features = ["serde"], workspace = true }
+sp-staking = { features = ["serde"], workspace = true }
 
 # Optional imports for benchmarking
 frame-benchmarking = { optional = true, workspace = true }
 rand_chacha = { optional = true, workspace = true }
 
 [dev-dependencies]
+frame-benchmarking = { workspace = true, default-features = true }
+frame-election-provider-support = { workspace = true, default-features = true }
+pallet-bags-list = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
+pallet-staking-reward-curve = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
+rand_chacha = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-npos-elections = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
-pallet-staking-reward-curve = { workspace = true, default-features = true }
-pallet-bags-list = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 substrate-test-utils = { workspace = true }
-frame-benchmarking = { workspace = true, default-features = true }
-frame-election-provider-support = { workspace = true, default-features = true }
-rand_chacha = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/state-trie-migration/Cargo.toml b/substrate/frame/state-trie-migration/Cargo.toml
index 8c82bc38da97..1f1f6fc5be3a 100644
--- a/substrate/frame/state-trie-migration/Cargo.toml
+++ b/substrate/frame/state-trie-migration/Cargo.toml
@@ -16,25 +16,25 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { optional = true, workspace = true, default-features = true }
-thousands = { optional = true, workspace = true }
-zstd = { optional = true, workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 remote-externalities = { optional = true, workspace = true, default-features = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 substrate-state-trie-migration-rpc = { optional = true, workspace = true, default-features = true }
+thousands = { optional = true, workspace = true }
+zstd = { optional = true, workspace = true }
 
 [dev-dependencies]
-parking_lot = { workspace = true, default-features = true }
-tokio = { features = ["macros"], workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
+parking_lot = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
+tokio = { features = ["macros"], workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/statement/Cargo.toml b/substrate/frame/statement/Cargo.toml
index e601881cd720..b1449fa24416 100644
--- a/substrate/frame/statement/Cargo.toml
+++ b/substrate/frame/statement/Cargo.toml
@@ -16,15 +16,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-sp-statement-store = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-api = { workspace = true }
-sp-runtime = { workspace = true }
-sp-io = { workspace = true }
 sp-core = { workspace = true }
-log = { workspace = true }
+sp-io = { workspace = true }
+sp-runtime = { workspace = true }
+sp-statement-store = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
diff --git a/substrate/frame/sudo/Cargo.toml b/substrate/frame/sudo/Cargo.toml
index 9b362019b29b..e2096bf0668a 100644
--- a/substrate/frame/sudo/Cargo.toml
+++ b/substrate/frame/sudo/Cargo.toml
@@ -18,9 +18,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
diff --git a/substrate/frame/support/Cargo.toml b/substrate/frame/support/Cargo.toml
index 4348bd275605..1f4fdd5d46cd 100644
--- a/substrate/frame/support/Cargo.toml
+++ b/substrate/frame/support/Cargo.toml
@@ -18,59 +18,59 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 array-bytes = { workspace = true }
 binary-merkle-tree.workspace = true
-serde = { features = ["alloc", "derive"], workspace = true }
+bitflags = { workspace = true }
 codec = { features = [
 	"derive",
 	"max-encoded-len",
 ], workspace = true }
-scale-info = { features = [
-	"derive",
-], workspace = true }
+docify = { workspace = true }
+environmental = { workspace = true }
 frame-metadata = { features = [
 	"current",
 	"unstable",
 ], workspace = true }
+frame-support-procedural = { workspace = true }
+impl-trait-for-tuples = { workspace = true }
+k256 = { features = ["ecdsa"], workspace = true }
+log = { workspace = true }
+macro_magic = { workspace = true }
+paste = { workspace = true, default-features = true }
+scale-info = { features = [
+	"derive",
+], workspace = true }
+serde = { features = ["alloc", "derive"], workspace = true }
+serde_json = { features = ["alloc"], workspace = true }
+smallvec = { workspace = true, default-features = true }
 sp-api = { features = [
 	"frame-metadata",
 ], workspace = true }
-sp-std = { workspace = true }
-sp-io = { workspace = true }
-sp-runtime = { features = ["serde"], workspace = true }
-sp-tracing = { workspace = true }
-sp-core = { workspace = true }
 sp-arithmetic = { workspace = true }
-sp-inherents = { workspace = true }
-sp-staking = { workspace = true }
-sp-weights = { workspace = true }
+sp-core = { workspace = true }
+sp-crypto-hashing-proc-macro = { workspace = true, default-features = true }
 sp-debug-derive = { workspace = true }
+sp-genesis-builder = { workspace = true }
+sp-inherents = { workspace = true }
+sp-io = { workspace = true }
 sp-metadata-ir = { workspace = true }
-sp-trie = { workspace = true }
-tt-call = { workspace = true }
-macro_magic = { workspace = true }
-frame-support-procedural = { workspace = true }
-paste = { workspace = true, default-features = true }
+sp-runtime = { features = ["serde"], workspace = true }
+sp-staking = { workspace = true }
 sp-state-machine = { optional = true, workspace = true }
-bitflags = { workspace = true }
-impl-trait-for-tuples = { workspace = true }
-smallvec = { workspace = true, default-features = true }
-log = { workspace = true }
-sp-crypto-hashing-proc-macro = { workspace = true, default-features = true }
-k256 = { features = ["ecdsa"], workspace = true }
-environmental = { workspace = true }
-sp-genesis-builder = { workspace = true }
-serde_json = { features = ["alloc"], workspace = true }
-docify = { workspace = true }
+sp-std = { workspace = true }
+sp-tracing = { workspace = true }
+sp-trie = { workspace = true }
+sp-weights = { workspace = true }
 static_assertions = { workspace = true, default-features = true }
+tt-call = { workspace = true }
 
 aquamarine = { workspace = true }
 
 [dev-dependencies]
+Inflector = { workspace = true }
 assert_matches = { workspace = true }
-pretty_assertions = { workspace = true }
-sp-timestamp = { workspace = true }
 frame-system = { workspace = true, default-features = true }
+pretty_assertions = { workspace = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
-Inflector = { workspace = true }
+sp-timestamp = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/support/procedural/Cargo.toml b/substrate/frame/support/procedural/Cargo.toml
index 51790062b2c2..624562187617 100644
--- a/substrate/frame/support/procedural/Cargo.toml
+++ b/substrate/frame/support/procedural/Cargo.toml
@@ -18,36 +18,36 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-derive-syn-parse = { workspace = true }
-docify = { workspace = true }
 Inflector = { workspace = true }
 cfg-expr = { workspace = true }
-itertools = { workspace = true }
-proc-macro2 = { workspace = true }
-quote = { workspace = true }
-syn = { features = ["full", "parsing", "visit-mut"], workspace = true }
+derive-syn-parse = { workspace = true }
+docify = { workspace = true }
+expander = { workspace = true }
 frame-support-procedural-tools = { workspace = true, default-features = true }
+itertools = { workspace = true }
 macro_magic = { features = ["proc_support"], workspace = true }
 proc-macro-warning = { workspace = true }
-expander = { workspace = true }
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
 sp-crypto-hashing = { workspace = true }
+syn = { features = ["full", "parsing", "visit-mut"], workspace = true }
 
 [dev-dependencies]
 codec = { features = [
 	"derive",
 	"max-encoded-len",
 ], workspace = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
+pretty_assertions = { workspace = true }
 regex = { workspace = true }
-sp-metadata-ir = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
+sp-metadata-ir = { workspace = true }
 sp-runtime = { features = [
 	"serde",
 ], workspace = true }
-frame-system = { workspace = true }
-frame-support = { workspace = true }
-pretty_assertions = { workspace = true }
 static_assertions = { workspace = true }
 
 [features]
diff --git a/substrate/frame/support/procedural/tools/Cargo.toml b/substrate/frame/support/procedural/tools/Cargo.toml
index e61e17e8ac75..cbb2fde9e816 100644
--- a/substrate/frame/support/procedural/tools/Cargo.toml
+++ b/substrate/frame/support/procedural/tools/Cargo.toml
@@ -15,8 +15,8 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+frame-support-procedural-tools-derive = { workspace = true, default-features = true }
 proc-macro-crate = { workspace = true }
 proc-macro2 = { workspace = true }
 quote = { workspace = true }
 syn = { features = ["extra-traits", "full", "visit"], workspace = true }
-frame-support-procedural-tools-derive = { workspace = true, default-features = true }
diff --git a/substrate/frame/support/test/Cargo.toml b/substrate/frame/support/test/Cargo.toml
index 17ee3130b741..ca122e6bd544 100644
--- a/substrate/frame/support/test/Cargo.toml
+++ b/substrate/frame/support/test/Cargo.toml
@@ -15,26 +15,26 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-static_assertions = { workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true }
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
+frame-benchmarking = { workspace = true }
+frame-executive = { workspace = true }
 frame-metadata = { features = ["current", "unstable"], workspace = true }
+frame-support = { features = ["experimental"], workspace = true }
+frame-system = { workspace = true }
+pretty_assertions = { workspace = true }
+rustversion = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["derive"], workspace = true }
 sp-api = { workspace = true }
 sp-arithmetic = { workspace = true }
+sp-core = { workspace = true }
 sp-io = { workspace = true }
-sp-state-machine = { optional = true, workspace = true, default-features = true }
-frame-support = { features = ["experimental"], workspace = true }
-frame-benchmarking = { workspace = true }
+sp-metadata-ir = { workspace = true }
 sp-runtime = { workspace = true }
-sp-core = { workspace = true }
+sp-state-machine = { optional = true, workspace = true, default-features = true }
 sp-version = { workspace = true }
-sp-metadata-ir = { workspace = true }
+static_assertions = { workspace = true, default-features = true }
 trybuild = { features = ["diff"], workspace = true }
-pretty_assertions = { workspace = true }
-rustversion = { workspace = true }
-frame-system = { workspace = true }
-frame-executive = { workspace = true }
 # The "std" feature for this pallet is never activated on purpose, in order to test construct_runtime error message
 test-pallet = { workspace = true }
 
diff --git a/substrate/frame/support/test/compile_pass/Cargo.toml b/substrate/frame/support/test/compile_pass/Cargo.toml
index 9e0a7ff7c675..988135d64dbf 100644
--- a/substrate/frame/support/test/compile_pass/Cargo.toml
+++ b/substrate/frame/support/test/compile_pass/Cargo.toml
@@ -16,9 +16,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 sp-version = { workspace = true }
diff --git a/substrate/frame/support/test/pallet/Cargo.toml b/substrate/frame/support/test/pallet/Cargo.toml
index f03377dc21eb..dc5558b1d4b8 100644
--- a/substrate/frame/support/test/pallet/Cargo.toml
+++ b/substrate/frame/support/test/pallet/Cargo.toml
@@ -16,10 +16,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
diff --git a/substrate/frame/system/Cargo.toml b/substrate/frame/system/Cargo.toml
index 38349c7edbd9..1340b2c55c53 100644
--- a/substrate/frame/system/Cargo.toml
+++ b/substrate/frame/system/Cargo.toml
@@ -18,17 +18,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 cfg-if = { workspace = true }
 codec = { features = ["derive"], workspace = true }
+docify = { workspace = true }
+frame-support = { workspace = true }
 log = { workspace = true }
 scale-info = { features = ["derive", "serde"], workspace = true }
 serde = { features = ["alloc", "derive"], workspace = true }
-frame-support = { workspace = true }
 sp-core = { features = ["serde"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { features = ["serde"], workspace = true }
 sp-std = { workspace = true }
 sp-version = { features = ["serde"], workspace = true }
 sp-weights = { features = ["serde"], workspace = true }
-docify = { workspace = true }
 
 [dev-dependencies]
 criterion = { workspace = true, default-features = true }
diff --git a/substrate/frame/system/benchmarking/Cargo.toml b/substrate/frame/system/benchmarking/Cargo.toml
index d9b5e7083bd2..e9aac6e519f3 100644
--- a/substrate/frame/system/benchmarking/Cargo.toml
+++ b/substrate/frame/system/benchmarking/Cargo.toml
@@ -17,16 +17,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
-sp-io = { workspace = true, default-features = true }
 sp-externalities = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
 
 [features]
diff --git a/substrate/frame/system/rpc/runtime-api/Cargo.toml b/substrate/frame/system/rpc/runtime-api/Cargo.toml
index 8e968a536756..3fd1985619bd 100644
--- a/substrate/frame/system/rpc/runtime-api/Cargo.toml
+++ b/substrate/frame/system/rpc/runtime-api/Cargo.toml
@@ -17,8 +17,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-sp-api = { workspace = true }
 docify = { workspace = true }
+sp-api = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/timestamp/Cargo.toml b/substrate/frame/timestamp/Cargo.toml
index 0eff0530c7e2..75788aef348a 100644
--- a/substrate/frame/timestamp/Cargo.toml
+++ b/substrate/frame/timestamp/Cargo.toml
@@ -18,11 +18,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-inherents = { workspace = true }
 sp-io = { optional = true, workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/tips/Cargo.toml b/substrate/frame/tips/Cargo.toml
index 7c7a2d6aa909..6b5b89e7a197 100644
--- a/substrate/frame/tips/Cargo.toml
+++ b/substrate/frame/tips/Cargo.toml
@@ -17,13 +17,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-treasury = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/transaction-payment/Cargo.toml b/substrate/frame/transaction-payment/Cargo.toml
index afa03ceb12eb..2639bda18b6c 100644
--- a/substrate/frame/transaction-payment/Cargo.toml
+++ b/substrate/frame/transaction-payment/Cargo.toml
@@ -19,18 +19,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { optional = true, workspace = true, default-features = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
-serde_json = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml b/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml
index 7c98d157f6ff..147859fdb26a 100644
--- a/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml
+++ b/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml
@@ -17,21 +17,21 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 # Substrate dependencies
-sp-runtime = { workspace = true }
+codec = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-asset-conversion = { workspace = true }
 pallet-transaction-payment = { workspace = true }
-codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
+sp-runtime = { workspace = true }
 
 [dev-dependencies]
+pallet-assets = { workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-storage = { workspace = true }
-pallet-assets = { workspace = true, default-features = true }
-pallet-balances = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml b/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml
index 89fe5bfe7a42..2924860c5201 100644
--- a/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml
+++ b/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml
@@ -21,10 +21,10 @@ sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
+frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-transaction-payment = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
 
 # Other dependencies
 codec = { features = ["derive"], workspace = true }
diff --git a/substrate/frame/transaction-storage/Cargo.toml b/substrate/frame/transaction-storage/Cargo.toml
index f5d6bd1c364c..0ca38e9dd60d 100644
--- a/substrate/frame/transaction-storage/Cargo.toml
+++ b/substrate/frame/transaction-storage/Cargo.toml
@@ -18,17 +18,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 array-bytes = { optional = true, workspace = true, default-features = true }
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { optional = true, workspace = true, default-features = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-balances = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, workspace = true, default-features = true }
 sp-inherents = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-transaction-storage-proof = { workspace = true }
-log = { workspace = true }
 
 [dev-dependencies]
 sp-core = { workspace = true }
diff --git a/substrate/frame/treasury/Cargo.toml b/substrate/frame/treasury/Cargo.toml
index 93a3d9bea93d..c6f059f5fa03 100644
--- a/substrate/frame/treasury/Cargo.toml
+++ b/substrate/frame/treasury/Cargo.toml
@@ -21,21 +21,21 @@ codec = { features = [
 	"max-encoded-len",
 ], workspace = true }
 docify = { workspace = true }
-impl-trait-for-tuples = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+impl-trait-for-tuples = { workspace = true }
+log = { workspace = true }
 pallet-balances = { workspace = true }
-sp-runtime = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
 sp-core = { optional = true, workspace = true }
-log = { workspace = true }
+sp-runtime = { workspace = true }
 
 [dev-dependencies]
-sp-io = { workspace = true, default-features = true }
 pallet-utility = { workspace = true, default-features = true }
 sp-core = { workspace = true }
+sp-io = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/tx-pause/Cargo.toml b/substrate/frame/tx-pause/Cargo.toml
index 03c700ec053c..6298645fb2b3 100644
--- a/substrate/frame/tx-pause/Cargo.toml
+++ b/substrate/frame/tx-pause/Cargo.toml
@@ -20,18 +20,18 @@ docify = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-sp-runtime = { workspace = true }
 pallet-balances = { optional = true, workspace = true }
-pallet-utility = { optional = true, workspace = true }
 pallet-proxy = { optional = true, workspace = true }
+pallet-utility = { optional = true, workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+sp-runtime = { workspace = true }
 
 [dev-dependencies]
-sp-core = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
-pallet-utility = { workspace = true, default-features = true }
 pallet-proxy = { workspace = true, default-features = true }
+pallet-utility = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/uniques/Cargo.toml b/substrate/frame/uniques/Cargo.toml
index abd456d97556..135292fb4ecd 100644
--- a/substrate/frame/uniques/Cargo.toml
+++ b/substrate/frame/uniques/Cargo.toml
@@ -17,11 +17,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
diff --git a/substrate/frame/utility/Cargo.toml b/substrate/frame/utility/Cargo.toml
index e2d35fc1699f..c9a4432648ea 100644
--- a/substrate/frame/utility/Cargo.toml
+++ b/substrate/frame/utility/Cargo.toml
@@ -17,18 +17,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
-pallet-root-testing = { workspace = true, default-features = true }
 pallet-collective = { workspace = true, default-features = true }
+pallet-root-testing = { workspace = true, default-features = true }
 pallet-timestamp = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 
diff --git a/substrate/frame/verify-signature/Cargo.toml b/substrate/frame/verify-signature/Cargo.toml
index 3c5fd5e65157..37cc6c0b3065 100644
--- a/substrate/frame/verify-signature/Cargo.toml
+++ b/substrate/frame/verify-signature/Cargo.toml
@@ -17,10 +17,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
@@ -28,8 +28,8 @@ sp-weights = { features = ["serde"], workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
-pallet-root-testing = { workspace = true, default-features = true }
 pallet-collective = { workspace = true, default-features = true }
+pallet-root-testing = { workspace = true, default-features = true }
 pallet-timestamp = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 
diff --git a/substrate/frame/vesting/Cargo.toml b/substrate/frame/vesting/Cargo.toml
index f896c3962eaa..882ce5f81373 100644
--- a/substrate/frame/vesting/Cargo.toml
+++ b/substrate/frame/vesting/Cargo.toml
@@ -19,11 +19,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
diff --git a/substrate/frame/whitelist/Cargo.toml b/substrate/frame/whitelist/Cargo.toml
index a347174ed2eb..68ecc5d0d78e 100644
--- a/substrate/frame/whitelist/Cargo.toml
+++ b/substrate/frame/whitelist/Cargo.toml
@@ -16,10 +16,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-api = { workspace = true }
 sp-runtime = { workspace = true }
 
diff --git a/substrate/primitives/api/Cargo.toml b/substrate/primitives/api/Cargo.toml
index e0a4d06b2d81..7295adbc11ca 100644
--- a/substrate/primitives/api/Cargo.toml
+++ b/substrate/primitives/api/Cargo.toml
@@ -17,22 +17,22 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
+docify = { workspace = true }
+hash-db = { optional = true, workspace = true, default-features = true }
+log = { workspace = true }
+scale-info = { features = [
+	"derive",
+], workspace = true }
 sp-api-proc-macro = { workspace = true }
 sp-core = { workspace = true }
+sp-externalities = { optional = true, workspace = true }
+sp-metadata-ir = { optional = true, workspace = true }
 sp-runtime = { workspace = true }
 sp-runtime-interface = { workspace = true }
-sp-externalities = { optional = true, workspace = true }
-sp-version = { workspace = true }
 sp-state-machine = { optional = true, workspace = true }
 sp-trie = { optional = true, workspace = true }
-hash-db = { optional = true, workspace = true, default-features = true }
+sp-version = { workspace = true }
 thiserror = { optional = true, workspace = true }
-scale-info = { features = [
-	"derive",
-], workspace = true }
-sp-metadata-ir = { optional = true, workspace = true }
-log = { workspace = true }
-docify = { workspace = true }
 
 [dev-dependencies]
 sp-test-primitives = { workspace = true }
diff --git a/substrate/primitives/api/proc-macro/Cargo.toml b/substrate/primitives/api/proc-macro/Cargo.toml
index 191578f432ad..2f414597fb74 100644
--- a/substrate/primitives/api/proc-macro/Cargo.toml
+++ b/substrate/primitives/api/proc-macro/Cargo.toml
@@ -19,13 +19,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-quote = { workspace = true }
-syn = { features = ["extra-traits", "fold", "full", "visit", "visit-mut"], workspace = true }
-proc-macro2 = { workspace = true }
+Inflector = { workspace = true }
 blake2 = { workspace = true }
-proc-macro-crate = { workspace = true }
 expander = { workspace = true }
-Inflector = { workspace = true }
+proc-macro-crate = { workspace = true }
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
+syn = { features = ["extra-traits", "fold", "full", "visit", "visit-mut"], workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
diff --git a/substrate/primitives/api/test/Cargo.toml b/substrate/primitives/api/test/Cargo.toml
index 27f6dafa24bf..9b02cf125eae 100644
--- a/substrate/primitives/api/test/Cargo.toml
+++ b/substrate/primitives/api/test/Cargo.toml
@@ -15,19 +15,19 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+codec = { workspace = true, default-features = true }
+rustversion = { workspace = true }
+sc-block-builder = { workspace = true, default-features = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-api = { workspace = true, default-features = true }
-substrate-test-runtime-client = { workspace = true }
-sp-version = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-metadata-ir = { workspace = true, default-features = true }
-sc-block-builder = { workspace = true, default-features = true }
-codec = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
+sp-version = { workspace = true, default-features = true }
+substrate-test-runtime-client = { workspace = true }
 trybuild = { workspace = true }
-rustversion = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 
 [dev-dependencies]
 criterion = { workspace = true, default-features = true }
diff --git a/substrate/primitives/application-crypto/Cargo.toml b/substrate/primitives/application-crypto/Cargo.toml
index 1161d43ded5a..9589cce042f5 100644
--- a/substrate/primitives/application-crypto/Cargo.toml
+++ b/substrate/primitives/application-crypto/Cargo.toml
@@ -18,10 +18,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-sp-core = { workspace = true }
 codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { optional = true, features = ["alloc", "derive"], workspace = true }
+sp-core = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
diff --git a/substrate/primitives/arithmetic/Cargo.toml b/substrate/primitives/arithmetic/Cargo.toml
index 485656bf30bb..77b82fbe6468 100644
--- a/substrate/primitives/arithmetic/Cargo.toml
+++ b/substrate/primitives/arithmetic/Cargo.toml
@@ -21,18 +21,18 @@ codec = { features = [
 	"derive",
 	"max-encoded-len",
 ], workspace = true }
+docify = { workspace = true }
 integer-sqrt = { workspace = true }
 num-traits = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { features = ["alloc", "derive"], optional = true, workspace = true }
 static_assertions = { workspace = true, default-features = true }
-docify = { workspace = true }
 
 [dev-dependencies]
 criterion = { workspace = true, default-features = true }
 primitive-types = { workspace = true, default-features = true }
-sp-crypto-hashing = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
+sp-crypto-hashing = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/blockchain/Cargo.toml b/substrate/primitives/blockchain/Cargo.toml
index 93158274d98f..aed09a684bda 100644
--- a/substrate/primitives/blockchain/Cargo.toml
+++ b/substrate/primitives/blockchain/Cargo.toml
@@ -21,11 +21,11 @@ codec = { features = ["derive"], workspace = true }
 futures = { workspace = true }
 parking_lot = { workspace = true, default-features = true }
 schnellru = { workspace = true }
-thiserror = { workspace = true }
 sp-api = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-database = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 tracing = { workspace = true, default-features = true }
diff --git a/substrate/primitives/consensus/beefy/Cargo.toml b/substrate/primitives/consensus/beefy/Cargo.toml
index 13d80683c853..572e46d8de8d 100644
--- a/substrate/primitives/consensus/beefy/Cargo.toml
+++ b/substrate/primitives/consensus/beefy/Cargo.toml
@@ -23,9 +23,9 @@ sp-application-crypto = { workspace = true }
 sp-core = { workspace = true }
 sp-crypto-hashing = { workspace = true }
 sp-io = { workspace = true }
+sp-keystore = { workspace = true }
 sp-mmr-primitives = { workspace = true }
 sp-runtime = { workspace = true }
-sp-keystore = { workspace = true }
 sp-weights = { workspace = true }
 strum = { features = ["derive"], workspace = true }
 
diff --git a/substrate/primitives/consensus/common/Cargo.toml b/substrate/primitives/consensus/common/Cargo.toml
index 764ef1d97346..3a6ffd031ec5 100644
--- a/substrate/primitives/consensus/common/Cargo.toml
+++ b/substrate/primitives/consensus/common/Cargo.toml
@@ -20,11 +20,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 async-trait = { workspace = true }
 futures = { features = ["thread-pool"], workspace = true }
 log = { workspace = true, default-features = true }
-thiserror = { workspace = true }
 sp-core = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 futures = { workspace = true }
diff --git a/substrate/primitives/core/Cargo.toml b/substrate/primitives/core/Cargo.toml
index f6bc17bccaca..0ea885abd22d 100644
--- a/substrate/primitives/core/Cargo.toml
+++ b/substrate/primitives/core/Cargo.toml
@@ -16,47 +16,47 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { features = ["derive", "max-encoded-len"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-log = { workspace = true }
-serde = { optional = true, features = ["alloc", "derive"], workspace = true }
 bounded-collections = { workspace = true }
-primitive-types = { features = ["codec", "scale-info"], workspace = true }
-impl-serde = { optional = true, workspace = true }
+bs58 = { optional = true, workspace = true }
+codec = { features = ["derive", "max-encoded-len"], workspace = true }
 hash-db = { workspace = true }
 hash256-std-hasher = { workspace = true }
-bs58 = { optional = true, workspace = true }
+impl-serde = { optional = true, workspace = true }
+log = { workspace = true }
+primitive-types = { features = ["codec", "scale-info"], workspace = true }
 rand = { features = [
 	"small_rng",
 ], optional = true, workspace = true, default-features = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, features = ["alloc", "derive"], workspace = true }
 substrate-bip39 = { workspace = true }
 # personal fork here as workaround for: https://github.com/rust-bitcoin/rust-bip39/pull/64
 bip39 = { package = "parity-bip39", version = "2.0.1", default-features = false, features = [
 	"alloc",
 ] }
-zeroize = { workspace = true }
-secrecy = { features = ["alloc"], workspace = true }
+bitflags = { workspace = true }
+dyn-clonable = { optional = true, workspace = true }
+futures = { optional = true, workspace = true }
+itertools = { optional = true, workspace = true }
 parking_lot = { optional = true, workspace = true, default-features = true }
-ss58-registry = { workspace = true }
-sp-std = { workspace = true }
+paste = { workspace = true, default-features = true }
+secrecy = { features = ["alloc"], workspace = true }
 sp-debug-derive = { workspace = true }
-sp-storage = { workspace = true }
 sp-externalities = { optional = true, workspace = true }
-futures = { optional = true, workspace = true }
-dyn-clonable = { optional = true, workspace = true }
+sp-std = { workspace = true }
+sp-storage = { workspace = true }
+ss58-registry = { workspace = true }
 thiserror = { optional = true, workspace = true }
 tracing = { optional = true, workspace = true, default-features = true }
-bitflags = { workspace = true }
-paste = { workspace = true, default-features = true }
-itertools = { optional = true, workspace = true }
+zeroize = { workspace = true }
 
 # full crypto
 array-bytes = { workspace = true, default-features = true }
-ed25519-zebra = { workspace = true }
 blake2 = { optional = true, workspace = true }
+ed25519-zebra = { workspace = true }
 libsecp256k1 = { features = ["static-context"], workspace = true }
-schnorrkel = { features = ["preaudit_deprecated"], workspace = true }
 merlin = { workspace = true }
+schnorrkel = { features = ["preaudit_deprecated"], workspace = true }
 sp-crypto-hashing = { workspace = true }
 sp-runtime-interface = { workspace = true }
 # k256 crate, better portability, intended to be used in substrate-runtimes (no-std)
@@ -76,8 +76,8 @@ bandersnatch_vrfs = { git = "https://github.com/w3f/ring-vrf", rev = "0fef826",
 
 [dev-dependencies]
 criterion = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
 regex = { workspace = true }
+serde_json = { workspace = true, default-features = true }
 
 [[bench]]
 name = "bench"
diff --git a/substrate/primitives/crypto/ec-utils/Cargo.toml b/substrate/primitives/crypto/ec-utils/Cargo.toml
index 29e30133ebea..1e5964f85575 100644
--- a/substrate/primitives/crypto/ec-utils/Cargo.toml
+++ b/substrate/primitives/crypto/ec-utils/Cargo.toml
@@ -15,17 +15,17 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-ark-ec = { optional = true, workspace = true }
-ark-bls12-377-ext = { optional = true, workspace = true }
 ark-bls12-377 = { features = ["curve"], optional = true, workspace = true }
-ark-bls12-381-ext = { optional = true, workspace = true }
+ark-bls12-377-ext = { optional = true, workspace = true }
 ark-bls12-381 = { features = ["curve"], optional = true, workspace = true }
-ark-bw6-761-ext = { optional = true, workspace = true }
+ark-bls12-381-ext = { optional = true, workspace = true }
 ark-bw6-761 = { optional = true, workspace = true }
-ark-ed-on-bls12-381-bandersnatch-ext = { optional = true, workspace = true }
-ark-ed-on-bls12-381-bandersnatch = { optional = true, workspace = true }
-ark-ed-on-bls12-377-ext = { optional = true, workspace = true }
+ark-bw6-761-ext = { optional = true, workspace = true }
+ark-ec = { optional = true, workspace = true }
 ark-ed-on-bls12-377 = { optional = true, workspace = true }
+ark-ed-on-bls12-377-ext = { optional = true, workspace = true }
+ark-ed-on-bls12-381-bandersnatch = { optional = true, workspace = true }
+ark-ed-on-bls12-381-bandersnatch-ext = { optional = true, workspace = true }
 ark-scale = { features = ["hazmat"], optional = true, workspace = true }
 sp-runtime-interface = { optional = true, workspace = true }
 
diff --git a/substrate/primitives/crypto/hashing/proc-macro/Cargo.toml b/substrate/primitives/crypto/hashing/proc-macro/Cargo.toml
index 6f974a3e2c8a..e09661d41c11 100644
--- a/substrate/primitives/crypto/hashing/proc-macro/Cargo.toml
+++ b/substrate/primitives/crypto/hashing/proc-macro/Cargo.toml
@@ -20,5 +20,5 @@ proc-macro = true
 
 [dependencies]
 quote = { workspace = true }
-syn = { features = ["full", "parsing"], workspace = true }
 sp-crypto-hashing = { workspace = true }
+syn = { features = ["full", "parsing"], workspace = true }
diff --git a/substrate/primitives/debug-derive/Cargo.toml b/substrate/primitives/debug-derive/Cargo.toml
index 4979b89155ab..a26cbbf62ada 100644
--- a/substrate/primitives/debug-derive/Cargo.toml
+++ b/substrate/primitives/debug-derive/Cargo.toml
@@ -19,9 +19,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
+proc-macro2 = { workspace = true }
 quote = { workspace = true }
 syn = { workspace = true }
-proc-macro2 = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/genesis-builder/Cargo.toml b/substrate/primitives/genesis-builder/Cargo.toml
index 285b214907ad..f1fa60d023be 100644
--- a/substrate/primitives/genesis-builder/Cargo.toml
+++ b/substrate/primitives/genesis-builder/Cargo.toml
@@ -19,9 +19,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = ["bytes"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
+serde_json = { features = ["alloc", "arbitrary_precision"], workspace = true }
 sp-api = { workspace = true }
 sp-runtime = { workspace = true }
-serde_json = { features = ["alloc", "arbitrary_precision"], workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/inherents/Cargo.toml b/substrate/primitives/inherents/Cargo.toml
index 271308c9cbf1..19966919047f 100644
--- a/substrate/primitives/inherents/Cargo.toml
+++ b/substrate/primitives/inherents/Cargo.toml
@@ -19,10 +19,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 async-trait = { optional = true, workspace = true }
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 impl-trait-for-tuples = { workspace = true }
-thiserror = { optional = true, workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { optional = true, workspace = true }
+thiserror = { optional = true, workspace = true }
 
 [dev-dependencies]
 futures = { workspace = true }
diff --git a/substrate/primitives/io/Cargo.toml b/substrate/primitives/io/Cargo.toml
index 97940759a987..b0c99002910b 100644
--- a/substrate/primitives/io/Cargo.toml
+++ b/substrate/primitives/io/Cargo.toml
@@ -22,20 +22,20 @@ bytes = { workspace = true }
 codec = { features = [
 	"bytes",
 ], workspace = true }
-sp-core = { workspace = true }
-sp-crypto-hashing = { workspace = true }
-sp-keystore = { optional = true, workspace = true }
 libsecp256k1 = { optional = true, workspace = true, default-features = true }
-sp-state-machine = { optional = true, workspace = true }
-sp-runtime-interface = { workspace = true }
-sp-trie = { optional = true, workspace = true }
-sp-externalities = { workspace = true }
-sp-tracing = { workspace = true }
 log = { optional = true, workspace = true, default-features = true }
 secp256k1 = { features = [
 	"global-context",
 	"recovery",
 ], optional = true, workspace = true, default-features = true }
+sp-core = { workspace = true }
+sp-crypto-hashing = { workspace = true }
+sp-externalities = { workspace = true }
+sp-keystore = { optional = true, workspace = true }
+sp-runtime-interface = { workspace = true }
+sp-state-machine = { optional = true, workspace = true }
+sp-tracing = { workspace = true }
+sp-trie = { optional = true, workspace = true }
 tracing = { workspace = true }
 tracing-core = { workspace = true }
 
diff --git a/substrate/primitives/keyring/Cargo.toml b/substrate/primitives/keyring/Cargo.toml
index 27f7304a9358..9ffcf50c7b45 100644
--- a/substrate/primitives/keyring/Cargo.toml
+++ b/substrate/primitives/keyring/Cargo.toml
@@ -17,9 +17,9 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-strum = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
+strum = { features = ["derive"], workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/merkle-mountain-range/Cargo.toml b/substrate/primitives/merkle-mountain-range/Cargo.toml
index 6f944a3f6a8d..5f861ca7acf1 100644
--- a/substrate/primitives/merkle-mountain-range/Cargo.toml
+++ b/substrate/primitives/merkle-mountain-range/Cargo.toml
@@ -16,9 +16,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 log = { workspace = true }
 mmr-lib = { package = "polkadot-ckb-merkle-mountain-range", version = "0.7.0", default-features = false }
+scale-info = { features = ["derive"], workspace = true }
 serde = { features = ["alloc", "derive"], optional = true, workspace = true }
 sp-api = { workspace = true }
 sp-core = { workspace = true }
diff --git a/substrate/primitives/runtime-interface/Cargo.toml b/substrate/primitives/runtime-interface/Cargo.toml
index ee44d90fa959..2d82838ca0b3 100644
--- a/substrate/primitives/runtime-interface/Cargo.toml
+++ b/substrate/primitives/runtime-interface/Cargo.toml
@@ -18,26 +18,26 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 bytes = { workspace = true }
-sp-wasm-interface = { workspace = true }
-sp-std = { workspace = true }
-sp-tracing = { workspace = true }
-sp-runtime-interface-proc-macro = { workspace = true, default-features = true }
-sp-externalities = { workspace = true }
 codec = { features = ["bytes"], workspace = true }
-static_assertions = { workspace = true, default-features = true }
+impl-trait-for-tuples = { workspace = true }
 primitive-types = { workspace = true }
+sp-externalities = { workspace = true }
+sp-runtime-interface-proc-macro = { workspace = true, default-features = true }
+sp-std = { workspace = true }
 sp-storage = { workspace = true }
-impl-trait-for-tuples = { workspace = true }
+sp-tracing = { workspace = true }
+sp-wasm-interface = { workspace = true }
+static_assertions = { workspace = true, default-features = true }
 
 [target.'cfg(all(any(target_arch = "riscv32", target_arch = "riscv64"), substrate_runtime))'.dependencies]
 polkavm-derive = { workspace = true }
 
 [dev-dependencies]
-sp-runtime-interface-test-wasm = { workspace = true }
-sp-state-machine = { workspace = true, default-features = true }
+rustversion = { workspace = true }
 sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-rustversion = { workspace = true }
+sp-runtime-interface-test-wasm = { workspace = true }
+sp-state-machine = { workspace = true, default-features = true }
 trybuild = { workspace = true }
 
 [features]
diff --git a/substrate/primitives/runtime-interface/proc-macro/Cargo.toml b/substrate/primitives/runtime-interface/proc-macro/Cargo.toml
index 3fd5f073f025..2112d5bc0693 100644
--- a/substrate/primitives/runtime-interface/proc-macro/Cargo.toml
+++ b/substrate/primitives/runtime-interface/proc-macro/Cargo.toml
@@ -20,8 +20,8 @@ proc-macro = true
 
 [dependencies]
 Inflector = { workspace = true }
+expander = { workspace = true }
 proc-macro-crate = { workspace = true }
 proc-macro2 = { workspace = true }
 quote = { workspace = true }
-expander = { workspace = true }
 syn = { features = ["extra-traits", "fold", "full", "visit"], workspace = true }
diff --git a/substrate/primitives/runtime-interface/test/Cargo.toml b/substrate/primitives/runtime-interface/test/Cargo.toml
index 29ef0f6b4892..ebcf4222bda3 100644
--- a/substrate/primitives/runtime-interface/test/Cargo.toml
+++ b/substrate/primitives/runtime-interface/test/Cargo.toml
@@ -15,8 +15,6 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-tracing = { workspace = true, default-features = true }
-tracing-core = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
 sc-executor-common = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
@@ -25,3 +23,5 @@ sp-runtime-interface = { workspace = true, default-features = true }
 sp-runtime-interface-test-wasm = { workspace = true }
 sp-runtime-interface-test-wasm-deprecated = { workspace = true }
 sp-state-machine = { workspace = true, default-features = true }
+tracing = { workspace = true, default-features = true }
+tracing-core = { workspace = true, default-features = true }
diff --git a/substrate/primitives/runtime/Cargo.toml b/substrate/primitives/runtime/Cargo.toml
index 8a812c3a5772..89c221d574fc 100644
--- a/substrate/primitives/runtime/Cargo.toml
+++ b/substrate/primitives/runtime/Cargo.toml
@@ -17,7 +17,9 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+binary-merkle-tree = { workspace = true }
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
+docify = { workspace = true }
 either = { workspace = true }
 hash256-std-hasher = { workspace = true }
 impl-trait-for-tuples = { workspace = true }
@@ -34,9 +36,7 @@ sp-io = { workspace = true }
 sp-std = { workspace = true }
 sp-trie = { workspace = true }
 sp-weights = { workspace = true }
-docify = { workspace = true }
 tracing = { workspace = true, features = ["log"], default-features = false }
-binary-merkle-tree = { workspace = true }
 
 simple-mermaid = { version = "0.1.1", optional = true }
 tuplex = { version = "0.1.2", default-features = false }
@@ -44,11 +44,11 @@ tuplex = { version = "0.1.2", default-features = false }
 [dev-dependencies]
 rand = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
-zstd = { workspace = true }
 sp-api = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
+zstd = { workspace = true }
 
 [features]
 runtime-benchmarks = []
diff --git a/substrate/primitives/session/Cargo.toml b/substrate/primitives/session/Cargo.toml
index 6abf83505530..72be81c1222e 100644
--- a/substrate/primitives/session/Cargo.toml
+++ b/substrate/primitives/session/Cargo.toml
@@ -20,9 +20,9 @@ codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 sp-api = { workspace = true }
 sp-core = { workspace = true }
+sp-keystore = { optional = true, workspace = true }
 sp-runtime = { optional = true, workspace = true }
 sp-staking = { workspace = true }
-sp-keystore = { optional = true, workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/staking/Cargo.toml b/substrate/primitives/staking/Cargo.toml
index 35e7e4f60413..42694cdbb674 100644
--- a/substrate/primitives/staking/Cargo.toml
+++ b/substrate/primitives/staking/Cargo.toml
@@ -16,10 +16,10 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { features = ["alloc", "derive"], optional = true, workspace = true }
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 impl-trait-for-tuples = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["alloc", "derive"], optional = true, workspace = true }
 
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/primitives/state-machine/Cargo.toml b/substrate/primitives/state-machine/Cargo.toml
index e1c67feb7ac5..5bc06b8cb509 100644
--- a/substrate/primitives/state-machine/Cargo.toml
+++ b/substrate/primitives/state-machine/Cargo.toml
@@ -17,28 +17,28 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+arbitrary = { features = ["derive"], optional = true, workspace = true }
 codec = { workspace = true }
 hash-db = { workspace = true }
 log = { workspace = true }
 parking_lot = { optional = true, workspace = true, default-features = true }
 rand = { optional = true, workspace = true, default-features = true }
 smallvec = { workspace = true, default-features = true }
-thiserror = { optional = true, workspace = true }
-tracing = { optional = true, workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-externalities = { workspace = true }
 sp-panic-handler = { optional = true, workspace = true, default-features = true }
 sp-trie = { workspace = true }
+thiserror = { optional = true, workspace = true }
+tracing = { optional = true, workspace = true, default-features = true }
 trie-db = { workspace = true }
-arbitrary = { features = ["derive"], optional = true, workspace = true }
 
 [dev-dependencies]
+arbitrary = { features = ["derive"], workspace = true }
 array-bytes = { workspace = true, default-features = true }
+assert_matches = { workspace = true }
 pretty_assertions = { workspace = true }
 rand = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-assert_matches = { workspace = true }
-arbitrary = { features = ["derive"], workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/state-machine/fuzz/Cargo.toml b/substrate/primitives/state-machine/fuzz/Cargo.toml
index 416c00c34fda..16bf5b92025f 100644
--- a/substrate/primitives/state-machine/fuzz/Cargo.toml
+++ b/substrate/primitives/state-machine/fuzz/Cargo.toml
@@ -13,8 +13,8 @@ libfuzzer-sys = "0.4"
 sp-runtime = { path = "../../runtime" }
 
 [dependencies.sp-state-machine]
-path = ".."
 features = ["fuzzing"]
+path = ".."
 
 # Prevent this from interfering with workspaces
 [workspace]
diff --git a/substrate/primitives/statement-store/Cargo.toml b/substrate/primitives/statement-store/Cargo.toml
index aac676caedc9..df66cfcfc2e6 100644
--- a/substrate/primitives/statement-store/Cargo.toml
+++ b/substrate/primitives/statement-store/Cargo.toml
@@ -18,23 +18,23 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
+sp-api = { workspace = true }
+sp-application-crypto = { workspace = true }
 sp-core = { workspace = true }
 sp-crypto-hashing = { workspace = true }
+sp-externalities = { workspace = true }
 sp-runtime = { workspace = true }
-sp-api = { workspace = true }
-sp-application-crypto = { workspace = true }
 sp-runtime-interface = { workspace = true }
-sp-externalities = { workspace = true }
 thiserror = { optional = true, workspace = true }
 
 # ECIES dependencies
-ed25519-dalek = { optional = true, workspace = true, default-features = true }
-x25519-dalek = { optional = true, features = ["static_secrets"], workspace = true }
-curve25519-dalek = { optional = true, workspace = true }
 aes-gcm = { optional = true, workspace = true }
+curve25519-dalek = { optional = true, workspace = true }
+ed25519-dalek = { optional = true, workspace = true, default-features = true }
 hkdf = { optional = true, workspace = true }
-sha2 = { optional = true, workspace = true, default-features = true }
 rand = { features = ["small_rng"], optional = true, workspace = true, default-features = true }
+sha2 = { optional = true, workspace = true, default-features = true }
+x25519-dalek = { optional = true, features = ["static_secrets"], workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/timestamp/Cargo.toml b/substrate/primitives/timestamp/Cargo.toml
index 0fcd5be98e6f..619f1eaa142b 100644
--- a/substrate/primitives/timestamp/Cargo.toml
+++ b/substrate/primitives/timestamp/Cargo.toml
@@ -18,9 +18,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 async-trait = { optional = true, workspace = true }
 codec = { features = ["derive"], workspace = true }
-thiserror = { optional = true, workspace = true }
 sp-inherents = { workspace = true }
 sp-runtime = { workspace = true }
+thiserror = { optional = true, workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/trie/Cargo.toml b/substrate/primitives/trie/Cargo.toml
index 7f27bb097290..65a9727ed2ae 100644
--- a/substrate/primitives/trie/Cargo.toml
+++ b/substrate/primitives/trie/Cargo.toml
@@ -29,20 +29,20 @@ nohash-hasher = { optional = true, workspace = true }
 parking_lot = { optional = true, workspace = true, default-features = true }
 rand = { optional = true, workspace = true, default-features = true }
 scale-info = { features = ["derive"], workspace = true }
+schnellru = { optional = true, workspace = true }
+sp-core = { workspace = true }
+sp-externalities = { workspace = true }
 thiserror = { optional = true, workspace = true }
 tracing = { optional = true, workspace = true, default-features = true }
 trie-db = { workspace = true }
 trie-root = { workspace = true }
-sp-core = { workspace = true }
-sp-externalities = { workspace = true }
-schnellru = { optional = true, workspace = true }
 
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
 criterion = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 trie-bench = { workspace = true }
 trie-standardmap = { workspace = true }
-sp-runtime = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/version/Cargo.toml b/substrate/primitives/version/Cargo.toml
index 0424304989b7..7fa983d02823 100644
--- a/substrate/primitives/version/Cargo.toml
+++ b/substrate/primitives/version/Cargo.toml
@@ -22,11 +22,11 @@ impl-serde = { optional = true, workspace = true }
 parity-wasm = { optional = true, workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { features = ["alloc", "derive"], optional = true, workspace = true }
-thiserror = { optional = true, workspace = true }
 sp-crypto-hashing-proc-macro = { workspace = true, default-features = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 sp-version-proc-macro = { workspace = true }
+thiserror = { optional = true, workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/wasm-interface/Cargo.toml b/substrate/primitives/wasm-interface/Cargo.toml
index 9d0310fd22e8..9f8eea5102d6 100644
--- a/substrate/primitives/wasm-interface/Cargo.toml
+++ b/substrate/primitives/wasm-interface/Cargo.toml
@@ -17,11 +17,11 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+anyhow = { optional = true, workspace = true }
 codec = { features = ["derive"], workspace = true }
 impl-trait-for-tuples = { workspace = true }
 log = { optional = true, workspace = true, default-features = true }
 wasmtime = { optional = true, workspace = true }
-anyhow = { optional = true, workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/weights/Cargo.toml b/substrate/primitives/weights/Cargo.toml
index c4e1897dbb8e..9cd0d9ac2e20 100644
--- a/substrate/primitives/weights/Cargo.toml
+++ b/substrate/primitives/weights/Cargo.toml
@@ -19,11 +19,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 bounded-collections = { workspace = true }
 codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
+schemars = { optional = true, workspace = true }
 serde = { optional = true, features = ["alloc", "derive"], workspace = true }
 smallvec = { workspace = true, default-features = true }
 sp-arithmetic = { workspace = true }
 sp-debug-derive = { workspace = true }
-schemars = { optional = true, workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/scripts/ci/node-template-release/Cargo.toml b/substrate/scripts/ci/node-template-release/Cargo.toml
index d335dbcf3971..5b90044d44dd 100644
--- a/substrate/scripts/ci/node-template-release/Cargo.toml
+++ b/substrate/scripts/ci/node-template-release/Cargo.toml
@@ -18,7 +18,7 @@ clap = { features = ["derive"], workspace = true }
 flate2 = { workspace = true }
 fs_extra = { workspace = true }
 glob = { workspace = true }
+itertools = { workspace = true }
 tar = { workspace = true }
 tempfile = { workspace = true }
 toml_edit = { workspace = true }
-itertools = { workspace = true }
diff --git a/substrate/test-utils/Cargo.toml b/substrate/test-utils/Cargo.toml
index 4f7a70906859..87c9cb731e3a 100644
--- a/substrate/test-utils/Cargo.toml
+++ b/substrate/test-utils/Cargo.toml
@@ -20,5 +20,5 @@ futures = { workspace = true }
 tokio = { features = ["macros", "time"], workspace = true, default-features = true }
 
 [dev-dependencies]
-trybuild = { features = ["diff"], workspace = true }
 sc-service = { workspace = true, default-features = true }
+trybuild = { features = ["diff"], workspace = true }
diff --git a/substrate/test-utils/cli/Cargo.toml b/substrate/test-utils/cli/Cargo.toml
index 3fbcf2090683..b11e67bc49bc 100644
--- a/substrate/test-utils/cli/Cargo.toml
+++ b/substrate/test-utils/cli/Cargo.toml
@@ -16,17 +16,17 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-substrate-rpc-client = { workspace = true, default-features = true }
-sp-rpc = { workspace = true, default-features = true }
 assert_cmd = { workspace = true }
+futures = { workspace = true }
 nix = { features = ["signal"], workspace = true }
-regex = { workspace = true }
-tokio = { features = ["full"], workspace = true, default-features = true }
-node-primitives = { workspace = true, default-features = true }
 node-cli = { workspace = true }
+node-primitives = { workspace = true, default-features = true }
+regex = { workspace = true }
 sc-cli = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
-futures = { workspace = true }
+sp-rpc = { workspace = true, default-features = true }
+substrate-rpc-client = { workspace = true, default-features = true }
+tokio = { features = ["full"], workspace = true, default-features = true }
 
 [features]
 try-runtime = ["node-cli/try-runtime"]
diff --git a/substrate/test-utils/client/Cargo.toml b/substrate/test-utils/client/Cargo.toml
index a67c91fc5f79..e7ab4c8c8367 100644
--- a/substrate/test-utils/client/Cargo.toml
+++ b/substrate/test-utils/client/Cargo.toml
@@ -20,8 +20,6 @@ array-bytes = { workspace = true, default-features = true }
 async-trait = { workspace = true }
 codec = { workspace = true, default-features = true }
 futures = { workspace = true }
-serde = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-client-db = { features = [
 	"test-helpers",
@@ -30,6 +28,8 @@ sc-consensus = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
 sc-offchain = { workspace = true, default-features = true }
 sc-service = { workspace = true }
+serde = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
diff --git a/substrate/test-utils/runtime/Cargo.toml b/substrate/test-utils/runtime/Cargo.toml
index 96a888052876..7af692b437f6 100644
--- a/substrate/test-utils/runtime/Cargo.toml
+++ b/substrate/test-utils/runtime/Cargo.toml
@@ -16,43 +16,43 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+codec = { features = ["derive"], workspace = true }
+frame-executive = { workspace = true }
+frame-metadata-hash-extension = { workspace = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
+frame-system-rpc-runtime-api = { workspace = true }
+pallet-babe = { workspace = true }
+pallet-balances = { workspace = true }
+pallet-timestamp = { workspace = true }
+sc-service = { optional = true, workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+sp-api = { workspace = true }
 sp-application-crypto = { features = ["serde"], workspace = true }
+sp-block-builder = { workspace = true }
 sp-consensus-aura = { features = ["serde"], workspace = true }
 sp-consensus-babe = { features = ["serde"], workspace = true }
+sp-consensus-grandpa = { features = ["serde"], workspace = true }
+sp-core = { features = ["serde"], workspace = true }
+sp-crypto-hashing = { workspace = true }
+sp-externalities = { workspace = true }
 sp-genesis-builder = { workspace = true }
-sp-block-builder = { workspace = true }
-codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 sp-inherents = { workspace = true }
+sp-io = { workspace = true }
 sp-keyring = { workspace = true }
 sp-offchain = { workspace = true }
-sp-core = { features = ["serde"], workspace = true }
-sp-crypto-hashing = { workspace = true }
-sp-io = { workspace = true }
-frame-support = { workspace = true }
-sp-version = { workspace = true }
-sp-session = { workspace = true }
-sp-api = { workspace = true }
 sp-runtime = { features = ["serde"], workspace = true }
-pallet-babe = { workspace = true }
-pallet-balances = { workspace = true }
-frame-executive = { workspace = true }
-frame-metadata-hash-extension = { workspace = true }
-frame-system = { workspace = true }
-frame-system-rpc-runtime-api = { workspace = true }
-pallet-timestamp = { workspace = true }
-sp-consensus-grandpa = { features = ["serde"], workspace = true }
-sp-trie = { workspace = true }
+sp-session = { workspace = true }
+sp-state-machine = { workspace = true }
 sp-transaction-pool = { workspace = true }
+sp-trie = { workspace = true }
+sp-version = { workspace = true }
 trie-db = { workspace = true }
-sc-service = { optional = true, workspace = true }
-sp-state-machine = { workspace = true }
-sp-externalities = { workspace = true }
 
 # 3rd party
 array-bytes = { optional = true, workspace = true, default-features = true }
-serde_json = { workspace = true, features = ["alloc"] }
 log = { workspace = true }
+serde_json = { workspace = true, features = ["alloc"] }
 tracing = { workspace = true, default-features = false }
 
 [dev-dependencies]
@@ -61,11 +61,11 @@ sc-block-builder = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
 sc-executor-common = { workspace = true, default-features = true }
-sp-consensus = { workspace = true, default-features = true }
-substrate-test-runtime-client = { workspace = true }
-sp-tracing = { workspace = true, default-features = true }
 serde = { features = ["alloc", "derive"], workspace = true }
 serde_json = { features = ["alloc"], workspace = true }
+sp-consensus = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
+substrate-test-runtime-client = { workspace = true }
 
 [build-dependencies]
 substrate-wasm-builder = { optional = true, features = ["metadata-hash"], workspace = true, default-features = true }
diff --git a/substrate/test-utils/runtime/transaction-pool/Cargo.toml b/substrate/test-utils/runtime/transaction-pool/Cargo.toml
index 3cdaea642263..501c9f99ebf1 100644
--- a/substrate/test-utils/runtime/transaction-pool/Cargo.toml
+++ b/substrate/test-utils/runtime/transaction-pool/Cargo.toml
@@ -19,9 +19,9 @@ codec = { workspace = true, default-features = true }
 futures = { workspace = true }
 log = { workspace = true }
 parking_lot = { workspace = true, default-features = true }
-thiserror = { workspace = true }
 sc-transaction-pool = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
+thiserror = { workspace = true }
diff --git a/substrate/utils/binary-merkle-tree/Cargo.toml b/substrate/utils/binary-merkle-tree/Cargo.toml
index 9577d94ef0bf..86d64face80e 100644
--- a/substrate/utils/binary-merkle-tree/Cargo.toml
+++ b/substrate/utils/binary-merkle-tree/Cargo.toml
@@ -12,16 +12,16 @@ homepage.workspace = true
 workspace = true
 
 [dependencies]
-codec = { workspace = true, features = ["derive"] }
 array-bytes = { optional = true, workspace = true, default-features = true }
-log = { optional = true, workspace = true }
+codec = { workspace = true, features = ["derive"] }
 hash-db = { workspace = true }
+log = { optional = true, workspace = true }
 
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 
 [features]
 debug = ["array-bytes", "log"]
diff --git a/substrate/utils/frame/benchmarking-cli/Cargo.toml b/substrate/utils/frame/benchmarking-cli/Cargo.toml
index 6d86346ee180..c38a7e4f77d8 100644
--- a/substrate/utils/frame/benchmarking-cli/Cargo.toml
+++ b/substrate/utils/frame/benchmarking-cli/Cargo.toml
@@ -16,25 +16,27 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+Inflector = { workspace = true }
 array-bytes = { workspace = true, default-features = true }
 chrono = { workspace = true }
 clap = { features = ["derive"], workspace = true }
 codec = { workspace = true, default-features = true }
 comfy-table = { workspace = true }
+cumulus-client-parachain-inherent = { workspace = true, default-features = true }
+cumulus-primitives-proof-size-hostfunction = { workspace = true, default-features = true }
+frame-benchmarking = { workspace = true, default-features = true }
+frame-support = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
+gethostname = { workspace = true }
 handlebars = { workspace = true }
-Inflector = { workspace = true }
+hex = { workspace = true, default-features = true }
 itertools = { workspace = true }
 linked-hash-map = { workspace = true }
 log = { workspace = true, default-features = true }
+polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 rand = { features = ["small_rng"], workspace = true, default-features = true }
 rand_pcg = { workspace = true }
-serde = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-thousands = { workspace = true }
-frame-benchmarking = { workspace = true, default-features = true }
-frame-support = { workspace = true, default-features = true }
-frame-system = { workspace = true, default-features = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true }
 sc-cli = { workspace = true }
@@ -42,36 +44,34 @@ sc-client-api = { workspace = true, default-features = true }
 sc-client-db = { workspace = true }
 sc-executor = { workspace = true, default-features = true }
 sc-executor-common = { workspace = true }
+sc-runtime-utilities = { workspace = true, default-features = true }
 sc-service = { workspace = true }
 sc-sysinfo = { workspace = true, default-features = true }
-sc-runtime-utilities = { workspace = true, default-features = true }
+serde = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
+sp-block-builder = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
+sp-crypto-hashing = { workspace = true, default-features = true }
 sp-database = { workspace = true, default-features = true }
 sp-externalities = { workspace = true, default-features = true }
 sp-genesis-builder = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
-sp-crypto-hashing = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
 sp-storage = { workspace = true, default-features = true }
-sp-trie = { workspace = true, default-features = true }
-sp-block-builder = { workspace = true, default-features = true }
+sp-timestamp = { workspace = true, default-features = true }
 sp-transaction-pool = { workspace = true, default-features = true }
+sp-trie = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
-sp-timestamp = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
 sp-wasm-interface = { workspace = true, default-features = true }
 subxt = { workspace = true, features = ["native"] }
 subxt-signer = { workspace = true, features = ["unstable-eth"] }
-cumulus-primitives-proof-size-hostfunction = { workspace = true, default-features = true }
-cumulus-client-parachain-inherent = { workspace = true, default-features = true }
-polkadot-parachain-primitives = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
-gethostname = { workspace = true }
-hex = { workspace = true, default-features = true }
+thiserror = { workspace = true }
+thousands = { workspace = true }
 
 [dev-dependencies]
 cumulus-test-runtime = { workspace = true, default-features = true }
diff --git a/substrate/utils/frame/generate-bags/Cargo.toml b/substrate/utils/frame/generate-bags/Cargo.toml
index c37c42646699..c03f85ece05d 100644
--- a/substrate/utils/frame/generate-bags/Cargo.toml
+++ b/substrate/utils/frame/generate-bags/Cargo.toml
@@ -13,8 +13,8 @@ workspace = true
 
 [dependencies]
 # FRAME
-frame-support = { workspace = true, default-features = true }
 frame-election-provider-support = { workspace = true, default-features = true }
+frame-support = { workspace = true, default-features = true }
 frame-system = { workspace = true, default-features = true }
 pallet-staking = { workspace = true, default-features = true }
 sp-staking = { workspace = true, default-features = true }
diff --git a/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml b/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml
index 3d5748647257..aace0f4ad23f 100644
--- a/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml
+++ b/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml
@@ -13,8 +13,8 @@ publish = false
 workspace = true
 
 [dependencies]
-kitchensink-runtime = { workspace = true }
 generate-bags = { workspace = true, default-features = true }
+kitchensink-runtime = { workspace = true }
 
 # third-party
 clap = { features = ["derive"], workspace = true }
diff --git a/substrate/utils/frame/omni-bencher/Cargo.toml b/substrate/utils/frame/omni-bencher/Cargo.toml
index 345a7288d45b..d0d7f1a3428f 100644
--- a/substrate/utils/frame/omni-bencher/Cargo.toml
+++ b/substrate/utils/frame/omni-bencher/Cargo.toml
@@ -15,16 +15,16 @@ workspace = true
 clap = { features = ["derive"], workspace = true }
 cumulus-primitives-proof-size-hostfunction = { workspace = true, default-features = true }
 frame-benchmarking-cli = { workspace = true }
+log = { workspace = true }
 sc-cli = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-statement-store = { workspace = true, default-features = true }
 tracing-subscriber = { workspace = true }
-log = { workspace = true }
 
 [dev-dependencies]
-tempfile = { workspace = true }
 assert_cmd = { workspace = true }
 cumulus-test-runtime = { workspace = true }
-sp-tracing = { workspace = true, default-features = true }
-sp-genesis-builder = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true }
+sp-genesis-builder = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
+tempfile = { workspace = true }
diff --git a/substrate/utils/frame/remote-externalities/Cargo.toml b/substrate/utils/frame/remote-externalities/Cargo.toml
index 41a0091027c1..4ed0e1edf3e4 100644
--- a/substrate/utils/frame/remote-externalities/Cargo.toml
+++ b/substrate/utils/frame/remote-externalities/Cargo.toml
@@ -15,20 +15,20 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee = { features = ["http-client"], workspace = true }
 codec = { workspace = true, default-features = true }
+futures = { workspace = true }
+indicatif = { workspace = true }
+jsonrpsee = { features = ["http-client"], workspace = true }
 log = { workspace = true, default-features = true }
 serde = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
-sp-state-machine = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-tokio = { features = ["macros", "rt-multi-thread"], workspace = true, default-features = true }
-substrate-rpc-client = { workspace = true, default-features = true }
-futures = { workspace = true }
-indicatif = { workspace = true }
+sp-state-machine = { workspace = true, default-features = true }
 spinners = { workspace = true }
+substrate-rpc-client = { workspace = true, default-features = true }
+tokio = { features = ["macros", "rt-multi-thread"], workspace = true, default-features = true }
 tokio-retry = { workspace = true }
 
 [dev-dependencies]
diff --git a/substrate/utils/frame/rpc/client/Cargo.toml b/substrate/utils/frame/rpc/client/Cargo.toml
index d26be3a13124..6282621e1c75 100644
--- a/substrate/utils/frame/rpc/client/Cargo.toml
+++ b/substrate/utils/frame/rpc/client/Cargo.toml
@@ -15,13 +15,13 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+async-trait = { workspace = true }
 jsonrpsee = { features = ["ws-client"], workspace = true }
+log = { workspace = true, default-features = true }
 sc-rpc-api = { workspace = true, default-features = true }
-async-trait = { workspace = true }
 serde = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-log = { workspace = true, default-features = true }
 
 [dev-dependencies]
-tokio = { features = ["macros", "rt-multi-thread", "sync"], workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
+tokio = { features = ["macros", "rt-multi-thread", "sync"], workspace = true, default-features = true }
diff --git a/substrate/utils/frame/rpc/support/Cargo.toml b/substrate/utils/frame/rpc/support/Cargo.toml
index 82652c8fa262..45b2bc6fa9b3 100644
--- a/substrate/utils/frame/rpc/support/Cargo.toml
+++ b/substrate/utils/frame/rpc/support/Cargo.toml
@@ -16,16 +16,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true, default-features = true }
-jsonrpsee = { features = ["jsonrpsee-types"], workspace = true }
-serde = { workspace = true, default-features = true }
 frame-support = { workspace = true, default-features = true }
+jsonrpsee = { features = ["jsonrpsee-types"], workspace = true }
 sc-rpc-api = { workspace = true, default-features = true }
+serde = { workspace = true, default-features = true }
 sp-storage = { workspace = true, default-features = true }
 
 [dev-dependencies]
-scale-info = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
 jsonrpsee = { features = ["jsonrpsee-types", "ws-client"], workspace = true }
-tokio = { workspace = true, default-features = true }
+scale-info = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-frame-system = { workspace = true, default-features = true }
+tokio = { workspace = true, default-features = true }
diff --git a/substrate/utils/frame/rpc/system/Cargo.toml b/substrate/utils/frame/rpc/system/Cargo.toml
index 5757a48498c7..68dfbb833c6f 100644
--- a/substrate/utils/frame/rpc/system/Cargo.toml
+++ b/substrate/utils/frame/rpc/system/Cargo.toml
@@ -16,16 +16,16 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-futures = { workspace = true }
 codec = { workspace = true, default-features = true }
 docify = { workspace = true }
+frame-system-rpc-runtime-api = { workspace = true, default-features = true }
+futures = { workspace = true }
 jsonrpsee = { features = [
 	"client-core",
 	"macros",
 	"server-core",
 ], workspace = true }
 log = { workspace = true, default-features = true }
-frame-system-rpc-runtime-api = { workspace = true, default-features = true }
 sc-rpc-api = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
@@ -35,8 +35,8 @@ sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 
 [dev-dependencies]
-sc-transaction-pool = { workspace = true, default-features = true }
-tokio = { workspace = true, default-features = true }
 assert_matches = { workspace = true }
+sc-transaction-pool = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
+tokio = { workspace = true, default-features = true }
diff --git a/substrate/utils/prometheus/src/lib.rs b/substrate/utils/prometheus/src/lib.rs
index 5edac2e6650f..ae39cb4a7dd3 100644
--- a/substrate/utils/prometheus/src/lib.rs
+++ b/substrate/utils/prometheus/src/lib.rs
@@ -87,7 +87,7 @@ async fn request_metrics(
 /// to serve metrics.
 pub async fn init_prometheus(prometheus_addr: SocketAddr, registry: Registry) -> Result<(), Error> {
 	let listener = tokio::net::TcpListener::bind(&prometheus_addr).await.map_err(|e| {
-		log::error!(target: "prometheus", "Error binding to '{:#?}': {:#?}", prometheus_addr, e);
+		log::error!(target: "prometheus", "Error binding to '{prometheus_addr:?}': {e:?}");
 		Error::PortInUse(prometheus_addr)
 	})?;
 
diff --git a/substrate/utils/wasm-builder/Cargo.toml b/substrate/utils/wasm-builder/Cargo.toml
index fb15e8619a38..6645dd1803bf 100644
--- a/substrate/utils/wasm-builder/Cargo.toml
+++ b/substrate/utils/wasm-builder/Cargo.toml
@@ -18,28 +18,28 @@ targets = ["x86_64-unknown-linux-gnu"]
 build-helper = { workspace = true }
 cargo_metadata = { workspace = true }
 console = { workspace = true }
+filetime = { workspace = true }
+jobserver = { workspace = true }
+parity-wasm = { workspace = true }
+polkavm-linker = { workspace = true }
+sp-maybe-compressed-blob = { workspace = true, default-features = true }
 strum = { features = ["derive"], workspace = true, default-features = true }
 tempfile = { workspace = true }
 toml = { workspace = true }
 walkdir = { workspace = true }
-sp-maybe-compressed-blob = { workspace = true, default-features = true }
-filetime = { workspace = true }
 wasm-opt = { workspace = true }
-parity-wasm = { workspace = true }
-polkavm-linker = { workspace = true }
-jobserver = { workspace = true }
 
 # Dependencies required for the `metadata-hash` feature.
+array-bytes = { optional = true, workspace = true, default-features = true }
+codec = { optional = true, workspace = true, default-features = true }
+frame-metadata = { features = ["current", "unstable"], optional = true, workspace = true, default-features = true }
 merkleized-metadata = { optional = true, workspace = true }
 sc-executor = { optional = true, workspace = true, default-features = true }
+shlex = { workspace = true }
 sp-core = { optional = true, workspace = true, default-features = true }
 sp-io = { optional = true, workspace = true, default-features = true }
-sp-version = { optional = true, workspace = true, default-features = true }
-frame-metadata = { features = ["current", "unstable"], optional = true, workspace = true, default-features = true }
-codec = { optional = true, workspace = true, default-features = true }
-array-bytes = { optional = true, workspace = true, default-features = true }
 sp-tracing = { optional = true, workspace = true, default-features = true }
-shlex = { workspace = true }
+sp-version = { optional = true, workspace = true, default-features = true }
 
 [features]
 # Enable support for generating the metadata hash.
diff --git a/templates/minimal/node/Cargo.toml b/templates/minimal/node/Cargo.toml
index 956efca34532..a2a999f02671 100644
--- a/templates/minimal/node/Cargo.toml
+++ b/templates/minimal/node/Cargo.toml
@@ -14,15 +14,15 @@ build = "build.rs"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-docify = { workspace = true }
 clap = { features = ["derive"], workspace = true }
+docify = { workspace = true }
 futures = { features = ["thread-pool"], workspace = true }
 futures-timer = { workspace = true }
 jsonrpsee = { features = ["server"], workspace = true }
 serde_json = { workspace = true, default-features = true }
 
-polkadot-sdk = { workspace = true, features = ["experimental", "node"] }
 minimal-template-runtime = { workspace = true }
+polkadot-sdk = { workspace = true, features = ["experimental", "node"] }
 
 [build-dependencies]
 polkadot-sdk = { workspace = true, features = ["substrate-build-script-utils"] }
diff --git a/templates/minimal/pallets/template/Cargo.toml b/templates/minimal/pallets/template/Cargo.toml
index 9a02d4daeaac..e11ce0e9955c 100644
--- a/templates/minimal/pallets/template/Cargo.toml
+++ b/templates/minimal/pallets/template/Cargo.toml
@@ -14,11 +14,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 polkadot-sdk = { workspace = true, default-features = false, features = [
 	"experimental",
 	"runtime",
 ] }
+scale-info = { features = ["derive"], workspace = true }
 
 
 [features]
diff --git a/templates/minimal/runtime/Cargo.toml b/templates/minimal/runtime/Cargo.toml
index b803c74539ef..1554e92c0bf5 100644
--- a/templates/minimal/runtime/Cargo.toml
+++ b/templates/minimal/runtime/Cargo.toml
@@ -11,7 +11,6 @@ publish = false
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { workspace = true }
 polkadot-sdk = { workspace = true, features = [
 	"pallet-balances",
 	"pallet-sudo",
@@ -20,6 +19,7 @@ polkadot-sdk = { workspace = true, features = [
 	"pallet-transaction-payment-rpc-runtime-api",
 	"runtime",
 ] }
+scale-info = { workspace = true }
 serde_json = { workspace = true, default-features = false, features = ["alloc"] }
 
 # local pallet templates
diff --git a/templates/parachain/node/Cargo.toml b/templates/parachain/node/Cargo.toml
index ba5f1212b79c..ec4b13b184fc 100644
--- a/templates/parachain/node/Cargo.toml
+++ b/templates/parachain/node/Cargo.toml
@@ -12,22 +12,22 @@ build = "build.rs"
 
 [dependencies]
 clap = { features = ["derive"], workspace = true }
-log = { workspace = true, default-features = true }
 codec = { workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-jsonrpsee = { features = ["server"], workspace = true }
+color-print = { workspace = true }
+docify = { workspace = true }
 futures = { workspace = true }
+jsonrpsee = { features = ["server"], workspace = true }
+log = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
-docify = { workspace = true }
-color-print = { workspace = true }
 
 polkadot-sdk = { workspace = true, features = ["node"] }
 
 parachain-template-runtime = { workspace = true }
 
 # Substrate
-sc-tracing = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
+sc-tracing = { workspace = true, default-features = true }
 
 [build-dependencies]
 polkadot-sdk = { workspace = true, features = ["substrate-build-script-utils"] }
diff --git a/templates/parachain/runtime/Cargo.toml b/templates/parachain/runtime/Cargo.toml
index f1d33b4143e4..9a0548106ed7 100644
--- a/templates/parachain/runtime/Cargo.toml
+++ b/templates/parachain/runtime/Cargo.toml
@@ -13,17 +13,17 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [build-dependencies]
-substrate-wasm-builder = { optional = true, workspace = true, default-features = true }
 docify = { workspace = true }
+substrate-wasm-builder = { optional = true, workspace = true, default-features = true }
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
+docify = { workspace = true }
 hex-literal = { optional = true, workspace = true, default-features = true }
 log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
-smallvec = { workspace = true, default-features = true }
-docify = { workspace = true }
 serde_json = { workspace = true, default-features = false, features = ["alloc"] }
+smallvec = { workspace = true, default-features = true }
 
 # Local
 pallet-parachain-template = { workspace = true }
diff --git a/templates/solochain/node/Cargo.toml b/templates/solochain/node/Cargo.toml
index 4c0ab31df95e..90f576c88c23 100644
--- a/templates/solochain/node/Cargo.toml
+++ b/templates/solochain/node/Cargo.toml
@@ -17,41 +17,41 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 clap = { features = ["derive"], workspace = true }
 futures = { features = ["thread-pool"], workspace = true }
-serde_json = { workspace = true, default-features = true }
 jsonrpsee = { features = ["server"], workspace = true }
+serde_json = { workspace = true, default-features = true }
 
 # substrate client
+sc-basic-authorship = { workspace = true, default-features = true }
 sc-cli = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
+sc-consensus = { workspace = true, default-features = true }
+sc-consensus-aura = { workspace = true, default-features = true }
+sc-consensus-grandpa = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
+sc-offchain = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
 sc-transaction-pool = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
-sc-offchain = { workspace = true, default-features = true }
-sc-consensus = { workspace = true, default-features = true }
-sc-consensus-aura = { workspace = true, default-features = true }
 sp-consensus-aura = { workspace = true, default-features = true }
-sc-consensus-grandpa = { workspace = true, default-features = true }
 sp-consensus-grandpa = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-genesis-builder = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-sc-basic-authorship = { workspace = true, default-features = true }
 
 # substrate primitives
-sp-runtime = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
-sp-timestamp = { workspace = true, default-features = true }
-sp-inherents = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
-sp-blockchain = { workspace = true, default-features = true }
 sp-block-builder = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
+sp-inherents = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-timestamp = { workspace = true, default-features = true }
 
 # frame and pallets
-frame-system = { workspace = true, default-features = true }
 frame-metadata-hash-extension = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
 pallet-transaction-payment = { workspace = true, default-features = true }
 pallet-transaction-payment-rpc = { workspace = true, default-features = true }
 substrate-frame-rpc-system = { workspace = true, default-features = true }
diff --git a/templates/solochain/runtime/Cargo.toml b/templates/solochain/runtime/Cargo.toml
index 837849e844b1..1cff982fbf3c 100644
--- a/templates/solochain/runtime/Cargo.toml
+++ b/templates/solochain/runtime/Cargo.toml
@@ -23,11 +23,11 @@ scale-info = { features = [
 serde_json = { workspace = true, default-features = false, features = ["alloc"] }
 
 # frame
+frame-executive = { workspace = true }
+frame-metadata-hash-extension = { workspace = true }
 frame-support = { features = ["experimental"], workspace = true }
 frame-system = { workspace = true }
 frame-try-runtime = { optional = true, workspace = true }
-frame-executive = { workspace = true }
-frame-metadata-hash-extension = { workspace = true }
 
 # frame pallets
 pallet-aura = { workspace = true }
@@ -46,11 +46,12 @@ sp-consensus-aura = { features = [
 sp-consensus-grandpa = { features = [
 	"serde",
 ], workspace = true }
-sp-keyring = { workspace = true }
 sp-core = { features = [
 	"serde",
 ], workspace = true }
+sp-genesis-builder = { workspace = true }
 sp-inherents = { workspace = true }
+sp-keyring = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { features = [
 	"serde",
@@ -61,7 +62,6 @@ sp-transaction-pool = { workspace = true }
 sp-version = { features = [
 	"serde",
 ], workspace = true }
-sp-genesis-builder = { workspace = true }
 
 # RPC related
 frame-system-rpc-runtime-api = { workspace = true }
diff --git a/templates/zombienet/Cargo.toml b/templates/zombienet/Cargo.toml
index f29325dbe6a9..805e4ddbcee2 100644
--- a/templates/zombienet/Cargo.toml
+++ b/templates/zombienet/Cargo.toml
@@ -10,10 +10,10 @@ edition.workspace = true
 publish = false
 
 [dependencies]
+anyhow = { workspace = true }
 env_logger = { workspace = true }
 log = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread"] }
-anyhow = { workspace = true }
 zombienet-sdk = { workspace = true }
 
 [features]
diff --git a/umbrella/Cargo.toml b/umbrella/Cargo.toml
index 68d71b4a5d5e..f36d39d63f6a 100644
--- a/umbrella/Cargo.toml
+++ b/umbrella/Cargo.toml
@@ -624,1884 +624,1884 @@ workspace = true
 workspace = true
 
 [dependencies.assets-common]
-path = "../cumulus/parachains/runtimes/assets/common"
 default-features = false
 optional = true
+path = "../cumulus/parachains/runtimes/assets/common"
 
 [dependencies.binary-merkle-tree]
-path = "../substrate/utils/binary-merkle-tree"
 default-features = false
 optional = true
+path = "../substrate/utils/binary-merkle-tree"
 
 [dependencies.bp-header-chain]
-path = "../bridges/primitives/header-chain"
 default-features = false
 optional = true
+path = "../bridges/primitives/header-chain"
 
 [dependencies.bp-messages]
-path = "../bridges/primitives/messages"
 default-features = false
 optional = true
+path = "../bridges/primitives/messages"
 
 [dependencies.bp-parachains]
-path = "../bridges/primitives/parachains"
 default-features = false
 optional = true
+path = "../bridges/primitives/parachains"
 
 [dependencies.bp-polkadot]
-path = "../bridges/chains/chain-polkadot"
 default-features = false
 optional = true
+path = "../bridges/chains/chain-polkadot"
 
 [dependencies.bp-polkadot-core]
-path = "../bridges/primitives/polkadot-core"
 default-features = false
 optional = true
+path = "../bridges/primitives/polkadot-core"
 
 [dependencies.bp-relayers]
-path = "../bridges/primitives/relayers"
 default-features = false
 optional = true
+path = "../bridges/primitives/relayers"
 
 [dependencies.bp-runtime]
-path = "../bridges/primitives/runtime"
 default-features = false
 optional = true
+path = "../bridges/primitives/runtime"
 
 [dependencies.bp-test-utils]
-path = "../bridges/primitives/test-utils"
 default-features = false
 optional = true
+path = "../bridges/primitives/test-utils"
 
 [dependencies.bp-xcm-bridge-hub]
-path = "../bridges/primitives/xcm-bridge-hub"
 default-features = false
 optional = true
+path = "../bridges/primitives/xcm-bridge-hub"
 
 [dependencies.bp-xcm-bridge-hub-router]
-path = "../bridges/primitives/xcm-bridge-hub-router"
 default-features = false
 optional = true
+path = "../bridges/primitives/xcm-bridge-hub-router"
 
 [dependencies.bridge-hub-common]
-path = "../cumulus/parachains/runtimes/bridge-hubs/common"
 default-features = false
 optional = true
+path = "../cumulus/parachains/runtimes/bridge-hubs/common"
 
 [dependencies.bridge-runtime-common]
-path = "../bridges/bin/runtime-common"
 default-features = false
 optional = true
+path = "../bridges/bin/runtime-common"
 
 [dependencies.cumulus-pallet-aura-ext]
-path = "../cumulus/pallets/aura-ext"
 default-features = false
 optional = true
+path = "../cumulus/pallets/aura-ext"
 
 [dependencies.cumulus-pallet-dmp-queue]
-path = "../cumulus/pallets/dmp-queue"
 default-features = false
 optional = true
+path = "../cumulus/pallets/dmp-queue"
 
 [dependencies.cumulus-pallet-parachain-system]
-path = "../cumulus/pallets/parachain-system"
 default-features = false
 optional = true
+path = "../cumulus/pallets/parachain-system"
 
 [dependencies.cumulus-pallet-parachain-system-proc-macro]
-path = "../cumulus/pallets/parachain-system/proc-macro"
 default-features = false
 optional = true
+path = "../cumulus/pallets/parachain-system/proc-macro"
 
 [dependencies.cumulus-pallet-session-benchmarking]
-path = "../cumulus/pallets/session-benchmarking"
 default-features = false
 optional = true
+path = "../cumulus/pallets/session-benchmarking"
 
 [dependencies.cumulus-pallet-solo-to-para]
-path = "../cumulus/pallets/solo-to-para"
 default-features = false
 optional = true
+path = "../cumulus/pallets/solo-to-para"
 
 [dependencies.cumulus-pallet-xcm]
-path = "../cumulus/pallets/xcm"
 default-features = false
 optional = true
+path = "../cumulus/pallets/xcm"
 
 [dependencies.cumulus-pallet-xcmp-queue]
-path = "../cumulus/pallets/xcmp-queue"
 default-features = false
 optional = true
+path = "../cumulus/pallets/xcmp-queue"
 
 [dependencies.cumulus-ping]
-path = "../cumulus/parachains/pallets/ping"
 default-features = false
 optional = true
+path = "../cumulus/parachains/pallets/ping"
 
 [dependencies.cumulus-primitives-aura]
-path = "../cumulus/primitives/aura"
 default-features = false
 optional = true
+path = "../cumulus/primitives/aura"
 
 [dependencies.cumulus-primitives-core]
-path = "../cumulus/primitives/core"
 default-features = false
 optional = true
+path = "../cumulus/primitives/core"
 
 [dependencies.cumulus-primitives-parachain-inherent]
-path = "../cumulus/primitives/parachain-inherent"
 default-features = false
 optional = true
+path = "../cumulus/primitives/parachain-inherent"
 
 [dependencies.cumulus-primitives-proof-size-hostfunction]
-path = "../cumulus/primitives/proof-size-hostfunction"
 default-features = false
 optional = true
+path = "../cumulus/primitives/proof-size-hostfunction"
 
 [dependencies.cumulus-primitives-storage-weight-reclaim]
-path = "../cumulus/primitives/storage-weight-reclaim"
 default-features = false
 optional = true
+path = "../cumulus/primitives/storage-weight-reclaim"
 
 [dependencies.cumulus-primitives-timestamp]
-path = "../cumulus/primitives/timestamp"
 default-features = false
 optional = true
+path = "../cumulus/primitives/timestamp"
 
 [dependencies.cumulus-primitives-utility]
-path = "../cumulus/primitives/utility"
 default-features = false
 optional = true
+path = "../cumulus/primitives/utility"
 
 [dependencies.frame-benchmarking]
-path = "../substrate/frame/benchmarking"
 default-features = false
 optional = true
+path = "../substrate/frame/benchmarking"
 
 [dependencies.frame-benchmarking-pallet-pov]
-path = "../substrate/frame/benchmarking/pov"
 default-features = false
 optional = true
+path = "../substrate/frame/benchmarking/pov"
 
 [dependencies.frame-election-provider-solution-type]
-path = "../substrate/frame/election-provider-support/solution-type"
 default-features = false
 optional = true
+path = "../substrate/frame/election-provider-support/solution-type"
 
 [dependencies.frame-election-provider-support]
-path = "../substrate/frame/election-provider-support"
 default-features = false
 optional = true
+path = "../substrate/frame/election-provider-support"
 
 [dependencies.frame-executive]
-path = "../substrate/frame/executive"
 default-features = false
 optional = true
+path = "../substrate/frame/executive"
 
 [dependencies.frame-metadata-hash-extension]
-path = "../substrate/frame/metadata-hash-extension"
 default-features = false
 optional = true
+path = "../substrate/frame/metadata-hash-extension"
 
 [dependencies.frame-support]
-path = "../substrate/frame/support"
 default-features = false
 optional = true
+path = "../substrate/frame/support"
 
 [dependencies.frame-support-procedural]
-path = "../substrate/frame/support/procedural"
 default-features = false
 optional = true
+path = "../substrate/frame/support/procedural"
 
 [dependencies.frame-support-procedural-tools-derive]
-path = "../substrate/frame/support/procedural/tools/derive"
 default-features = false
 optional = true
+path = "../substrate/frame/support/procedural/tools/derive"
 
 [dependencies.frame-system]
-path = "../substrate/frame/system"
 default-features = false
 optional = true
+path = "../substrate/frame/system"
 
 [dependencies.frame-system-benchmarking]
-path = "../substrate/frame/system/benchmarking"
 default-features = false
 optional = true
+path = "../substrate/frame/system/benchmarking"
 
 [dependencies.frame-system-rpc-runtime-api]
-path = "../substrate/frame/system/rpc/runtime-api"
 default-features = false
 optional = true
+path = "../substrate/frame/system/rpc/runtime-api"
 
 [dependencies.frame-try-runtime]
-path = "../substrate/frame/try-runtime"
 default-features = false
 optional = true
+path = "../substrate/frame/try-runtime"
 
 [dependencies.pallet-alliance]
-path = "../substrate/frame/alliance"
 default-features = false
 optional = true
+path = "../substrate/frame/alliance"
 
 [dependencies.pallet-asset-conversion]
-path = "../substrate/frame/asset-conversion"
 default-features = false
 optional = true
+path = "../substrate/frame/asset-conversion"
 
 [dependencies.pallet-asset-conversion-ops]
-path = "../substrate/frame/asset-conversion/ops"
 default-features = false
 optional = true
+path = "../substrate/frame/asset-conversion/ops"
 
 [dependencies.pallet-asset-conversion-tx-payment]
-path = "../substrate/frame/transaction-payment/asset-conversion-tx-payment"
 default-features = false
 optional = true
+path = "../substrate/frame/transaction-payment/asset-conversion-tx-payment"
 
 [dependencies.pallet-asset-rate]
-path = "../substrate/frame/asset-rate"
 default-features = false
 optional = true
+path = "../substrate/frame/asset-rate"
 
 [dependencies.pallet-asset-tx-payment]
-path = "../substrate/frame/transaction-payment/asset-tx-payment"
 default-features = false
 optional = true
+path = "../substrate/frame/transaction-payment/asset-tx-payment"
 
 [dependencies.pallet-assets]
-path = "../substrate/frame/assets"
 default-features = false
 optional = true
+path = "../substrate/frame/assets"
 
 [dependencies.pallet-assets-freezer]
-path = "../substrate/frame/assets-freezer"
 default-features = false
 optional = true
+path = "../substrate/frame/assets-freezer"
 
 [dependencies.pallet-atomic-swap]
-path = "../substrate/frame/atomic-swap"
 default-features = false
 optional = true
+path = "../substrate/frame/atomic-swap"
 
 [dependencies.pallet-aura]
-path = "../substrate/frame/aura"
 default-features = false
 optional = true
+path = "../substrate/frame/aura"
 
 [dependencies.pallet-authority-discovery]
-path = "../substrate/frame/authority-discovery"
 default-features = false
 optional = true
+path = "../substrate/frame/authority-discovery"
 
 [dependencies.pallet-authorship]
-path = "../substrate/frame/authorship"
 default-features = false
 optional = true
+path = "../substrate/frame/authorship"
 
 [dependencies.pallet-babe]
-path = "../substrate/frame/babe"
 default-features = false
 optional = true
+path = "../substrate/frame/babe"
 
 [dependencies.pallet-bags-list]
-path = "../substrate/frame/bags-list"
 default-features = false
 optional = true
+path = "../substrate/frame/bags-list"
 
 [dependencies.pallet-balances]
-path = "../substrate/frame/balances"
 default-features = false
 optional = true
+path = "../substrate/frame/balances"
 
 [dependencies.pallet-beefy]
-path = "../substrate/frame/beefy"
 default-features = false
 optional = true
+path = "../substrate/frame/beefy"
 
 [dependencies.pallet-beefy-mmr]
-path = "../substrate/frame/beefy-mmr"
 default-features = false
 optional = true
+path = "../substrate/frame/beefy-mmr"
 
 [dependencies.pallet-bounties]
-path = "../substrate/frame/bounties"
 default-features = false
 optional = true
+path = "../substrate/frame/bounties"
 
 [dependencies.pallet-bridge-grandpa]
-path = "../bridges/modules/grandpa"
 default-features = false
 optional = true
+path = "../bridges/modules/grandpa"
 
 [dependencies.pallet-bridge-messages]
-path = "../bridges/modules/messages"
 default-features = false
 optional = true
+path = "../bridges/modules/messages"
 
 [dependencies.pallet-bridge-parachains]
-path = "../bridges/modules/parachains"
 default-features = false
 optional = true
+path = "../bridges/modules/parachains"
 
 [dependencies.pallet-bridge-relayers]
-path = "../bridges/modules/relayers"
 default-features = false
 optional = true
+path = "../bridges/modules/relayers"
 
 [dependencies.pallet-broker]
-path = "../substrate/frame/broker"
 default-features = false
 optional = true
+path = "../substrate/frame/broker"
 
 [dependencies.pallet-child-bounties]
-path = "../substrate/frame/child-bounties"
 default-features = false
 optional = true
+path = "../substrate/frame/child-bounties"
 
 [dependencies.pallet-collator-selection]
-path = "../cumulus/pallets/collator-selection"
 default-features = false
 optional = true
+path = "../cumulus/pallets/collator-selection"
 
 [dependencies.pallet-collective]
-path = "../substrate/frame/collective"
 default-features = false
 optional = true
+path = "../substrate/frame/collective"
 
 [dependencies.pallet-collective-content]
-path = "../cumulus/parachains/pallets/collective-content"
 default-features = false
 optional = true
+path = "../cumulus/parachains/pallets/collective-content"
 
 [dependencies.pallet-contracts]
-path = "../substrate/frame/contracts"
 default-features = false
 optional = true
+path = "../substrate/frame/contracts"
 
 [dependencies.pallet-contracts-proc-macro]
-path = "../substrate/frame/contracts/proc-macro"
 default-features = false
 optional = true
+path = "../substrate/frame/contracts/proc-macro"
 
 [dependencies.pallet-contracts-uapi]
-path = "../substrate/frame/contracts/uapi"
 default-features = false
 optional = true
+path = "../substrate/frame/contracts/uapi"
 
 [dependencies.pallet-conviction-voting]
-path = "../substrate/frame/conviction-voting"
 default-features = false
 optional = true
+path = "../substrate/frame/conviction-voting"
 
 [dependencies.pallet-core-fellowship]
-path = "../substrate/frame/core-fellowship"
 default-features = false
 optional = true
+path = "../substrate/frame/core-fellowship"
 
 [dependencies.pallet-delegated-staking]
-path = "../substrate/frame/delegated-staking"
 default-features = false
 optional = true
+path = "../substrate/frame/delegated-staking"
 
 [dependencies.pallet-democracy]
-path = "../substrate/frame/democracy"
 default-features = false
 optional = true
+path = "../substrate/frame/democracy"
 
 [dependencies.pallet-dev-mode]
-path = "../substrate/frame/examples/dev-mode"
 default-features = false
 optional = true
+path = "../substrate/frame/examples/dev-mode"
 
 [dependencies.pallet-election-provider-multi-phase]
-path = "../substrate/frame/election-provider-multi-phase"
 default-features = false
 optional = true
+path = "../substrate/frame/election-provider-multi-phase"
 
 [dependencies.pallet-election-provider-support-benchmarking]
-path = "../substrate/frame/election-provider-support/benchmarking"
 default-features = false
 optional = true
+path = "../substrate/frame/election-provider-support/benchmarking"
 
 [dependencies.pallet-elections-phragmen]
-path = "../substrate/frame/elections-phragmen"
 default-features = false
 optional = true
+path = "../substrate/frame/elections-phragmen"
 
 [dependencies.pallet-fast-unstake]
-path = "../substrate/frame/fast-unstake"
 default-features = false
 optional = true
+path = "../substrate/frame/fast-unstake"
 
 [dependencies.pallet-glutton]
-path = "../substrate/frame/glutton"
 default-features = false
 optional = true
+path = "../substrate/frame/glutton"
 
 [dependencies.pallet-grandpa]
-path = "../substrate/frame/grandpa"
 default-features = false
 optional = true
+path = "../substrate/frame/grandpa"
 
 [dependencies.pallet-identity]
-path = "../substrate/frame/identity"
 default-features = false
 optional = true
+path = "../substrate/frame/identity"
 
 [dependencies.pallet-im-online]
-path = "../substrate/frame/im-online"
 default-features = false
 optional = true
+path = "../substrate/frame/im-online"
 
 [dependencies.pallet-indices]
-path = "../substrate/frame/indices"
 default-features = false
 optional = true
+path = "../substrate/frame/indices"
 
 [dependencies.pallet-insecure-randomness-collective-flip]
-path = "../substrate/frame/insecure-randomness-collective-flip"
 default-features = false
 optional = true
+path = "../substrate/frame/insecure-randomness-collective-flip"
 
 [dependencies.pallet-lottery]
-path = "../substrate/frame/lottery"
 default-features = false
 optional = true
+path = "../substrate/frame/lottery"
 
 [dependencies.pallet-membership]
-path = "../substrate/frame/membership"
 default-features = false
 optional = true
+path = "../substrate/frame/membership"
 
 [dependencies.pallet-message-queue]
-path = "../substrate/frame/message-queue"
 default-features = false
 optional = true
+path = "../substrate/frame/message-queue"
 
 [dependencies.pallet-migrations]
-path = "../substrate/frame/migrations"
 default-features = false
 optional = true
+path = "../substrate/frame/migrations"
 
 [dependencies.pallet-mixnet]
-path = "../substrate/frame/mixnet"
 default-features = false
 optional = true
+path = "../substrate/frame/mixnet"
 
 [dependencies.pallet-mmr]
-path = "../substrate/frame/merkle-mountain-range"
 default-features = false
 optional = true
+path = "../substrate/frame/merkle-mountain-range"
 
 [dependencies.pallet-multisig]
-path = "../substrate/frame/multisig"
 default-features = false
 optional = true
+path = "../substrate/frame/multisig"
 
 [dependencies.pallet-nft-fractionalization]
-path = "../substrate/frame/nft-fractionalization"
 default-features = false
 optional = true
+path = "../substrate/frame/nft-fractionalization"
 
 [dependencies.pallet-nfts]
-path = "../substrate/frame/nfts"
 default-features = false
 optional = true
+path = "../substrate/frame/nfts"
 
 [dependencies.pallet-nfts-runtime-api]
-path = "../substrate/frame/nfts/runtime-api"
 default-features = false
 optional = true
+path = "../substrate/frame/nfts/runtime-api"
 
 [dependencies.pallet-nis]
-path = "../substrate/frame/nis"
 default-features = false
 optional = true
+path = "../substrate/frame/nis"
 
 [dependencies.pallet-node-authorization]
-path = "../substrate/frame/node-authorization"
 default-features = false
 optional = true
+path = "../substrate/frame/node-authorization"
 
 [dependencies.pallet-nomination-pools]
-path = "../substrate/frame/nomination-pools"
 default-features = false
 optional = true
+path = "../substrate/frame/nomination-pools"
 
 [dependencies.pallet-nomination-pools-benchmarking]
-path = "../substrate/frame/nomination-pools/benchmarking"
 default-features = false
 optional = true
+path = "../substrate/frame/nomination-pools/benchmarking"
 
 [dependencies.pallet-nomination-pools-runtime-api]
-path = "../substrate/frame/nomination-pools/runtime-api"
 default-features = false
 optional = true
+path = "../substrate/frame/nomination-pools/runtime-api"
 
 [dependencies.pallet-offences]
-path = "../substrate/frame/offences"
 default-features = false
 optional = true
+path = "../substrate/frame/offences"
 
 [dependencies.pallet-offences-benchmarking]
-path = "../substrate/frame/offences/benchmarking"
 default-features = false
 optional = true
+path = "../substrate/frame/offences/benchmarking"
 
 [dependencies.pallet-paged-list]
-path = "../substrate/frame/paged-list"
 default-features = false
 optional = true
+path = "../substrate/frame/paged-list"
 
 [dependencies.pallet-parameters]
-path = "../substrate/frame/parameters"
 default-features = false
 optional = true
+path = "../substrate/frame/parameters"
 
 [dependencies.pallet-preimage]
-path = "../substrate/frame/preimage"
 default-features = false
 optional = true
+path = "../substrate/frame/preimage"
 
 [dependencies.pallet-proxy]
-path = "../substrate/frame/proxy"
 default-features = false
 optional = true
+path = "../substrate/frame/proxy"
 
 [dependencies.pallet-ranked-collective]
-path = "../substrate/frame/ranked-collective"
 default-features = false
 optional = true
+path = "../substrate/frame/ranked-collective"
 
 [dependencies.pallet-recovery]
-path = "../substrate/frame/recovery"
 default-features = false
 optional = true
+path = "../substrate/frame/recovery"
 
 [dependencies.pallet-referenda]
-path = "../substrate/frame/referenda"
 default-features = false
 optional = true
+path = "../substrate/frame/referenda"
 
 [dependencies.pallet-remark]
-path = "../substrate/frame/remark"
 default-features = false
 optional = true
+path = "../substrate/frame/remark"
 
 [dependencies.pallet-revive]
-path = "../substrate/frame/revive"
 default-features = false
 optional = true
+path = "../substrate/frame/revive"
 
 [dependencies.pallet-revive-proc-macro]
-path = "../substrate/frame/revive/proc-macro"
 default-features = false
 optional = true
+path = "../substrate/frame/revive/proc-macro"
 
 [dependencies.pallet-revive-uapi]
-path = "../substrate/frame/revive/uapi"
 default-features = false
 optional = true
+path = "../substrate/frame/revive/uapi"
 
 [dependencies.pallet-root-offences]
-path = "../substrate/frame/root-offences"
 default-features = false
 optional = true
+path = "../substrate/frame/root-offences"
 
 [dependencies.pallet-root-testing]
-path = "../substrate/frame/root-testing"
 default-features = false
 optional = true
+path = "../substrate/frame/root-testing"
 
 [dependencies.pallet-safe-mode]
-path = "../substrate/frame/safe-mode"
 default-features = false
 optional = true
+path = "../substrate/frame/safe-mode"
 
 [dependencies.pallet-salary]
-path = "../substrate/frame/salary"
 default-features = false
 optional = true
+path = "../substrate/frame/salary"
 
 [dependencies.pallet-scheduler]
-path = "../substrate/frame/scheduler"
 default-features = false
 optional = true
+path = "../substrate/frame/scheduler"
 
 [dependencies.pallet-scored-pool]
-path = "../substrate/frame/scored-pool"
 default-features = false
 optional = true
+path = "../substrate/frame/scored-pool"
 
 [dependencies.pallet-session]
-path = "../substrate/frame/session"
 default-features = false
 optional = true
+path = "../substrate/frame/session"
 
 [dependencies.pallet-session-benchmarking]
-path = "../substrate/frame/session/benchmarking"
 default-features = false
 optional = true
+path = "../substrate/frame/session/benchmarking"
 
 [dependencies.pallet-skip-feeless-payment]
-path = "../substrate/frame/transaction-payment/skip-feeless-payment"
 default-features = false
 optional = true
+path = "../substrate/frame/transaction-payment/skip-feeless-payment"
 
 [dependencies.pallet-society]
-path = "../substrate/frame/society"
 default-features = false
 optional = true
+path = "../substrate/frame/society"
 
 [dependencies.pallet-staking]
-path = "../substrate/frame/staking"
 default-features = false
 optional = true
+path = "../substrate/frame/staking"
 
 [dependencies.pallet-staking-reward-curve]
-path = "../substrate/frame/staking/reward-curve"
 default-features = false
 optional = true
+path = "../substrate/frame/staking/reward-curve"
 
 [dependencies.pallet-staking-reward-fn]
-path = "../substrate/frame/staking/reward-fn"
 default-features = false
 optional = true
+path = "../substrate/frame/staking/reward-fn"
 
 [dependencies.pallet-staking-runtime-api]
-path = "../substrate/frame/staking/runtime-api"
 default-features = false
 optional = true
+path = "../substrate/frame/staking/runtime-api"
 
 [dependencies.pallet-state-trie-migration]
-path = "../substrate/frame/state-trie-migration"
 default-features = false
 optional = true
+path = "../substrate/frame/state-trie-migration"
 
 [dependencies.pallet-statement]
-path = "../substrate/frame/statement"
 default-features = false
 optional = true
+path = "../substrate/frame/statement"
 
 [dependencies.pallet-sudo]
-path = "../substrate/frame/sudo"
 default-features = false
 optional = true
+path = "../substrate/frame/sudo"
 
 [dependencies.pallet-timestamp]
-path = "../substrate/frame/timestamp"
 default-features = false
 optional = true
+path = "../substrate/frame/timestamp"
 
 [dependencies.pallet-tips]
-path = "../substrate/frame/tips"
 default-features = false
 optional = true
+path = "../substrate/frame/tips"
 
 [dependencies.pallet-transaction-payment]
-path = "../substrate/frame/transaction-payment"
 default-features = false
 optional = true
+path = "../substrate/frame/transaction-payment"
 
 [dependencies.pallet-transaction-payment-rpc-runtime-api]
-path = "../substrate/frame/transaction-payment/rpc/runtime-api"
 default-features = false
 optional = true
+path = "../substrate/frame/transaction-payment/rpc/runtime-api"
 
 [dependencies.pallet-transaction-storage]
-path = "../substrate/frame/transaction-storage"
 default-features = false
 optional = true
+path = "../substrate/frame/transaction-storage"
 
 [dependencies.pallet-treasury]
-path = "../substrate/frame/treasury"
 default-features = false
 optional = true
+path = "../substrate/frame/treasury"
 
 [dependencies.pallet-tx-pause]
-path = "../substrate/frame/tx-pause"
 default-features = false
 optional = true
+path = "../substrate/frame/tx-pause"
 
 [dependencies.pallet-uniques]
-path = "../substrate/frame/uniques"
 default-features = false
 optional = true
+path = "../substrate/frame/uniques"
 
 [dependencies.pallet-utility]
-path = "../substrate/frame/utility"
 default-features = false
 optional = true
+path = "../substrate/frame/utility"
 
 [dependencies.pallet-verify-signature]
-path = "../substrate/frame/verify-signature"
 default-features = false
 optional = true
+path = "../substrate/frame/verify-signature"
 
 [dependencies.pallet-vesting]
-path = "../substrate/frame/vesting"
 default-features = false
 optional = true
+path = "../substrate/frame/vesting"
 
 [dependencies.pallet-whitelist]
-path = "../substrate/frame/whitelist"
 default-features = false
 optional = true
+path = "../substrate/frame/whitelist"
 
 [dependencies.pallet-xcm]
-path = "../polkadot/xcm/pallet-xcm"
 default-features = false
 optional = true
+path = "../polkadot/xcm/pallet-xcm"
 
 [dependencies.pallet-xcm-benchmarks]
-path = "../polkadot/xcm/pallet-xcm-benchmarks"
 default-features = false
 optional = true
+path = "../polkadot/xcm/pallet-xcm-benchmarks"
 
 [dependencies.pallet-xcm-bridge-hub]
-path = "../bridges/modules/xcm-bridge-hub"
 default-features = false
 optional = true
+path = "../bridges/modules/xcm-bridge-hub"
 
 [dependencies.pallet-xcm-bridge-hub-router]
-path = "../bridges/modules/xcm-bridge-hub-router"
 default-features = false
 optional = true
+path = "../bridges/modules/xcm-bridge-hub-router"
 
 [dependencies.parachains-common]
-path = "../cumulus/parachains/common"
 default-features = false
 optional = true
+path = "../cumulus/parachains/common"
 
 [dependencies.polkadot-core-primitives]
-path = "../polkadot/core-primitives"
 default-features = false
 optional = true
+path = "../polkadot/core-primitives"
 
 [dependencies.polkadot-parachain-primitives]
-path = "../polkadot/parachain"
 default-features = false
 optional = true
+path = "../polkadot/parachain"
 
 [dependencies.polkadot-primitives]
-path = "../polkadot/primitives"
 default-features = false
 optional = true
+path = "../polkadot/primitives"
 
 [dependencies.polkadot-runtime-common]
-path = "../polkadot/runtime/common"
 default-features = false
 optional = true
+path = "../polkadot/runtime/common"
 
 [dependencies.polkadot-runtime-metrics]
-path = "../polkadot/runtime/metrics"
 default-features = false
 optional = true
+path = "../polkadot/runtime/metrics"
 
 [dependencies.polkadot-runtime-parachains]
-path = "../polkadot/runtime/parachains"
 default-features = false
 optional = true
+path = "../polkadot/runtime/parachains"
 
 [dependencies.polkadot-sdk-frame]
-path = "../substrate/frame"
 default-features = false
 optional = true
+path = "../substrate/frame"
 
 [dependencies.sc-chain-spec-derive]
-path = "../substrate/client/chain-spec/derive"
 default-features = false
 optional = true
+path = "../substrate/client/chain-spec/derive"
 
 [dependencies.sc-tracing-proc-macro]
-path = "../substrate/client/tracing/proc-macro"
 default-features = false
 optional = true
+path = "../substrate/client/tracing/proc-macro"
 
 [dependencies.slot-range-helper]
-path = "../polkadot/runtime/common/slot_range_helper"
 default-features = false
 optional = true
+path = "../polkadot/runtime/common/slot_range_helper"
 
 [dependencies.snowbridge-beacon-primitives]
-path = "../bridges/snowbridge/primitives/beacon"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/primitives/beacon"
 
 [dependencies.snowbridge-core]
-path = "../bridges/snowbridge/primitives/core"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/primitives/core"
 
 [dependencies.snowbridge-ethereum]
-path = "../bridges/snowbridge/primitives/ethereum"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/primitives/ethereum"
 
 [dependencies.snowbridge-outbound-queue-merkle-tree]
-path = "../bridges/snowbridge/pallets/outbound-queue/merkle-tree"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/pallets/outbound-queue/merkle-tree"
 
 [dependencies.snowbridge-outbound-queue-runtime-api]
-path = "../bridges/snowbridge/pallets/outbound-queue/runtime-api"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/pallets/outbound-queue/runtime-api"
 
 [dependencies.snowbridge-pallet-ethereum-client]
-path = "../bridges/snowbridge/pallets/ethereum-client"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/pallets/ethereum-client"
 
 [dependencies.snowbridge-pallet-ethereum-client-fixtures]
-path = "../bridges/snowbridge/pallets/ethereum-client/fixtures"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/pallets/ethereum-client/fixtures"
 
 [dependencies.snowbridge-pallet-inbound-queue]
-path = "../bridges/snowbridge/pallets/inbound-queue"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/pallets/inbound-queue"
 
 [dependencies.snowbridge-pallet-inbound-queue-fixtures]
-path = "../bridges/snowbridge/pallets/inbound-queue/fixtures"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/pallets/inbound-queue/fixtures"
 
 [dependencies.snowbridge-pallet-outbound-queue]
-path = "../bridges/snowbridge/pallets/outbound-queue"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/pallets/outbound-queue"
 
 [dependencies.snowbridge-pallet-system]
-path = "../bridges/snowbridge/pallets/system"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/pallets/system"
 
 [dependencies.snowbridge-router-primitives]
-path = "../bridges/snowbridge/primitives/router"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/primitives/router"
 
 [dependencies.snowbridge-runtime-common]
-path = "../bridges/snowbridge/runtime/runtime-common"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/runtime/runtime-common"
 
 [dependencies.snowbridge-system-runtime-api]
-path = "../bridges/snowbridge/pallets/system/runtime-api"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/pallets/system/runtime-api"
 
 [dependencies.sp-api]
-path = "../substrate/primitives/api"
 default-features = false
 optional = true
+path = "../substrate/primitives/api"
 
 [dependencies.sp-api-proc-macro]
-path = "../substrate/primitives/api/proc-macro"
 default-features = false
 optional = true
+path = "../substrate/primitives/api/proc-macro"
 
 [dependencies.sp-application-crypto]
-path = "../substrate/primitives/application-crypto"
 default-features = false
 optional = true
+path = "../substrate/primitives/application-crypto"
 
 [dependencies.sp-arithmetic]
-path = "../substrate/primitives/arithmetic"
 default-features = false
 optional = true
+path = "../substrate/primitives/arithmetic"
 
 [dependencies.sp-authority-discovery]
-path = "../substrate/primitives/authority-discovery"
 default-features = false
 optional = true
+path = "../substrate/primitives/authority-discovery"
 
 [dependencies.sp-block-builder]
-path = "../substrate/primitives/block-builder"
 default-features = false
 optional = true
+path = "../substrate/primitives/block-builder"
 
 [dependencies.sp-consensus-aura]
-path = "../substrate/primitives/consensus/aura"
 default-features = false
 optional = true
+path = "../substrate/primitives/consensus/aura"
 
 [dependencies.sp-consensus-babe]
-path = "../substrate/primitives/consensus/babe"
 default-features = false
 optional = true
+path = "../substrate/primitives/consensus/babe"
 
 [dependencies.sp-consensus-beefy]
-path = "../substrate/primitives/consensus/beefy"
 default-features = false
 optional = true
+path = "../substrate/primitives/consensus/beefy"
 
 [dependencies.sp-consensus-grandpa]
-path = "../substrate/primitives/consensus/grandpa"
 default-features = false
 optional = true
+path = "../substrate/primitives/consensus/grandpa"
 
 [dependencies.sp-consensus-pow]
-path = "../substrate/primitives/consensus/pow"
 default-features = false
 optional = true
+path = "../substrate/primitives/consensus/pow"
 
 [dependencies.sp-consensus-slots]
-path = "../substrate/primitives/consensus/slots"
 default-features = false
 optional = true
+path = "../substrate/primitives/consensus/slots"
 
 [dependencies.sp-core]
-path = "../substrate/primitives/core"
 default-features = false
 optional = true
+path = "../substrate/primitives/core"
 
 [dependencies.sp-crypto-ec-utils]
-path = "../substrate/primitives/crypto/ec-utils"
 default-features = false
 optional = true
+path = "../substrate/primitives/crypto/ec-utils"
 
 [dependencies.sp-crypto-hashing]
-path = "../substrate/primitives/crypto/hashing"
 default-features = false
 optional = true
+path = "../substrate/primitives/crypto/hashing"
 
 [dependencies.sp-crypto-hashing-proc-macro]
-path = "../substrate/primitives/crypto/hashing/proc-macro"
 default-features = false
 optional = true
+path = "../substrate/primitives/crypto/hashing/proc-macro"
 
 [dependencies.sp-debug-derive]
-path = "../substrate/primitives/debug-derive"
 default-features = false
 optional = true
+path = "../substrate/primitives/debug-derive"
 
 [dependencies.sp-externalities]
-path = "../substrate/primitives/externalities"
 default-features = false
 optional = true
+path = "../substrate/primitives/externalities"
 
 [dependencies.sp-genesis-builder]
-path = "../substrate/primitives/genesis-builder"
 default-features = false
 optional = true
+path = "../substrate/primitives/genesis-builder"
 
 [dependencies.sp-inherents]
-path = "../substrate/primitives/inherents"
 default-features = false
 optional = true
+path = "../substrate/primitives/inherents"
 
 [dependencies.sp-io]
-path = "../substrate/primitives/io"
 default-features = false
 optional = true
+path = "../substrate/primitives/io"
 
 [dependencies.sp-keyring]
-path = "../substrate/primitives/keyring"
 default-features = false
 optional = true
+path = "../substrate/primitives/keyring"
 
 [dependencies.sp-keystore]
-path = "../substrate/primitives/keystore"
 default-features = false
 optional = true
+path = "../substrate/primitives/keystore"
 
 [dependencies.sp-metadata-ir]
-path = "../substrate/primitives/metadata-ir"
 default-features = false
 optional = true
+path = "../substrate/primitives/metadata-ir"
 
 [dependencies.sp-mixnet]
-path = "../substrate/primitives/mixnet"
 default-features = false
 optional = true
+path = "../substrate/primitives/mixnet"
 
 [dependencies.sp-mmr-primitives]
-path = "../substrate/primitives/merkle-mountain-range"
 default-features = false
 optional = true
+path = "../substrate/primitives/merkle-mountain-range"
 
 [dependencies.sp-npos-elections]
-path = "../substrate/primitives/npos-elections"
 default-features = false
 optional = true
+path = "../substrate/primitives/npos-elections"
 
 [dependencies.sp-offchain]
-path = "../substrate/primitives/offchain"
 default-features = false
 optional = true
+path = "../substrate/primitives/offchain"
 
 [dependencies.sp-runtime]
-path = "../substrate/primitives/runtime"
 default-features = false
 optional = true
+path = "../substrate/primitives/runtime"
 
 [dependencies.sp-runtime-interface]
-path = "../substrate/primitives/runtime-interface"
 default-features = false
 optional = true
+path = "../substrate/primitives/runtime-interface"
 
 [dependencies.sp-runtime-interface-proc-macro]
-path = "../substrate/primitives/runtime-interface/proc-macro"
 default-features = false
 optional = true
+path = "../substrate/primitives/runtime-interface/proc-macro"
 
 [dependencies.sp-session]
-path = "../substrate/primitives/session"
 default-features = false
 optional = true
+path = "../substrate/primitives/session"
 
 [dependencies.sp-staking]
-path = "../substrate/primitives/staking"
 default-features = false
 optional = true
+path = "../substrate/primitives/staking"
 
 [dependencies.sp-state-machine]
-path = "../substrate/primitives/state-machine"
 default-features = false
 optional = true
+path = "../substrate/primitives/state-machine"
 
 [dependencies.sp-statement-store]
-path = "../substrate/primitives/statement-store"
 default-features = false
 optional = true
+path = "../substrate/primitives/statement-store"
 
 [dependencies.sp-std]
-path = "../substrate/primitives/std"
 default-features = false
 optional = true
+path = "../substrate/primitives/std"
 
 [dependencies.sp-storage]
-path = "../substrate/primitives/storage"
 default-features = false
 optional = true
+path = "../substrate/primitives/storage"
 
 [dependencies.sp-timestamp]
-path = "../substrate/primitives/timestamp"
 default-features = false
 optional = true
+path = "../substrate/primitives/timestamp"
 
 [dependencies.sp-tracing]
-path = "../substrate/primitives/tracing"
 default-features = false
 optional = true
+path = "../substrate/primitives/tracing"
 
 [dependencies.sp-transaction-pool]
-path = "../substrate/primitives/transaction-pool"
 default-features = false
 optional = true
+path = "../substrate/primitives/transaction-pool"
 
 [dependencies.sp-transaction-storage-proof]
-path = "../substrate/primitives/transaction-storage-proof"
 default-features = false
 optional = true
+path = "../substrate/primitives/transaction-storage-proof"
 
 [dependencies.sp-trie]
-path = "../substrate/primitives/trie"
 default-features = false
 optional = true
+path = "../substrate/primitives/trie"
 
 [dependencies.sp-version]
-path = "../substrate/primitives/version"
 default-features = false
 optional = true
+path = "../substrate/primitives/version"
 
 [dependencies.sp-version-proc-macro]
-path = "../substrate/primitives/version/proc-macro"
 default-features = false
 optional = true
+path = "../substrate/primitives/version/proc-macro"
 
 [dependencies.sp-wasm-interface]
-path = "../substrate/primitives/wasm-interface"
 default-features = false
 optional = true
+path = "../substrate/primitives/wasm-interface"
 
 [dependencies.sp-weights]
-path = "../substrate/primitives/weights"
 default-features = false
 optional = true
+path = "../substrate/primitives/weights"
 
 [dependencies.staging-parachain-info]
-path = "../cumulus/parachains/pallets/parachain-info"
 default-features = false
 optional = true
+path = "../cumulus/parachains/pallets/parachain-info"
 
 [dependencies.staging-xcm]
-path = "../polkadot/xcm"
 default-features = false
 optional = true
+path = "../polkadot/xcm"
 
 [dependencies.staging-xcm-builder]
-path = "../polkadot/xcm/xcm-builder"
 default-features = false
 optional = true
+path = "../polkadot/xcm/xcm-builder"
 
 [dependencies.staging-xcm-executor]
-path = "../polkadot/xcm/xcm-executor"
 default-features = false
 optional = true
+path = "../polkadot/xcm/xcm-executor"
 
 [dependencies.substrate-bip39]
-path = "../substrate/utils/substrate-bip39"
 default-features = false
 optional = true
+path = "../substrate/utils/substrate-bip39"
 
 [dependencies.testnet-parachains-constants]
-path = "../cumulus/parachains/runtimes/constants"
 default-features = false
 optional = true
+path = "../cumulus/parachains/runtimes/constants"
 
 [dependencies.tracing-gum-proc-macro]
-path = "../polkadot/node/gum/proc-macro"
 default-features = false
 optional = true
+path = "../polkadot/node/gum/proc-macro"
 
 [dependencies.xcm-procedural]
-path = "../polkadot/xcm/procedural"
 default-features = false
 optional = true
+path = "../polkadot/xcm/procedural"
 
 [dependencies.xcm-runtime-apis]
-path = "../polkadot/xcm/xcm-runtime-apis"
 default-features = false
 optional = true
+path = "../polkadot/xcm/xcm-runtime-apis"
 
 [dependencies.asset-test-utils]
-path = "../cumulus/parachains/runtimes/assets/test-utils"
 default-features = false
 optional = true
+path = "../cumulus/parachains/runtimes/assets/test-utils"
 
 [dependencies.bridge-hub-test-utils]
-path = "../cumulus/parachains/runtimes/bridge-hubs/test-utils"
 default-features = false
 optional = true
+path = "../cumulus/parachains/runtimes/bridge-hubs/test-utils"
 
 [dependencies.cumulus-client-cli]
-path = "../cumulus/client/cli"
 default-features = false
 optional = true
+path = "../cumulus/client/cli"
 
 [dependencies.cumulus-client-collator]
-path = "../cumulus/client/collator"
 default-features = false
 optional = true
+path = "../cumulus/client/collator"
 
 [dependencies.cumulus-client-consensus-aura]
-path = "../cumulus/client/consensus/aura"
 default-features = false
 optional = true
+path = "../cumulus/client/consensus/aura"
 
 [dependencies.cumulus-client-consensus-common]
-path = "../cumulus/client/consensus/common"
 default-features = false
 optional = true
+path = "../cumulus/client/consensus/common"
 
 [dependencies.cumulus-client-consensus-proposer]
-path = "../cumulus/client/consensus/proposer"
 default-features = false
 optional = true
+path = "../cumulus/client/consensus/proposer"
 
 [dependencies.cumulus-client-consensus-relay-chain]
-path = "../cumulus/client/consensus/relay-chain"
 default-features = false
 optional = true
+path = "../cumulus/client/consensus/relay-chain"
 
 [dependencies.cumulus-client-network]
-path = "../cumulus/client/network"
 default-features = false
 optional = true
+path = "../cumulus/client/network"
 
 [dependencies.cumulus-client-parachain-inherent]
-path = "../cumulus/client/parachain-inherent"
 default-features = false
 optional = true
+path = "../cumulus/client/parachain-inherent"
 
 [dependencies.cumulus-client-pov-recovery]
-path = "../cumulus/client/pov-recovery"
 default-features = false
 optional = true
+path = "../cumulus/client/pov-recovery"
 
 [dependencies.cumulus-client-service]
-path = "../cumulus/client/service"
 default-features = false
 optional = true
+path = "../cumulus/client/service"
 
 [dependencies.cumulus-relay-chain-inprocess-interface]
-path = "../cumulus/client/relay-chain-inprocess-interface"
 default-features = false
 optional = true
+path = "../cumulus/client/relay-chain-inprocess-interface"
 
 [dependencies.cumulus-relay-chain-interface]
-path = "../cumulus/client/relay-chain-interface"
 default-features = false
 optional = true
+path = "../cumulus/client/relay-chain-interface"
 
 [dependencies.cumulus-relay-chain-minimal-node]
-path = "../cumulus/client/relay-chain-minimal-node"
 default-features = false
 optional = true
+path = "../cumulus/client/relay-chain-minimal-node"
 
 [dependencies.cumulus-relay-chain-rpc-interface]
-path = "../cumulus/client/relay-chain-rpc-interface"
 default-features = false
 optional = true
+path = "../cumulus/client/relay-chain-rpc-interface"
 
 [dependencies.cumulus-test-relay-sproof-builder]
-path = "../cumulus/test/relay-sproof-builder"
 default-features = false
 optional = true
+path = "../cumulus/test/relay-sproof-builder"
 
 [dependencies.emulated-integration-tests-common]
-path = "../cumulus/parachains/integration-tests/emulated/common"
 default-features = false
 optional = true
+path = "../cumulus/parachains/integration-tests/emulated/common"
 
 [dependencies.fork-tree]
-path = "../substrate/utils/fork-tree"
 default-features = false
 optional = true
+path = "../substrate/utils/fork-tree"
 
 [dependencies.frame-benchmarking-cli]
-path = "../substrate/utils/frame/benchmarking-cli"
 default-features = false
 optional = true
+path = "../substrate/utils/frame/benchmarking-cli"
 
 [dependencies.frame-remote-externalities]
-path = "../substrate/utils/frame/remote-externalities"
 default-features = false
 optional = true
+path = "../substrate/utils/frame/remote-externalities"
 
 [dependencies.frame-support-procedural-tools]
-path = "../substrate/frame/support/procedural/tools"
 default-features = false
 optional = true
+path = "../substrate/frame/support/procedural/tools"
 
 [dependencies.generate-bags]
-path = "../substrate/utils/frame/generate-bags"
 default-features = false
 optional = true
+path = "../substrate/utils/frame/generate-bags"
 
 [dependencies.mmr-gadget]
-path = "../substrate/client/merkle-mountain-range"
 default-features = false
 optional = true
+path = "../substrate/client/merkle-mountain-range"
 
 [dependencies.mmr-rpc]
-path = "../substrate/client/merkle-mountain-range/rpc"
 default-features = false
 optional = true
+path = "../substrate/client/merkle-mountain-range/rpc"
 
 [dependencies.pallet-contracts-mock-network]
-path = "../substrate/frame/contracts/mock-network"
 default-features = false
 optional = true
+path = "../substrate/frame/contracts/mock-network"
 
 [dependencies.pallet-revive-eth-rpc]
-path = "../substrate/frame/revive/rpc"
 default-features = false
 optional = true
+path = "../substrate/frame/revive/rpc"
 
 [dependencies.pallet-revive-mock-network]
-path = "../substrate/frame/revive/mock-network"
 default-features = false
 optional = true
+path = "../substrate/frame/revive/mock-network"
 
 [dependencies.pallet-transaction-payment-rpc]
-path = "../substrate/frame/transaction-payment/rpc"
 default-features = false
 optional = true
+path = "../substrate/frame/transaction-payment/rpc"
 
 [dependencies.parachains-runtimes-test-utils]
-path = "../cumulus/parachains/runtimes/test-utils"
 default-features = false
 optional = true
+path = "../cumulus/parachains/runtimes/test-utils"
 
 [dependencies.polkadot-approval-distribution]
-path = "../polkadot/node/network/approval-distribution"
 default-features = false
 optional = true
+path = "../polkadot/node/network/approval-distribution"
 
 [dependencies.polkadot-availability-bitfield-distribution]
-path = "../polkadot/node/network/bitfield-distribution"
 default-features = false
 optional = true
+path = "../polkadot/node/network/bitfield-distribution"
 
 [dependencies.polkadot-availability-distribution]
-path = "../polkadot/node/network/availability-distribution"
 default-features = false
 optional = true
+path = "../polkadot/node/network/availability-distribution"
 
 [dependencies.polkadot-availability-recovery]
-path = "../polkadot/node/network/availability-recovery"
 default-features = false
 optional = true
+path = "../polkadot/node/network/availability-recovery"
 
 [dependencies.polkadot-cli]
-path = "../polkadot/cli"
 default-features = false
 optional = true
+path = "../polkadot/cli"
 
 [dependencies.polkadot-collator-protocol]
-path = "../polkadot/node/network/collator-protocol"
 default-features = false
 optional = true
+path = "../polkadot/node/network/collator-protocol"
 
 [dependencies.polkadot-dispute-distribution]
-path = "../polkadot/node/network/dispute-distribution"
 default-features = false
 optional = true
+path = "../polkadot/node/network/dispute-distribution"
 
 [dependencies.polkadot-erasure-coding]
-path = "../polkadot/erasure-coding"
 default-features = false
 optional = true
+path = "../polkadot/erasure-coding"
 
 [dependencies.polkadot-gossip-support]
-path = "../polkadot/node/network/gossip-support"
 default-features = false
 optional = true
+path = "../polkadot/node/network/gossip-support"
 
 [dependencies.polkadot-network-bridge]
-path = "../polkadot/node/network/bridge"
 default-features = false
 optional = true
+path = "../polkadot/node/network/bridge"
 
 [dependencies.polkadot-node-collation-generation]
-path = "../polkadot/node/collation-generation"
 default-features = false
 optional = true
+path = "../polkadot/node/collation-generation"
 
 [dependencies.polkadot-node-core-approval-voting]
-path = "../polkadot/node/core/approval-voting"
 default-features = false
 optional = true
+path = "../polkadot/node/core/approval-voting"
 
 [dependencies.polkadot-node-core-approval-voting-parallel]
-path = "../polkadot/node/core/approval-voting-parallel"
 default-features = false
 optional = true
+path = "../polkadot/node/core/approval-voting-parallel"
 
 [dependencies.polkadot-node-core-av-store]
-path = "../polkadot/node/core/av-store"
 default-features = false
 optional = true
+path = "../polkadot/node/core/av-store"
 
 [dependencies.polkadot-node-core-backing]
-path = "../polkadot/node/core/backing"
 default-features = false
 optional = true
+path = "../polkadot/node/core/backing"
 
 [dependencies.polkadot-node-core-bitfield-signing]
-path = "../polkadot/node/core/bitfield-signing"
 default-features = false
 optional = true
+path = "../polkadot/node/core/bitfield-signing"
 
 [dependencies.polkadot-node-core-candidate-validation]
-path = "../polkadot/node/core/candidate-validation"
 default-features = false
 optional = true
+path = "../polkadot/node/core/candidate-validation"
 
 [dependencies.polkadot-node-core-chain-api]
-path = "../polkadot/node/core/chain-api"
 default-features = false
 optional = true
+path = "../polkadot/node/core/chain-api"
 
 [dependencies.polkadot-node-core-chain-selection]
-path = "../polkadot/node/core/chain-selection"
 default-features = false
 optional = true
+path = "../polkadot/node/core/chain-selection"
 
 [dependencies.polkadot-node-core-dispute-coordinator]
-path = "../polkadot/node/core/dispute-coordinator"
 default-features = false
 optional = true
+path = "../polkadot/node/core/dispute-coordinator"
 
 [dependencies.polkadot-node-core-parachains-inherent]
-path = "../polkadot/node/core/parachains-inherent"
 default-features = false
 optional = true
+path = "../polkadot/node/core/parachains-inherent"
 
 [dependencies.polkadot-node-core-prospective-parachains]
-path = "../polkadot/node/core/prospective-parachains"
 default-features = false
 optional = true
+path = "../polkadot/node/core/prospective-parachains"
 
 [dependencies.polkadot-node-core-provisioner]
-path = "../polkadot/node/core/provisioner"
 default-features = false
 optional = true
+path = "../polkadot/node/core/provisioner"
 
 [dependencies.polkadot-node-core-pvf]
-path = "../polkadot/node/core/pvf"
 default-features = false
 optional = true
+path = "../polkadot/node/core/pvf"
 
 [dependencies.polkadot-node-core-pvf-checker]
-path = "../polkadot/node/core/pvf-checker"
 default-features = false
 optional = true
+path = "../polkadot/node/core/pvf-checker"
 
 [dependencies.polkadot-node-core-pvf-common]
-path = "../polkadot/node/core/pvf/common"
 default-features = false
 optional = true
+path = "../polkadot/node/core/pvf/common"
 
 [dependencies.polkadot-node-core-pvf-execute-worker]
-path = "../polkadot/node/core/pvf/execute-worker"
 default-features = false
 optional = true
+path = "../polkadot/node/core/pvf/execute-worker"
 
 [dependencies.polkadot-node-core-pvf-prepare-worker]
-path = "../polkadot/node/core/pvf/prepare-worker"
 default-features = false
 optional = true
+path = "../polkadot/node/core/pvf/prepare-worker"
 
 [dependencies.polkadot-node-core-runtime-api]
-path = "../polkadot/node/core/runtime-api"
 default-features = false
 optional = true
+path = "../polkadot/node/core/runtime-api"
 
 [dependencies.polkadot-node-metrics]
-path = "../polkadot/node/metrics"
 default-features = false
 optional = true
+path = "../polkadot/node/metrics"
 
 [dependencies.polkadot-node-network-protocol]
-path = "../polkadot/node/network/protocol"
 default-features = false
 optional = true
+path = "../polkadot/node/network/protocol"
 
 [dependencies.polkadot-node-primitives]
-path = "../polkadot/node/primitives"
 default-features = false
 optional = true
+path = "../polkadot/node/primitives"
 
 [dependencies.polkadot-node-subsystem]
-path = "../polkadot/node/subsystem"
 default-features = false
 optional = true
+path = "../polkadot/node/subsystem"
 
 [dependencies.polkadot-node-subsystem-types]
-path = "../polkadot/node/subsystem-types"
 default-features = false
 optional = true
+path = "../polkadot/node/subsystem-types"
 
 [dependencies.polkadot-node-subsystem-util]
-path = "../polkadot/node/subsystem-util"
 default-features = false
 optional = true
+path = "../polkadot/node/subsystem-util"
 
 [dependencies.polkadot-omni-node-lib]
-path = "../cumulus/polkadot-omni-node/lib"
 default-features = false
 optional = true
+path = "../cumulus/polkadot-omni-node/lib"
 
 [dependencies.polkadot-overseer]
-path = "../polkadot/node/overseer"
 default-features = false
 optional = true
+path = "../polkadot/node/overseer"
 
 [dependencies.polkadot-rpc]
-path = "../polkadot/rpc"
 default-features = false
 optional = true
+path = "../polkadot/rpc"
 
 [dependencies.polkadot-service]
-path = "../polkadot/node/service"
 default-features = false
 optional = true
+path = "../polkadot/node/service"
 
 [dependencies.polkadot-statement-distribution]
-path = "../polkadot/node/network/statement-distribution"
 default-features = false
 optional = true
+path = "../polkadot/node/network/statement-distribution"
 
 [dependencies.polkadot-statement-table]
-path = "../polkadot/statement-table"
 default-features = false
 optional = true
+path = "../polkadot/statement-table"
 
 [dependencies.sc-allocator]
-path = "../substrate/client/allocator"
 default-features = false
 optional = true
+path = "../substrate/client/allocator"
 
 [dependencies.sc-authority-discovery]
-path = "../substrate/client/authority-discovery"
 default-features = false
 optional = true
+path = "../substrate/client/authority-discovery"
 
 [dependencies.sc-basic-authorship]
-path = "../substrate/client/basic-authorship"
 default-features = false
 optional = true
+path = "../substrate/client/basic-authorship"
 
 [dependencies.sc-block-builder]
-path = "../substrate/client/block-builder"
 default-features = false
 optional = true
+path = "../substrate/client/block-builder"
 
 [dependencies.sc-chain-spec]
-path = "../substrate/client/chain-spec"
 default-features = false
 optional = true
+path = "../substrate/client/chain-spec"
 
 [dependencies.sc-cli]
-path = "../substrate/client/cli"
 default-features = false
 optional = true
+path = "../substrate/client/cli"
 
 [dependencies.sc-client-api]
-path = "../substrate/client/api"
 default-features = false
 optional = true
+path = "../substrate/client/api"
 
 [dependencies.sc-client-db]
-path = "../substrate/client/db"
 default-features = false
 optional = true
+path = "../substrate/client/db"
 
 [dependencies.sc-consensus]
-path = "../substrate/client/consensus/common"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/common"
 
 [dependencies.sc-consensus-aura]
-path = "../substrate/client/consensus/aura"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/aura"
 
 [dependencies.sc-consensus-babe]
-path = "../substrate/client/consensus/babe"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/babe"
 
 [dependencies.sc-consensus-babe-rpc]
-path = "../substrate/client/consensus/babe/rpc"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/babe/rpc"
 
 [dependencies.sc-consensus-beefy]
-path = "../substrate/client/consensus/beefy"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/beefy"
 
 [dependencies.sc-consensus-beefy-rpc]
-path = "../substrate/client/consensus/beefy/rpc"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/beefy/rpc"
 
 [dependencies.sc-consensus-epochs]
-path = "../substrate/client/consensus/epochs"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/epochs"
 
 [dependencies.sc-consensus-grandpa]
-path = "../substrate/client/consensus/grandpa"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/grandpa"
 
 [dependencies.sc-consensus-grandpa-rpc]
-path = "../substrate/client/consensus/grandpa/rpc"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/grandpa/rpc"
 
 [dependencies.sc-consensus-manual-seal]
-path = "../substrate/client/consensus/manual-seal"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/manual-seal"
 
 [dependencies.sc-consensus-pow]
-path = "../substrate/client/consensus/pow"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/pow"
 
 [dependencies.sc-consensus-slots]
-path = "../substrate/client/consensus/slots"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/slots"
 
 [dependencies.sc-executor]
-path = "../substrate/client/executor"
 default-features = false
 optional = true
+path = "../substrate/client/executor"
 
 [dependencies.sc-executor-common]
-path = "../substrate/client/executor/common"
 default-features = false
 optional = true
+path = "../substrate/client/executor/common"
 
 [dependencies.sc-executor-polkavm]
-path = "../substrate/client/executor/polkavm"
 default-features = false
 optional = true
+path = "../substrate/client/executor/polkavm"
 
 [dependencies.sc-executor-wasmtime]
-path = "../substrate/client/executor/wasmtime"
 default-features = false
 optional = true
+path = "../substrate/client/executor/wasmtime"
 
 [dependencies.sc-informant]
-path = "../substrate/client/informant"
 default-features = false
 optional = true
+path = "../substrate/client/informant"
 
 [dependencies.sc-keystore]
-path = "../substrate/client/keystore"
 default-features = false
 optional = true
+path = "../substrate/client/keystore"
 
 [dependencies.sc-mixnet]
-path = "../substrate/client/mixnet"
 default-features = false
 optional = true
+path = "../substrate/client/mixnet"
 
 [dependencies.sc-network]
-path = "../substrate/client/network"
 default-features = false
 optional = true
+path = "../substrate/client/network"
 
 [dependencies.sc-network-common]
-path = "../substrate/client/network/common"
 default-features = false
 optional = true
+path = "../substrate/client/network/common"
 
 [dependencies.sc-network-gossip]
-path = "../substrate/client/network-gossip"
 default-features = false
 optional = true
+path = "../substrate/client/network-gossip"
 
 [dependencies.sc-network-light]
-path = "../substrate/client/network/light"
 default-features = false
 optional = true
+path = "../substrate/client/network/light"
 
 [dependencies.sc-network-statement]
-path = "../substrate/client/network/statement"
 default-features = false
 optional = true
+path = "../substrate/client/network/statement"
 
 [dependencies.sc-network-sync]
-path = "../substrate/client/network/sync"
 default-features = false
 optional = true
+path = "../substrate/client/network/sync"
 
 [dependencies.sc-network-transactions]
-path = "../substrate/client/network/transactions"
 default-features = false
 optional = true
+path = "../substrate/client/network/transactions"
 
 [dependencies.sc-network-types]
-path = "../substrate/client/network/types"
 default-features = false
 optional = true
+path = "../substrate/client/network/types"
 
 [dependencies.sc-offchain]
-path = "../substrate/client/offchain"
 default-features = false
 optional = true
+path = "../substrate/client/offchain"
 
 [dependencies.sc-proposer-metrics]
-path = "../substrate/client/proposer-metrics"
 default-features = false
 optional = true
+path = "../substrate/client/proposer-metrics"
 
 [dependencies.sc-rpc]
-path = "../substrate/client/rpc"
 default-features = false
 optional = true
+path = "../substrate/client/rpc"
 
 [dependencies.sc-rpc-api]
-path = "../substrate/client/rpc-api"
 default-features = false
 optional = true
+path = "../substrate/client/rpc-api"
 
 [dependencies.sc-rpc-server]
-path = "../substrate/client/rpc-servers"
 default-features = false
 optional = true
+path = "../substrate/client/rpc-servers"
 
 [dependencies.sc-rpc-spec-v2]
-path = "../substrate/client/rpc-spec-v2"
 default-features = false
 optional = true
+path = "../substrate/client/rpc-spec-v2"
 
 [dependencies.sc-runtime-utilities]
-path = "../substrate/client/runtime-utilities"
 default-features = false
 optional = true
+path = "../substrate/client/runtime-utilities"
 
 [dependencies.sc-service]
-path = "../substrate/client/service"
 default-features = false
 optional = true
+path = "../substrate/client/service"
 
 [dependencies.sc-state-db]
-path = "../substrate/client/state-db"
 default-features = false
 optional = true
+path = "../substrate/client/state-db"
 
 [dependencies.sc-statement-store]
-path = "../substrate/client/statement-store"
 default-features = false
 optional = true
+path = "../substrate/client/statement-store"
 
 [dependencies.sc-storage-monitor]
-path = "../substrate/client/storage-monitor"
 default-features = false
 optional = true
+path = "../substrate/client/storage-monitor"
 
 [dependencies.sc-sync-state-rpc]
-path = "../substrate/client/sync-state-rpc"
 default-features = false
 optional = true
+path = "../substrate/client/sync-state-rpc"
 
 [dependencies.sc-sysinfo]
-path = "../substrate/client/sysinfo"
 default-features = false
 optional = true
+path = "../substrate/client/sysinfo"
 
 [dependencies.sc-telemetry]
-path = "../substrate/client/telemetry"
 default-features = false
 optional = true
+path = "../substrate/client/telemetry"
 
 [dependencies.sc-tracing]
-path = "../substrate/client/tracing"
 default-features = false
 optional = true
+path = "../substrate/client/tracing"
 
 [dependencies.sc-transaction-pool]
-path = "../substrate/client/transaction-pool"
 default-features = false
 optional = true
+path = "../substrate/client/transaction-pool"
 
 [dependencies.sc-transaction-pool-api]
-path = "../substrate/client/transaction-pool/api"
 default-features = false
 optional = true
+path = "../substrate/client/transaction-pool/api"
 
 [dependencies.sc-utils]
-path = "../substrate/client/utils"
 default-features = false
 optional = true
+path = "../substrate/client/utils"
 
 [dependencies.snowbridge-runtime-test-common]
-path = "../bridges/snowbridge/runtime/test-common"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/runtime/test-common"
 
 [dependencies.sp-blockchain]
-path = "../substrate/primitives/blockchain"
 default-features = false
 optional = true
+path = "../substrate/primitives/blockchain"
 
 [dependencies.sp-consensus]
-path = "../substrate/primitives/consensus/common"
 default-features = false
 optional = true
+path = "../substrate/primitives/consensus/common"
 
 [dependencies.sp-core-hashing]
-path = "../substrate/deprecated/hashing"
 default-features = false
 optional = true
+path = "../substrate/deprecated/hashing"
 
 [dependencies.sp-core-hashing-proc-macro]
-path = "../substrate/deprecated/hashing/proc-macro"
 default-features = false
 optional = true
+path = "../substrate/deprecated/hashing/proc-macro"
 
 [dependencies.sp-database]
-path = "../substrate/primitives/database"
 default-features = false
 optional = true
+path = "../substrate/primitives/database"
 
 [dependencies.sp-maybe-compressed-blob]
-path = "../substrate/primitives/maybe-compressed-blob"
 default-features = false
 optional = true
+path = "../substrate/primitives/maybe-compressed-blob"
 
 [dependencies.sp-panic-handler]
-path = "../substrate/primitives/panic-handler"
 default-features = false
 optional = true
+path = "../substrate/primitives/panic-handler"
 
 [dependencies.sp-rpc]
-path = "../substrate/primitives/rpc"
 default-features = false
 optional = true
+path = "../substrate/primitives/rpc"
 
 [dependencies.staging-chain-spec-builder]
-path = "../substrate/bin/utils/chain-spec-builder"
 default-features = false
 optional = true
+path = "../substrate/bin/utils/chain-spec-builder"
 
 [dependencies.staging-node-inspect]
-path = "../substrate/bin/node/inspect"
 default-features = false
 optional = true
+path = "../substrate/bin/node/inspect"
 
 [dependencies.staging-tracking-allocator]
-path = "../polkadot/node/tracking-allocator"
 default-features = false
 optional = true
+path = "../polkadot/node/tracking-allocator"
 
 [dependencies.subkey]
-path = "../substrate/bin/utils/subkey"
 default-features = false
 optional = true
+path = "../substrate/bin/utils/subkey"
 
 [dependencies.substrate-build-script-utils]
-path = "../substrate/utils/build-script-utils"
 default-features = false
 optional = true
+path = "../substrate/utils/build-script-utils"
 
 [dependencies.substrate-frame-rpc-support]
-path = "../substrate/utils/frame/rpc/support"
 default-features = false
 optional = true
+path = "../substrate/utils/frame/rpc/support"
 
 [dependencies.substrate-frame-rpc-system]
-path = "../substrate/utils/frame/rpc/system"
 default-features = false
 optional = true
+path = "../substrate/utils/frame/rpc/system"
 
 [dependencies.substrate-prometheus-endpoint]
-path = "../substrate/utils/prometheus"
 default-features = false
 optional = true
+path = "../substrate/utils/prometheus"
 
 [dependencies.substrate-rpc-client]
-path = "../substrate/utils/frame/rpc/client"
 default-features = false
 optional = true
+path = "../substrate/utils/frame/rpc/client"
 
 [dependencies.substrate-state-trie-migration-rpc]
-path = "../substrate/utils/frame/rpc/state-trie-migration-rpc"
 default-features = false
 optional = true
+path = "../substrate/utils/frame/rpc/state-trie-migration-rpc"
 
 [dependencies.substrate-wasm-builder]
-path = "../substrate/utils/wasm-builder"
 default-features = false
 optional = true
+path = "../substrate/utils/wasm-builder"
 
 [dependencies.tracing-gum]
-path = "../polkadot/node/gum"
 default-features = false
 optional = true
+path = "../polkadot/node/gum"
 
 [dependencies.xcm-emulator]
-path = "../cumulus/xcm/xcm-emulator"
 default-features = false
 optional = true
+path = "../cumulus/xcm/xcm-emulator"
 
 [dependencies.xcm-simulator]
-path = "../polkadot/xcm/xcm-simulator"
 default-features = false
 optional = true
+path = "../polkadot/xcm/xcm-simulator"
 
 [package.metadata.docs.rs]
 features = ["node", "runtime-full"]